[Sync] Move //components/sync to the syncer namespace, take 2.

chrome/browser/sync/test/integration/enable_disable_test.cc

 // Copyright (c) 2012 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 "base/macros.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/core/read_node.h"
@@ skipping 16 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest);
 };
 
 bool DoesTopLevelNodeExist(syncer::UserShare* user_share,
                            syncer::ModelType type) {
     syncer::ReadTransaction trans(FROM_HERE, user_share);
     syncer::ReadNode node(&trans);
     return node.InitTypeRoot(type) == syncer::BaseNode::INIT_OK;
 }
 
-bool IsUnready(const sync_driver::DataTypeStatusTable& data_type_status_table,
+bool IsUnready(const syncer::DataTypeStatusTable& data_type_status_table,
                syncer::ModelType type) {
   return data_type_status_table.GetUnreadyErrorTypes().Has(type);
 }
 
 IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
   ASSERT_TRUE(SetupClients());
 
   // Setup sync with no enabled types.
   ASSERT_TRUE(GetClient(0)->SetupSync(syncer::ModelTypeSet()));
 
   syncer::UserShare* user_share = GetSyncService(0)->GetUserShare();
-  const sync_driver::DataTypeStatusTable& data_type_status_table =
+  const syncer::DataTypeStatusTable& data_type_status_table =
       GetSyncService(0)->data_type_status_table();
 
   const syncer::ModelTypeSet registered_types =
       GetSyncService(0)->GetRegisteredDataTypes();
   const syncer::ModelTypeSet registered_user_types =
       Intersection(registered_types, syncer::UserSelectableTypes());
   for (syncer::ModelTypeSet::Iterator it = registered_user_types.First();
        it.Good(); it.Inc()) {
     ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get()));
 
@@ skipping 28 matching lines @@
   ASSERT_TRUE(SetupClients());
 
   // Setup sync with no disabled types.
   ASSERT_TRUE(GetClient(0)->SetupSync());
 
   const syncer::ModelTypeSet registered_types =
       GetSyncService(0)->GetRegisteredDataTypes();
 
   syncer::UserShare* user_share = GetSyncService(0)->GetUserShare();
 
-  const sync_driver::DataTypeStatusTable& data_type_status_table =
+  const syncer::DataTypeStatusTable& data_type_status_table =
       GetSyncService(0)->data_type_status_table();
 
   // Make sure all top-level nodes exist first.
   for (syncer::ModelTypeSet::Iterator it = registered_types.First();
        it.Good(); it.Inc()) {
     if (!syncer::ProxyTypes().Has(it.Get())) {
       ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()) ||
                   IsUnready(data_type_status_table, it.Get()));
     }
   }
@@ skipping 48 matching lines @@
       ASSERT_EQ(GetClient(0)->IsTypePreferred(syncer::TYPED_URLS),
                 DoesTopLevelNodeExist(user_share, syncer::SESSIONS));
     } else if (it.Get() == syncer::PREFERENCES) {
       ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
                                          syncer::PRIORITY_PREFERENCES));
     }
   }
 }
 
 }  // namespace