WIP: Pref service: use the incognito support from Chrome

chrome/browser/profiles/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/profile_impl.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 88 matching lines @@
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/policy/core/browser/browser_policy_connector.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/json_pref_store.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/proxy_config/pref_proxy_config_tracker.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "components/ssl_config/ssl_config_service_manager.h"
 #include "components/sync_preferences/pref_service_syncable.h"
+#include "components/sync_preferences/pref_service_syncable_factory.h"
 #include "components/url_formatter/url_fixer.h"
 #include "components/user_prefs/user_prefs.h"
 #include "components/zoom/zoom_event_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/common/content_constants.h"
@@ skipping 377 matching lines @@
     }
   }
 
   content::BrowserContext::Initialize(this, path_);
 
   {
     service_manager::Connector* connector = nullptr;
     if (features::PrefServiceEnabled()) {
       connector = content::BrowserContext::GetConnectorFor(this);
     }
-    prefs_ = chrome_prefs::CreateProfilePrefs(
+    prefs_factory_ = chrome_prefs::CreateProfilePrefs(
         path_, std::move(pref_validation_delegate),
         profile_policy_connector_->policy_service(), supervised_user_settings,
         CreateExtensionPrefStore(this, false), pref_registry_, async_prefs,
         connector);
+    prefs_ = prefs_factory_->CreateSyncable(pref_registry_.get(), connector);
     // Register on BrowserContext.
     user_prefs::UserPrefs::Set(this, prefs_.get());
   }
 
   if (async_prefs) {
     // Wait for the notification that prefs has been loaded
     // (successfully or not).  Note that we can use base::Unretained
     // because the PrefService is owned by this class and lives on
     // the same thread.
     prefs_->AddPrefInitObserver(base::Bind(
@@ skipping 439 matching lines @@
 const PrefService* ProfileImpl::GetPrefs() const {
   DCHECK(prefs_);  // Should explicitly be initialized.
   return prefs_.get();
 }
 
 ChromeZoomLevelPrefs* ProfileImpl::GetZoomLevelPrefs() {
   return static_cast<ChromeZoomLevelPrefs*>(
       GetDefaultStoragePartition(this)->GetZoomLevelDelegate());
 }
 
-PrefService* ProfileImpl::GetOffTheRecordPrefs() {
+sync_preferences::PrefServiceSyncable* ProfileImpl::CreateOffTheRecordPrefs(
+    service_manager::Connector* otr_connector) {
   DCHECK(prefs_);
   if (!otr_prefs_) {
+    service_manager::Connector* user_connector = nullptr;
+    if (otr_connector) {
+      user_connector = content::BrowserContext::GetConnectorFor(this);
+    }
+    // List of keys that cannot be changed in the user prefs file by the
+    // incognito
+    // profile.  All preferences that store information about the browsing
+    // history or behavior of the user should have this property.
+    std::vector<const char*> overlay_pref_names;
+    overlay_pref_names.push_back(prefs::kBrowserWindowPlacement);
+    overlay_pref_names.push_back(prefs::kMediaRouterTabMirroringSources);
+    overlay_pref_names.push_back(prefs::kSaveFileDefaultDirectory);
+#if defined(OS_ANDROID)
+    overlay_pref_names.push_back(proxy_config::prefs::kProxy);
+#endif
+
     // The new ExtensionPrefStore is ref_counted and the new PrefService
     // stores a reference so that we do not leak memory here.
-    otr_prefs_.reset(CreateIncognitoPrefServiceSyncable(
-        prefs_.get(), CreateExtensionPrefStore(this, true)));
+    otr_prefs_ = prefs_factory_->CreateIncognitoSyncable(
+        pref_registry_.get(), CreateExtensionPrefStore(this, true),
+        overlay_pref_names, chrome::InProcessIncognitoPrefStores(),
+        otr_connector, user_connector);
   }
   return otr_prefs_.get();
 }
 
+PrefService* ProfileImpl::GetOffTheRecordPrefs() {
+  return GetOffTheRecordProfile()->GetPrefs();
+}
+
 content::ResourceContext* ProfileImpl::GetResourceContext() {
   return io_data_.GetResourceContext();
 }
 
 net::URLRequestContextGetter* ProfileImpl::GetRequestContext() {
   return GetDefaultStoragePartition(this)->GetURLRequestContext();
 }
 
 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForExtensions() {
   return io_data_.GetExtensionsRequestContextGetter().get();
@@ skipping 370 matching lines @@
     return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>();
 
   return service->CreateMonitor(
       BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
 }
 
 std::unique_ptr<service_manager::Service> ProfileImpl::CreateIdentityService() {
   SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(this);
   return base::MakeUnique<identity::IdentityService>(signin_manager);
 }