[Sync] Rename ModelTypeService to ModelTypeSyncBridge.

components/sync/driver/model_type_controller.cc

Index: components/sync/driver/model_type_controller.cc
diff --git a/components/sync/driver/model_type_controller.cc b/components/sync/driver/model_type_controller.cc
index e602c707d10a5015fb8ff80495b7bccd1a6b1fd6..43d4e1459a43d87b56f3d57fa37eb751ea60d93f 100644
--- a/components/sync/driver/model_type_controller.cc
+++ b/components/sync/driver/model_type_controller.cc
@@ -20,7 +20,7 @@
 #include "components/sync/model/data_type_error_handler_impl.h"
 #include "components/sync/model/model_type_change_processor.h"
 #include "components/sync/model/model_type_debug_info.h"
-#include "components/sync/model/model_type_service.h"
+#include "components/sync/model/model_type_sync_bridge.h"
 #include "components/sync/model/sync_error.h"
 #include "components/sync/model/sync_merge_result.h"
 
@@ -69,26 +69,26 @@ void ModelTypeController::LoadModels(
 
   // Start the type processor on the model thread.
   model_thread_->PostTask(
-      FROM_HERE, base::Bind(&ModelTypeService::OnSyncStarting,
-                            sync_client_->GetModelTypeServiceForType(type()),
+      FROM_HERE, base::Bind(&ModelTypeSyncBridge::OnSyncStarting,
+                            sync_client_->GetSyncBridgeForModelType(type()),
                             base::Passed(CreateErrorHandler()), callback));
 }
 
 void ModelTypeController::GetAllNodes(const AllNodesCallback& callback) {
-  base::WeakPtr<ModelTypeService> service =
-      sync_client_->GetModelTypeServiceForType(type());
+  base::WeakPtr<ModelTypeSyncBridge> bridge =
+      sync_client_->GetSyncBridgeForModelType(type());
   model_thread_->PostTask(FROM_HERE,
-                          base::Bind(&ModelTypeDebugInfo::GetAllNodes, service,
+                          base::Bind(&ModelTypeDebugInfo::GetAllNodes, bridge,
                                      BindToCurrentThread(callback)));
 }
 
 void ModelTypeController::GetStatusCounters(
     const StatusCountersCallback& callback) {
-  base::WeakPtr<ModelTypeService> service =
-      sync_client_->GetModelTypeServiceForType(type());
+  base::WeakPtr<ModelTypeSyncBridge> bridge =
+      sync_client_->GetSyncBridgeForModelType(type());
   model_thread_->PostTask(
       FROM_HERE,
-      base::Bind(&ModelTypeDebugInfo::GetStatusCounters, service, callback));
+      base::Bind(&ModelTypeDebugInfo::GetStatusCounters, bridge, callback));
 }
 
 void ModelTypeController::LoadModelsDone(ConfigureResult result,
@@ -180,16 +180,15 @@ void ModelTypeController::Stop() {
     return;
 
   // Check preferences if datatype is not in preferred datatypes. Only call
-  // DisableSync if service is ready to handle it (controller is in loaded
+  // DisableSync if the bridge is ready to handle it (controller is in loaded
   // state).
   ModelTypeSet preferred_types =
       sync_prefs_.GetPreferredDataTypes(ModelTypeSet(type()));
   if ((state() == MODEL_LOADED || state() == RUNNING) &&
       (!sync_prefs_.IsFirstSetupComplete() || !preferred_types.Has(type()))) {
     model_thread_->PostTask(
-        FROM_HERE,
-        base::Bind(&ModelTypeService::DisableSync,
-                   sync_client_->GetModelTypeServiceForType(type())));
+        FROM_HERE, base::Bind(&ModelTypeSyncBridge::DisableSync,
+                              sync_client_->GetSyncBridgeForModelType(type())));
   }
 
   state_ = NOT_RUNNING;