Merge search engines sync data type with Preferences. Sync the default search provider. Add some ...

chrome/browser/sync/sync_prefs.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/sync_prefs.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
@@ skipping 116 matching lines @@
     const syncable::ModelTypeSet& registered_types) const {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   if (!pref_service_) {
     return syncable::ModelTypeSet();
   }
 
   if (pref_service_->GetBoolean(prefs::kSyncKeepEverythingSynced)) {
     return registered_types;
   }
 
-  // Remove autofill_profile since it's controlled by autofill (see
-  // code below).
+  // Remove autofill_profile since it's controlled by autofill, and
+  // search_engines since it's controlled by preferences (see code below).
   syncable::ModelTypeSet user_selectable_types(registered_types);
   DCHECK_EQ(user_selectable_types.count(syncable::NIGORI), 0u);
   user_selectable_types.erase(syncable::AUTOFILL_PROFILE);
+  user_selectable_types.erase(syncable::SEARCH_ENGINES);
 
   // Remove app_notifications since it's controlled by apps (see
   // code below).
   // TODO(akalin): Centralize notion of all user selectable data types.
   user_selectable_types.erase(syncable::APP_NOTIFICATIONS);
 
   syncable::ModelTypeSet preferred_types;
 
   for (syncable::ModelTypeSet::const_iterator it =
            user_selectable_types.begin();
        it != user_selectable_types.end(); ++it) {
     if (GetDataTypePreferred(*it)) {
       preferred_types.insert(*it);
     }
   }
 
-  // Set autofill_profile to the same enabled/disabled state as
-  // autofill (since only autofill is shown on the UI).
+  // Group the enabled/disabled state of autofill_profile with autofill, and
+  // search_engines with preferences (since only autofill and preferences are
+  // shown on the UI).
   if (registered_types.count(syncable::AUTOFILL) &&
       registered_types.count(syncable::AUTOFILL_PROFILE) &&
       GetDataTypePreferred(syncable::AUTOFILL)) {
     preferred_types.insert(syncable::AUTOFILL_PROFILE);
   }
+  if (registered_types.count(syncable::PREFERENCES) &&
+      registered_types.count(syncable::SEARCH_ENGINES) &&
+      GetDataTypePreferred(syncable::PREFERENCES)) {
+    preferred_types.insert(syncable::SEARCH_ENGINES);
+  }
 
   // Set app_notifications to the same enabled/disabled state as
   // apps (since only apps is shown on the UI).
   if (registered_types.count(syncable::APPS) &&
       registered_types.count(syncable::APP_NOTIFICATIONS) &&
       GetDataTypePreferred(syncable::APPS)) {
     preferred_types.insert(syncable::APP_NOTIFICATIONS);
   }
 
   return preferred_types;
@@ skipping 20 matching lines @@
   // Set app_notifications to the same enabled/disabled state as
   // apps (since only apps is shown in the UI).
   if (registered_types.count(syncable::APPS) &&
       registered_types.count(syncable::APP_NOTIFICATIONS)) {
     if (preferred_types_with_dependents.count(syncable::APPS)) {
       preferred_types_with_dependents.insert(syncable::APP_NOTIFICATIONS);
     } else {
       preferred_types_with_dependents.erase(syncable::APP_NOTIFICATIONS);
     }
   }
+  // Set search_engines to the same enabled/disabled state as
+  // preferences (since only preferences is shown in the UI).
+  if (registered_types.count(syncable::PREFERENCES) &&
+      registered_types.count(syncable::SEARCH_ENGINES)) {
+    if (preferred_types_with_dependents.count(syncable::PREFERENCES)) {
+      preferred_types_with_dependents.insert(syncable::SEARCH_ENGINES);
+    } else {
+      preferred_types_with_dependents.erase(syncable::SEARCH_ENGINES);
+    }
+  }
 
   for (syncable::ModelTypeSet::const_iterator it = registered_types.begin();
        it != registered_types.end(); ++it) {
     SetDataTypePreferred(*it, preferred_types_with_dependents.count(*it) > 0);
   }
 }
 
 bool SyncPrefs::IsManaged() const {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   return pref_service_ && pref_service_->GetBoolean(prefs::kSyncManaged);
@@ skipping 291 matching lines @@
   const char* pref_name = GetPrefNameForDataType(type);
   if (!pref_name) {
     NOTREACHED();
     return;
   }
   pref_service_->SetBoolean(pref_name, is_preferred);
   pref_service_->ScheduleSavePersistentPrefs();
 }
 
 }  // namespace browser_sync