[Sync] Rename ModelTypeService to ModelTypeSyncBridge.

components/sync/device_info/device_info_service_unittest.cc

 // Copyright 2015 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 "components/sync/device_info/device_info_service.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 15 matching lines @@
 
 namespace syncer {
 
 using base::Time;
 using base::TimeDelta;
 using sync_pb::DeviceInfoSpecifics;
 using sync_pb::EntitySpecifics;
 using sync_pb::ModelTypeState;
 
 using DeviceInfoList = std::vector<std::unique_ptr<DeviceInfo>>;
-using StorageKeyList = ModelTypeService::StorageKeyList;
+using StorageKeyList = ModelTypeSyncBridge::StorageKeyList;
 using RecordList = ModelTypeStore::RecordList;
 using Result = ModelTypeStore::Result;
 using StartCallback = ModelTypeChangeProcessor::StartCallback;
 using WriteBatch = ModelTypeStore::WriteBatch;
 
 namespace {
 
 std::unique_ptr<DeviceInfo> CreateDeviceInfo() {
   return base::MakeUnique<DeviceInfo>(
       "guid_1", "client_1", "Chromium 10k", "Chrome 10k",
@@ skipping 125 matching lines @@
       service_->RemoveObserver(this);
 
     // Force all remaining (store) tasks to execute so we don't leak memory.
     base::RunLoop().RunUntilIdle();
   }
 
   void OnDeviceInfoChange() override { change_count_++; }
 
   std::unique_ptr<ModelTypeChangeProcessor> CreateModelTypeChangeProcessor(
       ModelType type,
-      ModelTypeService* service) {
+      ModelTypeSyncBridge* bridge) {
     auto processor = base::MakeUnique<RecordingModelTypeChangeProcessor>();
     processor_ = processor.get();
     return std::move(processor);
   }
 
   // Initialized the service based on the current local device and store. Can
   // only be called once per run, as it passes |store_|.
   void InitializeService() {
     ASSERT_TRUE(store_);
     service_ = base::MakeUnique<DeviceInfoService>(
@@ skipping 575 matching lines @@
 
   // Reloading from storage shouldn't contain remote data.
   RestartService();
   EXPECT_EQ(1u, service()->GetAllDeviceInfo().size());
   EXPECT_EQ(4, change_count());
 }
 
 }  // namespace
 
 }  // namespace syncer