Adjust preference sync code to only sync user modifiable preferences.

chrome/browser/dom_ui/new_tab_ui_uitest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "chrome/test/ui/ui_test.h"
 
 #include "base/file_path.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
-#include "chrome/browser/pref_service.h"
 #include "chrome/browser/pref_value_store.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
+#include "chrome/test/testing_pref_service.h"
 
 class NewTabUITest : public UITest {
  public:
   NewTabUITest() {
     dom_automation_enabled_ = true;
     // Set home page to the empty string so that we can set the home page using
     // preferences.
     homepage_ = L"";
 
     // Setup the DEFAULT_THEME profile (has fake history entries).
@@ skipping 40 matching lines @@
   int thumbnails_count = -1;
   ASSERT_TRUE(tab->ExecuteAndExtractInt(L"",
       L"window.domAutomationController.send("
       L"document.getElementsByClassName('thumbnail-container').length)",
       &thumbnails_count));
   EXPECT_GT(thumbnails_count, 0);
 }
 
 TEST_F(NewTabUITest, UpdateUserPrefsVersion) {
   // PrefService with JSON user-pref file only, no enforced or advised prefs.
-  FilePath user_prefs = FilePath();
-  scoped_ptr<PrefService> prefs(
-      PrefService::CreateUserPrefService(user_prefs));
+  scoped_ptr<PrefService> prefs(new TestingPrefService);
 
   // Does the migration
   NewTabUI::RegisterUserPrefs(prefs.get());
 
   ASSERT_EQ(NewTabUI::current_pref_version(),
             prefs->GetInteger(prefs::kNTPPrefVersion));
 
   // Reset the version
   prefs->ClearPref(prefs::kNTPPrefVersion);
   ASSERT_EQ(0, prefs->GetInteger(prefs::kNTPPrefVersion));
@@ skipping 66 matching lines @@
     L"})()"
     L")",
     &has_class));
   ASSERT_TRUE(has_class);
 
   bool is_home_page;
   ASSERT_TRUE(browser->GetBooleanPreference(prefs::kHomePageIsNewTabPage,
                                             &is_home_page));
   ASSERT_TRUE(is_home_page);
 }
-