Move sqlite_utils.* to sync/util/ directory.

BUG=77634
TEST=None

R=akalin@chromium.org

Review URL: http://codereview.chromium.org/7550059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95927 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/sync/syncable/directory_backing_store.cc

@@ -17,15 +17,15 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
-#include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
+#include "base/stringprintf.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/protocol/service_constants.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/syncable/syncable-inl.h"
 #include "chrome/browser/sync/syncable/syncable_columns.h"
+#include "chrome/browser/sync/util/sqlite_utils.h"
 #include "chrome/common/random.h"
-#include "chrome/common/sqlite_utils.h"
 #include "third_party/sqlite/sqlite3.h"
 
 // Sometimes threads contend on the DB lock itself, especially when one thread

chrome/common/sqlite_utils.cc → chrome/browser/sync/util/sqlite_utils.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/sqlite_utils.h"
+#include "chrome/browser/sync/util/sqlite_utils.h"
 
 #include <list>
 

chrome/common/sqlite_utils.h → chrome/browser/sync/util/sqlite_utils.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_SQLITE_UTILS_H_
-#define CHROME_COMMON_SQLITE_UTILS_H_
+#ifndef CHROME_BROWSER_SYNC_UTIL_SQLITE_UTILS_H_
+#define CHROME_BROWSER_SYNC_UTIL_SQLITE_UTILS_H_
 #pragma once
 
 #include <string>
@@ -397,4 +397,4 @@ bool DoesSqliteTableHaveRow(sqlite3* db, const char* table_name);
 
 }  // namespace sqlite_utils
 
-#endif  // CHROME_COMMON_SQLITE_UTILS_H_
+#endif  // CHROME_BROWSER_SYNC_UTIL_SQLITE_UTILS_H_

chrome/browser/sync/util/user_settings.cc

@@ -23,8 +23,8 @@
 #include "base/string_util.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"  // For migration.
 #include "chrome/browser/sync/util/data_encryption.h"
+#include "chrome/browser/sync/util/sqlite_utils.h"
 #include "chrome/common/random.h"
-#include "chrome/common/sqlite_utils.h"
 
 using std::numeric_limits;
 using std::string;

chrome/browser/sync/util/user_settings_posix.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "chrome/browser/password_manager/encryptor.h"
-#include "chrome/common/sqlite_utils.h"
+#include "chrome/browser/sync/util/sqlite_utils.h"
 
 namespace browser_sync {
 

chrome/browser/sync/util/user_settings_win.cc

@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "chrome/browser/sync/util/data_encryption.h"
-#include "chrome/common/sqlite_utils.h"
+#include "chrome/browser/sync/util/sqlite_utils.h"
 
 using std::string;
 

chrome/chrome.gyp

@@ -703,6 +703,8 @@
         'browser/sync/util/logging.h',
         'browser/sync/util/nigori.cc',
         'browser/sync/util/nigori.h',
+        'browser/sync/util/sqlite_utils.cc',
+        'browser/sync/util/sqlite_utils.h',
         'browser/sync/util/user_settings.cc',
         'browser/sync/util/user_settings.h',
         'browser/sync/util/user_settings_posix.cc',

chrome/chrome_common.gypi

@@ -237,8 +237,6 @@
         'common/spellcheck_common.cc',
         'common/spellcheck_common.h',
         'common/spellcheck_messages.h',
-        'common/sqlite_utils.cc',
-        'common/sqlite_utils.h',
         'common/text_input_client_messages.h',
         'common/thumbnail_score.cc',
         'common/thumbnail_score.h',