Remove per-tab preference machinery.

It's no longer needed, according to mnaganov@, and it wasn't interacting well
with extension-controlled preferences. This is a partial revert of the
following:

http://codereview.chromium.org/8879016/
http://codereview.chromium.org/8747015/
http://codereview.chromium.org/8716004/
http://codereview.chromium.org/8568019/

The "global" pref names are are kept as is. I plan to rename them back
to the original names after this patch.

Also, per-tab preferences introduced in the following are reverted:
https://chromiumcodereview.appspot.com/9264071/
https://chromiumcodereview.appspot.com/9255018/



BUG=105537
TEST=manually and unit_tests --gtest_filter=Pref* and
browser_tests --gtest_filter=PrefsTabHelperBrowserTest* still pass


Review URL: http://codereview.chromium.org/9838050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128871 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 30 deletions

diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc
index 510ac1c..06e1d57 100644
--- a/chrome/browser/prefs/pref_service.cc
+++ b/chrome/browser/prefs/pref_service.cc
@@ -204,32 +204,6 @@ PrefService* PrefService::CreateIncognitoPrefService(
       false);
 }
 
-PrefService* PrefService::CreatePrefServiceWithPerTabPrefStore() {
-  pref_service_forked_ = true;
-  PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
-  OverlayUserPrefStore* per_tab_pref_store =
-      new OverlayUserPrefStore(user_pref_store_.get());
-  PrefsTabHelper::InitPerTabUserPrefStore(per_tab_pref_store);
-  DefaultPrefStore* default_store = new DefaultPrefStore();
-  return new PrefService(
-      pref_notifier,
-      pref_value_store_->CloneAndSpecialize(
-          NULL,  // managed_platform_prefs
-          NULL,  // managed_cloud_prefs
-          NULL,  // extension_prefs
-          NULL,  // command_line_prefs
-          per_tab_pref_store,
-          NULL,  // recommended_platform_prefs
-          NULL,  // recommended_cloud_prefs
-          default_store,
-          NULL,
-          pref_notifier),
-      per_tab_pref_store,
-      default_store,
-      NULL,
-      false);
-}
-
 PrefService::PrefService(PrefNotifierImpl* pref_notifier,
                          PrefValueStore* pref_value_store,
                          PersistentPrefStore* user_prefs,
diff --git a/chrome/browser/prefs/pref_service.h b/chrome/browser/prefs/pref_service.h
index 861195c..890ec1b 100644
--- a/chrome/browser/prefs/pref_service.h
+++ b/chrome/browser/prefs/pref_service.h
@@ -161,10 +161,6 @@ class PrefService : public base::NonThreadSafe {
   // incognito windows).
   PrefService* CreateIncognitoPrefService(PrefStore* incognito_extension_prefs);
 
-  // Creates a per-tab copy of the pref service that shares most pref stores
-  // and allows WebKit-related preferences to be overridden on per-tab basis.
-  PrefService* CreatePrefServiceWithPerTabPrefStore();
-
   virtual ~PrefService();
 
   // Reloads the data from file. This should only be called when the importer