Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/extensions/platform_app_browsertest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/permissions/permissions_api.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/browser/extensions/platform_app_launcher.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
@@ skipping 837 matching lines @@
       extension_service()->extension_prefs();
 
   // Clear the registered events to ensure they are updated.
   extension_prefs->SetRegisteredEvents(extension->id(),
                                        std::set<std::string>());
 
   const base::StringValue old_version("1");
   std::string pref_path("extensions.settings.");
   pref_path += extension->id();
   pref_path += ".manifest.version";
-  extension_prefs->pref_service()->RegisterStringPref(
-      pref_path.c_str(), std::string(), PrefServiceSyncable::UNSYNCABLE_PREF);
+  // TODO(joi): Do registrations up front.
+  PrefRegistrySyncable* registry = static_cast<PrefRegistrySyncable*>(
+      extension_prefs->pref_service()->DeprecatedGetPrefRegistry());
+  registry->RegisterStringPref(
+      pref_path.c_str(), std::string(), PrefRegistrySyncable::UNSYNCABLE_PREF);
   extension_prefs->pref_service()->Set(pref_path.c_str(), old_version);
 }
 
 // Component App Test 3 of 3: simulate a component extension upgrade that
 // re-adds the OnLaunched event, and allows the app to be launched.
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, ComponentAppBackgroundPage) {
   CheckExtensionInstalledObserver should_install;
   // Since we are forcing an upgrade, we need to wait for the load again.
   content::WindowedNotificationObserver app_loaded_observer(
       content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
@@ skipping 34 matching lines @@
 #define MAYBE_WebContentsHasFocus WebContentsHasFocus
 #endif
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_WebContentsHasFocus) {
   const Extension* extension = LoadAndLaunchPlatformApp("minimal");
   ShellWindow* window = CreateShellWindow(extension);
   EXPECT_TRUE(window->web_contents()->GetRenderWidgetHostView()->HasFocus());
   CloseShellWindow(window);
 }
 
 }  // namespace extensions