sync: Put sqlite_utils.* into sqlite_utils namespace.

chrome/browser/sync/syncable/syncable_id.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_ID_H_
 #define CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_ID_H_
 #pragma once
 
 #include <iosfwd>
 #include <limits>
 #include <sstream>
 #include <string>
 
 #include "base/hash_tables.h"
 
+class MockConnectionManager;
+
 namespace base {
 class StringValue;
 }
 
+namespace sqlite_utils {
+class SQLStatement;
+}
+
 namespace syncable {
 struct EntryKernel;
 class Id;
 }
 
-class MockConnectionManager;
-class SQLStatement;
-
 namespace syncable {
 
 std::ostream& operator<<(std::ostream& out, const Id& id);
 
 // For historical reasons, 3 concepts got everloaded into the Id:
 // 1. A unique, opaque identifier for the object.
 // 2. Flag specifing whether server know about this object.
 // 3. Flag for root.
 //
 // We originally wrapped an integer for this information, but now we use a
 // string. It will have one of three forms:
 // 1. c<client only opaque id> for client items that have not been committed.
 // 2. r for the root item.
 // 3. s<server provided opaque id> for items that the server knows about.
 class Id {
-  friend int UnpackEntry(SQLStatement* statement,
-                         syncable::EntryKernel** kernel);
-  friend int BindFields(const EntryKernel& entry, SQLStatement* statement);
-  friend std::ostream& operator<<(std::ostream& out, const Id& id);
-  friend class MockConnectionManager;
-  friend class SyncableIdTest;
  public:
   // This constructor will be handy even when we move away from int64s, just
   // for unit tests.
   inline Id() : s_("r") { }
   inline Id(const Id& that) {
     Copy(that);
   }
   inline Id& operator = (const Id& that) {
     Copy(that);
     return *this;
@@ skipping 49 matching lines @@
   // This should only be used if you get back a reference to a local
   // id from the server. Returns a client only opaque id.
   static Id CreateFromClientString(const std::string& local_id);
 
   // This method returns an ID that will compare less than any valid ID.
   // The returned ID is not a valid ID itself.  This is useful for
   // computing lower bounds on std::sets that are ordered by operator<.
   static Id GetLeastIdForLexicographicComparison();
 
  private:
+  friend int UnpackEntry(sqlite_utils::SQLStatement* statement,
+                         syncable::EntryKernel** kernel);
+  friend int BindFields(const EntryKernel& entry,
+                         sqlite_utils::SQLStatement* statement);
+  friend std::ostream& operator<<(std::ostream& out, const Id& id);
+  friend class MockConnectionManager;
+  friend class SyncableIdTest;
+
   std::string s_;
 };
 
 extern const Id kNullId;
 
 }  // namespace syncable
 
 #endif  // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_ID_H_