Disable tab syncing when history saving is disabled.

chrome/browser/sync/glue/typed_url_data_type_controller.cc

Index: chrome/browser/sync/glue/typed_url_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/typed_url_data_type_controller.cc b/chrome/browser/sync/glue/typed_url_data_type_controller.cc
index caaa099c6599c7d1079b3dc50378a9d91c143ac9..f084f7f1444f279358319df15f202556fce00ffb 100644
--- a/chrome/browser/sync/glue/typed_url_data_type_controller.cc
+++ b/chrome/browser/sync/glue/typed_url_data_type_controller.cc
@@ -94,20 +94,16 @@ syncer::ModelSafeGroup TypedUrlDataTypeController::model_safe_group()
 
 void TypedUrlDataTypeController::LoadModels(
     const ModelLoadCallback& model_load_callback) {
-  if (profile()->GetPrefs()->GetBoolean(prefs::kSavingBrowserHistoryDisabled)) {
-    model_load_callback.Run(
-        type(),
-        syncer::SyncError(FROM_HERE,
-                          syncer::SyncError::DATATYPE_ERROR,
-                          "History sync disabled by policy.",
-                          type()));
-    return;
-  }
-
   set_state(MODEL_LOADED);
   model_load_callback.Run(type(), syncer::SyncError());
 }
 
+bool TypedUrlDataTypeController::ReadyForStart() const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  return !profile()->GetPrefs()->GetBoolean(
+      prefs::kSavingBrowserHistoryDisabled);
+}
+
 void TypedUrlDataTypeController::SetBackend(history::HistoryBackend* backend) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
   backend_ = backend;
@@ -126,7 +122,7 @@ void TypedUrlDataTypeController::OnSavingBrowserHistoryDisabledChanged() {
           syncer::SyncError::DATATYPE_POLICY_ERROR,
           "History saving is now disabled by policy.",
           syncer::TYPED_URLS);
-      OnSingleDataTypeUnrecoverableError(error);
+      DisableImpl(error);
     }
   }
 }