Introduce incognito preference settings.

chrome/browser/profiles/profile.cc

 // Copyright (c) 2011 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/profile.h"
 
 #include <string>
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chrome_blob_storage_context.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_message_service.h"
+#include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/file_system/browser_file_system_helper.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
+#include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
@@ skipping 95 matching lines @@
 // OffTheRecordProfileImpl is a profile subclass that wraps an existing profile
 // to make it suitable for the off the record mode.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class OffTheRecordProfileImpl : public Profile,
                                 public BrowserList::Observer {
  public:
   explicit OffTheRecordProfileImpl(Profile* real_profile)
       : profile_(real_profile),
         start_time_(Time::Now()) {
+    prefs_.reset(profile_->GetPrefs()->CreateIncognitoPrefService(
+        new ExtensionPrefStore(profile_->GetExtensionPrefValueMap(), true)));

[Mattias Nissler (ping if slow), 2011/01/21 08:53:08]

Hm, what's the contract of GetExtensionPrefValueMap()? As far as I can see it
may return NULL if you don't call real_profile->GetPrefs() first, but you're not
prepared to handle that here. Maybe you want to move the lazy initialization
into GetExtensionPrefValueMap so it always returns something?

[battre, 2011/01/24 17:47:18]

I cannot move the entire lazy initialization of |extension_pref_value_map_| into
GetExtensionPrefValueMap because |pref_| requires it at construction time. I
call GetPrefs() now in ProfileImpl::GetExtensionPrefValueMap(). That does the
trick.

Done.

+
     request_context_ = ChromeURLRequestContextGetter::CreateOffTheRecord(this);
     extension_process_manager_.reset(ExtensionProcessManager::Create(this));
 
     BrowserList::AddObserver(this);
 
     background_contents_service_.reset(
         new BackgroundContentsService(this, CommandLine::ForCurrentProcess()));
   }
 
   virtual ~OffTheRecordProfileImpl() {
     NotificationService::current()->Notify(NotificationType::PROFILE_DESTROYED,
                                            Source<Profile>(this),
                                            NotificationService::NoDetails());
     CleanupRequestContext(request_context_);
     CleanupRequestContext(extensions_request_context_);
 
     // Clean up all DB files/directories
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(
             db_tracker_.get(),
             &webkit_database::DatabaseTracker::DeleteIncognitoDBDirectory));
 
     BrowserList::RemoveObserver(this);
+
+    if (pref_proxy_config_tracker_)
+      pref_proxy_config_tracker_->DetachFromPrefService();
   }
 
   virtual ProfileId GetRuntimeId() {
     return reinterpret_cast<ProfileId>(this);
   }
 
   virtual FilePath GetPath() { return profile_->GetPath(); }
 
   virtual bool IsOffTheRecord() {
     return true;
@@ skipping 131 matching lines @@
 
   virtual PasswordStore* GetPasswordStore(ServiceAccessType sat) {
     if (sat == EXPLICIT_ACCESS)
       return profile_->GetPasswordStore(sat);
 
     NOTREACHED() << "This profile is OffTheRecord";
     return NULL;
   }
 
   virtual PrefService* GetPrefs() {
-    return profile_->GetPrefs();
+    return prefs_.get();
   }
 
   virtual TemplateURLModel* GetTemplateURLModel() {
     return profile_->GetTemplateURLModel();
   }
 
   virtual TemplateURLFetcher* GetTemplateURLFetcher() {
     return profile_->GetTemplateURLFetcher();
   }
 
@@ skipping 277 matching lines @@
     return NULL;
   }
 
 #if defined(OS_CHROMEOS)
   virtual void ChangeApplicationLocale(
       const std::string& locale, bool keep_local) {
   }
 #endif  // defined(OS_CHROMEOS)
 
   virtual PrefProxyConfigTracker* GetProxyConfigTracker() {
-    return profile_->GetProxyConfigTracker();
+    if (!pref_proxy_config_tracker_)
+      pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs());
+
+    return pref_proxy_config_tracker_;
   }
 
   virtual PrerenderManager* GetPrerenderManager() {
     // We do not allow prerendering in OTR profiles at this point.
     // TODO(tburkard): Figure out if we want to support this, and how, at some
     // point in the future.
     return NULL;
   }
 
+ protected:
+  virtual ExtensionPrefValueMap* GetExtensionPrefValueMap() {
+    return profile_->GetExtensionPrefValueMap();
+  }
+
  private:
   NotificationRegistrar registrar_;
 
   // The real underlying profile.
   Profile* profile_;
 
+  scoped_ptr<PrefService> prefs_;
+
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
 
   // The context to use for requests made from this OTR session.
   scoped_refptr<ChromeURLRequestContextGetter> request_context_;
 
   // The context to use for requests made by an extension while in OTR mode.
   scoped_refptr<ChromeURLRequestContextGetter> extensions_request_context_;
 
   // The download manager that only stores downloaded items in memory.
   scoped_refptr<DownloadManager> download_manager_;
@@ skipping 35 matching lines @@
   FilePath last_selected_directory_;
 
   // Tracks all BackgroundContents running under this profile.
   scoped_ptr<BackgroundContentsService> background_contents_service_;
 
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
 
   // The file_system context for this profile.
   scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
 
+  scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
+
   DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
 };
 
 Profile* Profile::CreateOffTheRecordProfile() {
   return new OffTheRecordProfileImpl(this);
 }