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

chrome/browser/sync/sync_prefs_unittest.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/time.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 23 matching lines @@
     all_types.insert(type);
   }
   all_types.erase(syncable::NIGORI);
   return all_types;
 }
 
 // Returns all types visible from the setup UI.
 syncable::ModelTypeSet GetUserVisibleTypes() {
   syncable::ModelTypeSet user_visible_types(GetNonPassiveTypes());
   user_visible_types.erase(syncable::AUTOFILL_PROFILE);
+  user_visible_types.erase(syncable::SEARCH_ENGINES);
   user_visible_types.erase(syncable::APP_NOTIFICATIONS);
   return user_visible_types;
 }
 
 TEST_F(SyncPrefsTest, Basic) {
   SyncPrefs sync_prefs(&pref_service_);
 
   EXPECT_FALSE(sync_prefs.HasSyncSetupCompleted());
   sync_prefs.SetSyncSetupCompleted();
   EXPECT_TRUE(sync_prefs.HasSyncSetupCompleted());
@@ skipping 49 matching lines @@
             sync_prefs.GetPreferredDataTypes(non_passive_types));
   const syncable::ModelTypeSet& user_visible_types = GetUserVisibleTypes();
   for (syncable::ModelTypeSet::const_iterator it = user_visible_types.begin();
        it != user_visible_types.end(); ++it) {
     syncable::ModelTypeSet preferred_types;
     preferred_types.insert(*it);
     syncable::ModelTypeSet expected_preferred_types(preferred_types);
     if (*it == syncable::AUTOFILL) {
       expected_preferred_types.insert(syncable::AUTOFILL_PROFILE);
     }
+    if (*it == syncable::PREFERENCES) {
+      expected_preferred_types.insert(syncable::SEARCH_ENGINES);
+    }
     if (*it == syncable::APPS) {
       expected_preferred_types.insert(syncable::APP_NOTIFICATIONS);
     }
     sync_prefs.SetPreferredDataTypes(non_passive_types, preferred_types);
     EXPECT_EQ(expected_preferred_types,
               sync_prefs.GetPreferredDataTypes(non_passive_types));
   }
 }
 
 TEST_F(SyncPrefsTest, MaxInvalidationVersions) {
@@ skipping 101 matching lines @@
   const syncable::ModelTypeSet& non_passive_types = GetNonPassiveTypes();
   EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(non_passive_types).empty());
   EXPECT_FALSE(sync_prefs.IsManaged());
   EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty());
   EXPECT_TRUE(sync_prefs.GetAllMaxVersions().empty());
 }
 
 }  // namespace
 
 }  // namespace browser_sync