Remove dependency of PrefSyncableService on PrefsTabHelper.

chrome/browser/prefs/pref_service_syncable.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/prefs/pref_service_syncable.h"
 
 #include "base/bind.h"
+#include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/prefs/default_pref_store.h"
 #include "base/prefs/overlay_user_pref_store.h"
 #include "base/prefs/pref_notifier_impl.h"
 #include "base/prefs/pref_registry.h"
 #include "base/prefs/pref_value_store.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/value_conversions.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/pref_service_syncable_observer.h"
-#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 
 PrefServiceSyncable::PrefServiceSyncable(
     PrefNotifierImpl* pref_notifier,
     PrefValueStore* pref_value_store,
     PersistentPrefStore* user_prefs,
     user_prefs::PrefRegistrySyncable* pref_registry,
     base::Callback<void(PersistentPrefStore::PrefReadError)>
         read_error_callback,
     bool async)
   : PrefService(pref_notifier,
                 pref_value_store,
                 user_prefs,
                 pref_registry,
                 read_error_callback,
                 async),
     pref_sync_associator_(syncer::PREFERENCES),
     priority_pref_sync_associator_(syncer::PRIORITY_PREFERENCES) {
   pref_sync_associator_.SetPrefService(this);
   priority_pref_sync_associator_.SetPrefService(this);
 
   // Let PrefModelAssociators know about changes to preference values.
-  pref_value_store->set_callback(
-      base::Bind(&PrefServiceSyncable::ProcessPrefChange,
-                 base::Unretained(this)));
+  pref_value_store->set_callback(base::Bind(
+      &PrefServiceSyncable::ProcessPrefChange, base::Unretained(this)));
 
   // Add already-registered syncable preferences to PrefModelAssociator.
   for (PrefRegistry::const_iterator it = pref_registry->begin();
        it != pref_registry->end(); ++it) {
     const std::string& path = it->first;
     AddRegisteredSyncablePreference(path,
                                     pref_registry_->GetRegistrationFlags(path));
   }
 
   // Watch for syncable preferences registered after this point.
   pref_registry->SetSyncableRegistrationCallback(
       base::Bind(&PrefServiceSyncable::AddRegisteredSyncablePreference,
                  base::Unretained(this)));
 }
 
 PrefServiceSyncable::~PrefServiceSyncable() {
   // Remove our callback from the registry, since it may outlive us.
   user_prefs::PrefRegistrySyncable* registry =
       static_cast<user_prefs::PrefRegistrySyncable*>(pref_registry_.get());
   registry->SetSyncableRegistrationCallback(
       user_prefs::PrefRegistrySyncable::SyncableRegistrationCallback());
 }
 
 PrefServiceSyncable* PrefServiceSyncable::CreateIncognitoPrefService(
-    PrefStore* incognito_extension_prefs) {
+    PrefStore* incognito_extension_prefs,
+    const base::Callback<void(OverlayUserPrefStore*)>&
+        incognito_pref_created_cb) {
   pref_service_forked_ = true;
   PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
   OverlayUserPrefStore* incognito_pref_store =
       new OverlayUserPrefStore(user_pref_store_.get());
-  PrefsTabHelper::InitIncognitoUserPrefStore(incognito_pref_store);
+  if (!incognito_pref_created_cb.is_null())

[gab, 2015/09/11 12:58:32]

This wasn't previously optional. Enforce it by contract and DCHECK that it's
set?

[sdefresne, 2015/09/14 13:17:26]

This is commented out in the downstream iOS fork (as we do not build
PrefsTabHelper on that platform), and this is why I made it optional. I've
changed to use a std::vector<const char*> of preference names to overlay. Since
we may want to pass an empty vector, I've not added a DCHECK() that the vector
is empty.

+    incognito_pref_created_cb.Run(incognito_pref_store);
 
   scoped_refptr<user_prefs::PrefRegistrySyncable> forked_registry =
-      static_cast<user_prefs::PrefRegistrySyncable*>(
-          pref_registry_.get())->ForkForIncognito();
+      static_cast<user_prefs::PrefRegistrySyncable*>(pref_registry_.get())
+          ->ForkForIncognito();

[gab, 2015/09/11 12:58:32]

Weird formatting... preferred old one: same number of lines, more readable IMO..

[sdefresne, 2015/09/14 13:17:26]

Reverted.

   PrefServiceSyncable* incognito_service = new PrefServiceSyncable(
       pref_notifier,
       pref_value_store_->CloneAndSpecialize(NULL,  // managed
                                             NULL,  // supervised_user
                                             incognito_extension_prefs,
                                             NULL,  // command_line_prefs
                                             incognito_pref_store,
                                             NULL,  // recommended
                                             forked_registry->defaults().get(),
                                             pref_notifier),
@@ skipping 39 matching lines @@
 }
 
 void PrefServiceSyncable::UpdateCommandLinePrefStore(
     PrefStore* cmd_line_store) {
   // If |pref_service_forked_| is true, then this PrefService and the forked
   // copies will be out of sync.
   DCHECK(!pref_service_forked_);
   PrefService::UpdateCommandLinePrefStore(cmd_line_store);
 }
 
-void PrefServiceSyncable::AddSyncedPrefObserver(
-    const std::string& name,
-    SyncedPrefObserver* observer) {
+void PrefServiceSyncable::AddSyncedPrefObserver(const std::string& name,
+                                                SyncedPrefObserver* observer) {
   pref_sync_associator_.AddSyncedPrefObserver(name, observer);
   priority_pref_sync_associator_.AddSyncedPrefObserver(name, observer);
 }
 
 void PrefServiceSyncable::RemoveSyncedPrefObserver(
     const std::string& name,
     SyncedPrefObserver* observer) {
   pref_sync_associator_.RemoveSyncedPrefObserver(name, observer);
   priority_pref_sync_associator_.RemoveSyncedPrefObserver(name, observer);
 }
 
 void PrefServiceSyncable::AddRegisteredSyncablePreference(
     const std::string& path,
     uint32 flags) {
   DCHECK(FindPreference(path));
   if (flags & user_prefs::PrefRegistrySyncable::SYNCABLE_PREF) {
     pref_sync_associator_.RegisterPref(path.c_str());
-  } else if (flags &
-             user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF) {
+  } else if (flags & user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF) {
     priority_pref_sync_associator_.RegisterPref(path.c_str());
   }
 }
 
 void PrefServiceSyncable::OnIsSyncingChanged() {
   FOR_EACH_OBSERVER(PrefServiceSyncableObserver, observer_list_,
                     OnIsSyncingChanged());
 }
 
 void PrefServiceSyncable::ProcessPrefChange(const std::string& name) {
   pref_sync_associator_.ProcessPrefChange(name);
   priority_pref_sync_associator_.ProcessPrefChange(name);
 }