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 32 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)),

[Mattias Nissler (ping if slow), 2013/02/06 17:53:33]

Do we really need a PrefServiceSyncable typed pointer? Can we possibly declare
prefs_ to be of type PrefService?

[Jói, 2013/02/07 14:52:32]

I think we probably could, but we'd be casting it in a few more places and it'd
be less typesafe. Note that profile.h and related headers don't #include the
PrefServiceSyncable header, they just forward-declare the class so that they can
store a pointer to it, so changing the type wouldn't hide it any better than
it's hidden now...

[Mattias Nissler (ping if slow), 2013/02/08 11:26:56]

OK for now.

       ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
       start_time_(Time::Now()) {
 }
 
 void OffTheRecordProfileImpl::Init() {
   ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false);
 
   extensions::ExtensionSystem::Get(this)->InitForOTRProfile();
 
   DCHECK_NE(IncognitoModePrefs::DISABLED,
@@ skipping 132 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 io_data_.GetMainRequestContextGetter();
@@ skipping 193 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() {
     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;
 #if defined(OS_CHROMEOS)
   if (IsGuestSession())
     profile = new GuestSessionProfile(this);
 #endif
   if (!profile)
     profile = new OffTheRecordProfileImpl(this);
   profile->Init();
   return profile;
 }