Device info datatype should be moved to components/sync_driver.

components/sync_driver/device_info_sync_service_unittest.cc

 // Copyright 2014 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/message_loop/message_loop.h"
-#include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
 #include "components/sync_driver/device_info_sync_service.h"
-#include "content/public/test/test_browser_thread_bundle.h"
+#include "components/sync_driver/local_device_info_provider_mock.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_change_processor.h"
 #include "sync/api/sync_change_processor_wrapper_for_test.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test.h"
 #include "sync/util/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using sync_driver::DeviceInfoSyncService;
-using sync_driver::DeviceInfoTracker;
 using syncer::AttachmentIdList;
 using syncer::AttachmentServiceProxyForTest;
 using syncer::ModelType;
 using syncer::SyncChange;
 using syncer::SyncChangeList;
 using syncer::SyncChangeProcessor;
 using syncer::SyncChangeProcessorWrapperForTest;
 using syncer::SyncData;
 using syncer::SyncDataList;
 using syncer::SyncError;
 using syncer::SyncErrorFactory;
 using syncer::SyncErrorFactoryMock;
 using syncer::SyncMergeResult;
 
-namespace browser_sync {
+namespace sync_driver {
 
 namespace {
 
 class TestChangeProcessor : public SyncChangeProcessor {
  public:
   TestChangeProcessor() {}
   virtual ~TestChangeProcessor() {}
 
   // SyncChangeProcessor implementation.
   // Store a copy of all the changes passed in so we can examine them later.
@@ skipping 108 matching lines @@
     SyncData sync_data = CreateRemoteData(client_id, client_name);
     SyncChange sync_change(FROM_HERE, change_type, sync_data);
     change_list.push_back(sync_change);
   }
 
  protected:
   int num_device_info_changed_callbacks_;
   scoped_ptr<LocalDeviceInfoProviderMock> local_device_;
   scoped_ptr<DeviceInfoSyncService> sync_service_;
   scoped_ptr<TestChangeProcessor> sync_processor_;
-  content::TestBrowserThreadBundle thread_bundle_;
+  base::MessageLoopForUI message_loop_;
 };
 
 // Sync with empty initial data.
 TEST_F(DeviceInfoSyncServiceTest, StartSyncEmptyInitialData) {
   SyncMergeResult merge_result =
       sync_service_->MergeDataAndStartSyncing(syncer::DEVICE_INFO,
                                               SyncDataList(),
                                               PassProcessor(),
                                               CreateAndPassSyncErrorFactory());
 
@@ skipping 376 matching lines @@
   EXPECT_EQ("guid_1", sync_processor_->cache_guid_at(0));
   EXPECT_EQ("client_1", sync_processor_->client_name_at(0));
 
   backup_time = syncer::ProtoTimeToTime(
       sync_processor_->device_info_at(0).backup_timestamp());
   EXPECT_EQ(6000, backup_time.ToTimeT());
 }
 
 }  // namespace
 
-}  // namespace browser_sync
+}  // namespace sync_driver