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

chrome/browser/sync/profile_sync_factory_impl_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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 26 matching lines @@
     std::vector<syncable::ModelType> datatypes;
     datatypes.push_back(syncable::BOOKMARKS);
     datatypes.push_back(syncable::PREFERENCES);
     datatypes.push_back(syncable::AUTOFILL);
     datatypes.push_back(syncable::THEMES);
     datatypes.push_back(syncable::EXTENSIONS);
     datatypes.push_back(syncable::APPS);
     datatypes.push_back(syncable::AUTOFILL_PROFILE);
     datatypes.push_back(syncable::PASSWORDS);
     datatypes.push_back(syncable::TYPED_URLS);
+    datatypes.push_back(syncable::SEARCH_ENGINES);
     return datatypes;
   }
 
   // Returns the number of default datatypes.
   static size_t DefaultDatatypesCount() {
     return DefaultDatatypes().size();
   }
 
   // Asserts that all the default datatypes are in |map|, except
   // for |exception_type|, which unless it is UNDEFINED, is asserted to
@@ skipping 76 matching lines @@
 
 TEST_F(ProfileSyncFactoryImplTest, CreatePSSDisableAutofillProfile) {
   TestSwitchDisablesType(switches::kDisableSyncAutofillProfile,
                          syncable::AUTOFILL_PROFILE);
 }
 
 TEST_F(ProfileSyncFactoryImplTest, CreatePSSDisablePasswords) {
   TestSwitchDisablesType(switches::kDisableSyncPasswords,
                          syncable::PASSWORDS);
 }