Remove dependency of PrefSyncableService on PrefsTabHelper.

chrome/browser/prefs/pref_service_syncable.h

 // 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.
 
 #ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_
 #define CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_
 
+#include "base/callback_forward.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/synced_pref_observer.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 
+class OverlayUserPrefStore;
+class PrefModelAssociatorClient;

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

This fwd-decl doesn't belong in this CL yet.

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

Ack.

 class PrefServiceSyncableObserver;
 
 namespace syncer {
 class SyncableService;
 }
 
 // A PrefService that can be synced. Users are forced to declare
 // whether preferences are syncable or not when registering them to
 // this PrefService.
 class PrefServiceSyncable : public PrefService {
  public:
   // You may wish to use PrefServiceFactory or one of its subclasses
   // for simplified construction.
-  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);
+  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);
   ~PrefServiceSyncable() override;
 
   // Creates an incognito copy of the pref service that shares most pref stores
   // but uses a fresh non-persistent overlay for the user pref store and an
   // individual extension pref store (to cache the effective extension prefs for
-  // incognito windows).
+  // incognito windows). |incognito_pref_created_cb| will be invoked with the
+  // new incognito pref store before the pref registry is created in case some
+  // of the preference need to be overriden in incognito (may be null).
   PrefServiceSyncable* CreateIncognitoPrefService(
-      PrefStore* incognito_extension_prefs);
+      PrefStore* incognito_extension_prefs,
+      const base::Callback<void(OverlayUserPrefStore*)>&
+          incognito_pref_created_cb);
 
   // Returns true if preferences state has synchronized with the remote
   // preferences. If true is returned it can be assumed the local preferences
   // has applied changes from the remote preferences. The two may not be
   // identical if a change is in flight (from either side).
   //
   // TODO(albertb): Given that we now support priority preferences, callers of
   // this method are likely better off making the preferences they care about
   // into priority preferences and calling IsPrioritySyncing().
   bool IsSyncing();
@@ skipping 39 matching lines @@
 
   PrefModelAssociator pref_sync_associator_;
   PrefModelAssociator priority_pref_sync_associator_;
 
   base::ObserverList<PrefServiceSyncableObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncable);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_