Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/profiles/off_the_record_profile_impl.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 "chrome/browser/profiles/off_the_record_profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
-#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 30 matching lines @@
 void NotifyOTRProfileDestroyedOnIOThread(void* original_profile,
                                          void* otr_profile) {
   ExtensionWebRequestEventRouter::GetInstance()->OnOTRProfileDestroyed(
       original_profile, otr_profile);
 }
 
 }  // namespace
 
 OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile)
     : profile_(real_profile),
-      prefs_(real_profile->GetOffTheRecordPrefs()),
+      prefs_(PrefServiceSyncable::IncognitoFromProfile(real_profile)),
       ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
       start_time_(Time::Now()),
       zoom_callback_(base::Bind(&OffTheRecordProfileImpl::OnZoomLevelChanged,
                                 base::Unretained(this))) {
 }
 
 void OffTheRecordProfileImpl::Init() {
   ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false);
 
   extensions::ExtensionSystem::Get(this)->InitForOTRProfile();
@@ skipping 136 matching lines @@
 
 policy::ManagedModePolicyProvider*
     OffTheRecordProfileImpl::GetManagedModePolicyProvider() {
   return profile_->GetManagedModePolicyProvider();
 }
 
 policy::PolicyService* OffTheRecordProfileImpl::GetPolicyService() {
   return profile_->GetPolicyService();
 }
 
-PrefServiceSyncable* OffTheRecordProfileImpl::GetPrefs() {
+PrefService* OffTheRecordProfileImpl::GetPrefs() {
   return prefs_;
 }
 
-PrefServiceSyncable* OffTheRecordProfileImpl::GetOffTheRecordPrefs() {
+PrefService* OffTheRecordProfileImpl::GetOffTheRecordPrefs() {
   return prefs_;
 }
 
 DownloadManagerDelegate* OffTheRecordProfileImpl::GetDownloadManagerDelegate() {
   return DownloadServiceFactory::GetForProfile(this)->
       GetDownloadManagerDelegate();
 }
 
 net::URLRequestContextGetter* OffTheRecordProfileImpl::GetRequestContext() {
   return GetDefaultStoragePartition(this)->GetURLRequestContext();
@@ skipping 205 matching lines @@
 // Special case of the OffTheRecordProfileImpl which is used while Guest
 // session in CrOS.
 class GuestSessionProfile : public OffTheRecordProfileImpl {
  public:
   explicit GuestSessionProfile(Profile* real_profile)
       : OffTheRecordProfileImpl(real_profile) {
   }
 
   virtual void InitChromeOSPreferences() OVERRIDE {
     chromeos_preferences_.reset(new chromeos::Preferences());
-    chromeos_preferences_->Init(GetPrefs());
+    chromeos_preferences_->Init(static_cast<PrefServiceSyncable*>(GetPrefs()));
   }
 
  private:
   // The guest user should be able to customize Chrome OS preferences.
   scoped_ptr<chromeos::Preferences> chromeos_preferences_;
 };
 #endif
 
 Profile* Profile::CreateOffTheRecordProfile() {
   OffTheRecordProfileImpl* profile = NULL;
@@ skipping 10 matching lines @@
 void OffTheRecordProfileImpl::OnZoomLevelChanged(const std::string& host) {
   if (host.empty())
     return;
 
   HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
   HostZoomMap* parent_host_zoom_map =
       HostZoomMap::GetForBrowserContext(profile_);
   double level = parent_host_zoom_map->GetZoomLevel(host);
   host_zoom_map->SetZoomLevel(host, level);
 }