Adjust preference sync code to only sync user modifiable preferences.

chrome/test/testing_profile.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_TEST_TESTING_PROFILE_H_
 #define CHROME_TEST_TESTING_PROFILE_H_
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_prefs.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/find_bar_state.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/pref_value_store.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/net/url_request_context_getter.h"
+#include "chrome/test/testing_pref_service.h"
 #include "net/base/cookie_monster.h"
 
 class ProfileSyncService;
 class SessionService;
 
 class TestingProfile : public Profile {
  public:
   TestingProfile();
 
   // Creates a new profile by adding |count| to the end of the path. Use this
@@ skipping 102 matching lines @@
   }
   virtual WebDataService* GetWebDataService(ServiceAccessType access) {
     return web_data_service_.get();
   }
   virtual WebDataService* GetWebDataServiceWithoutCreating() {
     return web_data_service_.get();
   }
   virtual PasswordStore* GetPasswordStore(ServiceAccessType access) {
     return NULL;
   }
-  virtual PrefService* GetPrefs() {
+  virtual TestingPrefService* GetPrefs() {
     if (!prefs_.get()) {
-      FilePath prefs_filename =
-          path_.Append(FILE_PATH_LITERAL("TestPreferences"));
-
-      prefs_.reset(PrefService::CreateUserPrefService(prefs_filename));
+      prefs_.reset(new TestingPrefService());
       Profile::RegisterUserPrefs(prefs_.get());
       browser::RegisterAllPrefs(prefs_.get(), prefs_.get());
     }
     return prefs_.get();
   }
   virtual TemplateURLModel* GetTemplateURLModel() {
     return template_url_model_.get();
   }
   virtual TemplateURLFetcher* GetTemplateURLFetcher() { return NULL; }
   virtual history::TopSites* GetTopSites() { return NULL; }
@@ skipping 117 matching lines @@
   // Creates and initializes a profile sync service if the tests require one.
   virtual TokenService* GetTokenService();
   virtual ProfileSyncService* GetProfileSyncService();
   virtual CloudPrintProxyService* GetCloudPrintProxyService() { return NULL; }
 
  protected:
   // The path of the profile; the various database and other files are relative
   // to this.
   FilePath path_;
   base::Time start_time_;
-  scoped_ptr<PrefService> prefs_;
+  scoped_ptr<TestingPrefService> prefs_;
 
  private:
   // Destroys favicon service if it has been created.
   void DestroyFaviconService();
 
   // If the history service has been created, it is destroyed. This is invoked
   // from the destructor.
   void DestroyHistoryService();
 
   // If the webdata service has been created, it is destroyed.  This is invoked
@@ skipping 79 matching lines @@
 
   virtual ProfileId GetRuntimeId() {
     return original_profile_->GetRuntimeId();
   }
 
  protected:
   Profile* original_profile_;
 };
 
 #endif  // CHROME_TEST_TESTING_PROFILE_H_