Adjust preference sync code to only sync user modifiable preferences.

chrome/browser/tab_contents/web_contents_unittest.cc

 // 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.
 
 #include "app/message_box_flags.h"
 #include "base/logging.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/pref_value_store.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_profile.h"
 #include "ipc/ipc_channel.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using webkit_glue::PasswordForm;
 
 static void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,
                                int page_id,
                                const GURL& url) {
   params->page_id = page_id;
   params->url = url;
   params->referrer = GURL();
   params->transition = PageTransition::TYPED;
   params->redirects = std::vector<GURL>();
   params->should_update_history = false;
   params->searchable_form_url = GURL();
   params->searchable_form_encoding = std::string();
   params->password_form = PasswordForm();
   params->security_info = std::string();
   params->gesture = NavigationGestureUser;
   params->is_post = false;
 }
 
-// Subclass the TestingProfile so that it can return certain services we need.
-class TabContentsTestingProfile : public TestingProfile {
- public:
-  TabContentsTestingProfile() : TestingProfile() {
-    CreateBookmarkModel(false);
-  }
-
-  virtual PrefService* GetPrefs() {
-    if (!prefs_.get()) {
-      FilePath source_path;
-      PathService::Get(chrome::DIR_TEST_DATA, &source_path);
-      source_path = source_path.AppendASCII("profiles")
-          .AppendASCII("chrome_prefs").AppendASCII("Preferences");
-
-      // Create a preference service that only contains user defined
-      // preference values.
-      prefs_.reset(PrefService::CreateUserPrefService(source_path));
-      Profile::RegisterUserPrefs(prefs_.get());
-      browser::RegisterAllPrefs(prefs_.get(), prefs_.get());
-    }
-    return prefs_.get();
-  }
-};
-
 class TestInterstitialPage : public InterstitialPage {
  public:
   enum InterstitialState {
     UNDECIDED = 0, // No decision taken yet.
     OKED,          // Proceed was called.
     CANCELED       // DontProceed was called.
   };
 
   class Delegate {
    public:
@@ skipping 122 matching lines @@
  public:
   TabContentsTest()
       : RenderViewHostTestHarness(),
         ui_thread_(ChromeThread::UI, &message_loop_) {
   }
 
  private:
   // Supply our own profile so we use the correct profile data. The test harness
   // is not supposed to overwrite a profile if it's already created.
   virtual void SetUp() {
-    profile_.reset(new TabContentsTestingProfile());
+    TestingProfile* profile = new TestingProfile();
+    profile->CreateBookmarkModel(false);
+    profile_.reset(profile);
+
+    // Set some (WebKit) user preferences.
+    TestingPrefService* pref_services = profile->GetPrefs();
+#if defined(TOOLKIT_USES_GTK)
+    pref_services->SetUserPref(prefs::kUsesSystemTheme,
+                               Value::CreateBooleanValue(false));
+#endif
+    pref_services->SetUserPref(prefs::kDefaultCharset,
+                               Value::CreateStringValue("utf8"));
+    pref_services->SetUserPref(prefs::kWebKitDefaultFontSize,
+                               Value::CreateIntegerValue(20));
+    pref_services->SetUserPref(prefs::kWebKitTextAreasAreResizable,
+                               Value::CreateBooleanValue(false));
+    pref_services->SetUserPref(prefs::kWebKitUsesUniversalDetector,
+                               Value::CreateBooleanValue(true));
+    pref_services->SetUserPref(prefs::kWebKitStandardFontIsSerif,
+                               Value::CreateBooleanValue(true));
+    pref_services->SetUserPref(L"webkit.webprefs.foo",
+                               Value::CreateStringValue(L"bar"));
 
     RenderViewHostTestHarness::SetUp();
   }
 
   virtual void TearDown() {
     RenderViewHostTestHarness::TearDown();
 
     profile_.reset(NULL);
   }
 
@@ skipping 1249 matching lines @@
 
   // While the interstitial is showing, let's simulate the hidden page
   // attempting to show a JS message.
   IPC::Message* dummy_message = new IPC::Message;
   bool did_suppress_message = false;
   contents()->RunJavaScriptMessage(L"This is an informative message", L"OK",
       kGURL, MessageBoxFlags::kIsJavascriptAlert, dummy_message,
       &did_suppress_message);
   EXPECT_TRUE(did_suppress_message);
 }