Revert of DevTools: isolate settings of custom devtoools front-end.

third_party/WebKit/Source/devtools/front_end/main/Main.js

Index: third_party/WebKit/Source/devtools/front_end/main/Main.js
diff --git a/third_party/WebKit/Source/devtools/front_end/main/Main.js b/third_party/WebKit/Source/devtools/front_end/main/Main.js
index a5e24b491effc51b1d7523db1baab977d9e12a65..5df24c9ca10ccbeb1f17ff1c9a0c55d5ce5d69ef 100644
--- a/third_party/WebKit/Source/devtools/front_end/main/Main.js
+++ b/third_party/WebKit/Source/devtools/front_end/main/Main.js
@@ -55,18 +55,7 @@
     if (InspectorFrontendHost.isUnderTest())
       self.runtime.useTestBase();
     Runtime.setPlatform(WebInspector.platform());
-    this._preferencesProvider().getPreferences(this._gotPreferences.bind(this));
-  }
-
-  /**
-   * @return {!InspectorFrontendHostAPI}
-   */
-  _preferencesProvider() {
-    if (this._preferencesProviderInstance)
-      return this._preferencesProviderInstance;
-    var isCustomFrontend = window.location.toString().startsWith('chrome-devtools://devtools/custom/');
-    this._preferencesProviderInstance = isCustomFrontend ? new WebInspector.InspectorFrontendHostStub() : InspectorFrontendHost;
-    return this._preferencesProviderInstance;
+    InspectorFrontendHost.getPreferences(this._gotPreferences.bind(this));
   }
 
   /**
@@ -84,10 +73,9 @@
    */
   _createSettings(prefs) {
     this._initializeExperiments(prefs);
-    var preferencesProvider = this._preferencesProvider();
     WebInspector.settings = new WebInspector.Settings(new WebInspector.SettingsStorage(
-      prefs, preferencesProvider.setPreference.bind(preferencesProvider), preferencesProvider.removePreference.bind(preferencesProvider),
-      preferencesProvider.clearPreferences.bind(preferencesProvider)));
+        prefs, InspectorFrontendHost.setPreference, InspectorFrontendHost.removePreference,
+        InspectorFrontendHost.clearPreferences));
 
     if (!InspectorFrontendHost.isUnderTest())
       new WebInspector.VersionController().updateVersion();