Add an ExtensionPrefStore, layered between the user prefs nad the managed pre...

chrome/browser/dom_ui/new_tab_ui_uitest.cc

 // Copyright (c) 2009 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"
@@ skipping 57 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.
-  PrefService prefs(new PrefValueStore(
-      NULL, /* no enforced prefs */
-      new JsonPrefStore(
-          FilePath(),
-          ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE)),
-          /* user prefs */
-      NULL /* no advised prefs */));
+  FilePath user_prefs = FilePath();
+  scoped_ptr<PrefService> prefs(
+      PrefService::CreateUserPrefService(user_prefs));
 
   // Does the migration
-  NewTabUI::RegisterUserPrefs(&prefs);
+  NewTabUI::RegisterUserPrefs(prefs.get());
 
   ASSERT_EQ(NewTabUI::current_pref_version(),
-            prefs.GetInteger(prefs::kNTPPrefVersion));
+            prefs->GetInteger(prefs::kNTPPrefVersion));
 
   // Reset the version
-  prefs.ClearPref(prefs::kNTPPrefVersion);
-  ASSERT_EQ(0, prefs.GetInteger(prefs::kNTPPrefVersion));
+  prefs->ClearPref(prefs::kNTPPrefVersion);
+  ASSERT_EQ(0, prefs->GetInteger(prefs::kNTPPrefVersion));
 
-  bool migrated = NewTabUI::UpdateUserPrefsVersion(&prefs);
+  bool migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_TRUE(migrated);
   ASSERT_EQ(NewTabUI::current_pref_version(),
-            prefs.GetInteger(prefs::kNTPPrefVersion));
+            prefs->GetInteger(prefs::kNTPPrefVersion));
 
-  migrated = NewTabUI::UpdateUserPrefsVersion(&prefs);
+  migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_FALSE(migrated);
 }
 
 TEST_F(NewTabUITest, HomePageLink) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
 
   ASSERT_TRUE(
       browser->SetBooleanPreference(prefs::kHomePageIsNewTabPage, false));
 
@@ skipping 49 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);
 }