sync: Cleanups in and around directory.h

- Remove MockDirectorySyncerCommand (not used).
- Remove MockDirectory (used only by MockDirectorySyncerCommand).
- Remove Directory::InitKernelForTest (used only by MockDirectory).
- Merge ChildHandles and UnsyncedMetahandles typedefs into a single
  Metahandles typedef.
- Rearrange declarations in directory.h to match Google C++ style.
- Create scoped_kernel_lock.cc; move related definitions from
  directory.cc to this new file.
- Use DISALLOW_COPY_AND_ASSIGN instead of declaring an undefined
  Directory::operator= manually.

BUG=245931

Review URL: https://chromiumcodereview.appspot.com/16591002

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

5 files changed, 16 insertions, 16 deletions

diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc
index fafd237..c9d78fc 100644
--- a/sync/engine/conflict_resolver.cc
+++ b/sync/engine/conflict_resolver.cc
@@ -193,7 +193,7 @@ void ConflictResolver::ProcessSimpleConflict(WriteTransaction* trans,
     entry.Put(syncable::BASE_SERVER_SPECIFICS, sync_pb::EntitySpecifics());
   } else {  // SERVER_IS_DEL is true
     if (entry.Get(syncable::IS_DIR)) {
-      Directory::ChildHandles children;
+      Directory::Metahandles children;
       trans->directory()->GetChildHandlesById(trans,
                                               entry.Get(syncable::ID),
                                               &children);
diff --git a/sync/engine/get_commit_ids_command.cc b/sync/engine/get_commit_ids_command.cc
index 6b2325f..7297f51 100644
--- a/sync/engine/get_commit_ids_command.cc
+++ b/sync/engine/get_commit_ids_command.cc
@@ -41,7 +41,7 @@ SyncerError GetCommitIdsCommand::ExecuteImpl(SyncSession* session) {
   // Gather the full set of unsynced items and store it in the session. They
   // are not in the correct order for commit.
   std::set<int64> ready_unsynced_set;
-  syncable::Directory::UnsyncedMetaHandles all_unsynced_handles;
+  syncable::Directory::Metahandles all_unsynced_handles;
   GetUnsyncedEntries(trans_,
                      &all_unsynced_handles);
 
@@ -165,10 +165,10 @@ void GetCommitIdsCommand::FilterUnreadyEntries(
     ModelTypeSet throttled_types,
     ModelTypeSet encrypted_types,
     bool passphrase_missing,
-    const syncable::Directory::UnsyncedMetaHandles& unsynced_handles,
+    const syncable::Directory::Metahandles& unsynced_handles,
     std::set<int64>* ready_unsynced_set) {
-  for (syncable::Directory::UnsyncedMetaHandles::const_iterator iter =
-           unsynced_handles.begin(); iter != unsynced_handles.end(); ++iter) {
+  for (syncable::Directory::Metahandles::const_iterator iter =
+       unsynced_handles.begin(); iter != unsynced_handles.end(); ++iter) {
     syncable::Entry entry(trans, syncable::GET_BY_HANDLE, *iter);
     if (IsEntryReadyForCommit(throttled_types,
                               encrypted_types,
diff --git a/sync/engine/get_commit_ids_command.h b/sync/engine/get_commit_ids_command.h
index a41dd00..1bbbecd 100644
--- a/sync/engine/get_commit_ids_command.h
+++ b/sync/engine/get_commit_ids_command.h
@@ -66,7 +66,7 @@ class SYNC_EXPORT_PRIVATE GetCommitIdsCommand : public SyncerCommand {
       ModelTypeSet throttled_types,
       ModelTypeSet encrypted_types,
       bool passphrase_missing,
-      const syncable::Directory::UnsyncedMetaHandles& unsynced_handles,
+      const syncable::Directory::Metahandles& unsynced_handles,
       std::set<int64>* ready_unsynced_set);
 
  private:
diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
index c1196ef..c85ab7e 100644
--- a/sync/engine/syncer_unittest.cc
+++ b/sync/engine/syncer_unittest.cc
@@ -241,7 +241,7 @@ class SyncerTest : public testing::Test,
     syncer_ = new Syncer();
 
     syncable::ReadTransaction trans(FROM_HERE, directory());
-    syncable::Directory::ChildHandles children;
+    syncable::Directory::Metahandles children;
     directory()->GetChildHandlesById(&trans, trans.root_id(), &children);
     ASSERT_EQ(0u, children.size());
     saw_syncer_event_ = false;
@@ -2350,7 +2350,7 @@ TEST_F(SyncerTest, DoublyChangedWithResolver) {
                                   local_cache_guid(), local_id.GetServerId());
   mock_server_->set_conflict_all_commits(true);
   SyncShareNudge();
-  syncable::Directory::ChildHandles children;
+  syncable::Directory::Metahandles children;
   {
     syncable::ReadTransaction trans(FROM_HERE, directory());
     directory()->GetChildHandlesById(&trans, parent_id_, &children);
@@ -2453,7 +2453,7 @@ TEST_F(SyncerTest, ParentAndChildBothMatch) {
   SyncShareNudge();
   {
     syncable::ReadTransaction trans(FROM_HERE, directory());
-    Directory::ChildHandles children;
+    Directory::Metahandles children;
     directory()->GetChildHandlesById(&trans, root_id_, &children);
     EXPECT_EQ(1u, children.size());
     directory()->GetChildHandlesById(&trans, parent_id, &children);
@@ -2461,7 +2461,7 @@ TEST_F(SyncerTest, ParentAndChildBothMatch) {
     std::vector<int64> unapplied;
     directory()->GetUnappliedUpdateMetaHandles(&trans, all_types, &unapplied);
     EXPECT_EQ(0u, unapplied.size());
-    syncable::Directory::UnsyncedMetaHandles unsynced;
+    syncable::Directory::Metahandles unsynced;
     directory()->GetUnsyncedMetaHandles(&trans, &unsynced);
     EXPECT_EQ(0u, unsynced.size());
     saw_syncer_event_ = false;
@@ -3920,7 +3920,7 @@ TEST_F(SyncerTest, ClientTagUpdateClashesWithLocalEntry) {
     EXPECT_EQ("tag2", tag2.Get(UNIQUE_CLIENT_TAG));
     tag2_metahandle = tag2.Get(META_HANDLE);
 
-    syncable::Directory::ChildHandles children;
+    syncable::Directory::Metahandles children;
     directory()->GetChildHandlesById(&trans, trans.root_id(), &children);
     ASSERT_EQ(2U, children.size());
   }
@@ -3960,7 +3960,7 @@ TEST_F(SyncerTest, ClientTagUpdateClashesWithLocalEntry) {
     EXPECT_EQ("tag2", tag2.Get(UNIQUE_CLIENT_TAG));
     EXPECT_EQ(tag2_metahandle, tag2.Get(META_HANDLE));
 
-    syncable::Directory::ChildHandles children;
+    syncable::Directory::Metahandles children;
     directory()->GetChildHandlesById(&trans, trans.root_id(), &children);
     ASSERT_EQ(2U, children.size());
   }
@@ -4039,7 +4039,7 @@ TEST_F(SyncerTest, ClientTagClashWithinBatchOfUpdates) {
     EXPECT_EQ(21, tag_c.Get(BASE_VERSION));
     EXPECT_EQ("tag c", tag_c.Get(UNIQUE_CLIENT_TAG));
 
-    syncable::Directory::ChildHandles children;
+    syncable::Directory::Metahandles children;
     directory()->GetChildHandlesById(&trans, trans.root_id(), &children);
     ASSERT_EQ(3U, children.size());
   }
diff --git a/sync/engine/syncer_util.cc b/sync/engine/syncer_util.cc
index e0e566f..93f2bef 100644
--- a/sync/engine/syncer_util.cc
+++ b/sync/engine/syncer_util.cc
@@ -242,7 +242,7 @@ UpdateAttemptResponse AttemptToUpdateEntry(
       }
     }
   } else if (entry->Get(IS_DIR)) {
-    Directory::ChildHandles handles;
+    Directory::Metahandles handles;
     trans->directory()->GetChildHandlesById(trans, id, &handles);
     if (!handles.empty()) {
       // If we have still-existing children, then we need to deal with
@@ -492,14 +492,14 @@ void MarkDeletedChildrenSynced(
   // may be sensible if this code shows up in profiling.
   if (deleted_folders->empty())
     return;
-  Directory::UnsyncedMetaHandles handles;
+  Directory::Metahandles handles;
   {
     syncable::ReadTransaction trans(FROM_HERE, dir);
     dir->GetUnsyncedMetaHandles(&trans, &handles);
   }
   if (handles.empty())
     return;
-  Directory::UnsyncedMetaHandles::iterator it;
+  Directory::Metahandles::iterator it;
   for (it = handles.begin() ; it != handles.end() ; ++it) {
     // Single transaction / entry we deal with.
     WriteTransaction trans(FROM_HERE, SYNCER, dir);