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

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

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 37 matching lines @@
     if (mainTarget && mainTarget.hasBrowserCapability())
       WebInspector.targetManager.reloadPage(hard);
   }
 
   _loaded() {
     console.timeStamp('Main._loaded');
 
     if (InspectorFrontendHost.isUnderTest())
       self.runtime.useTestBase();
     Runtime.setPlatform(WebInspector.platform());
-    this._preferencesProvider().getPreferences(this._gotPreferences.bind(this));
+    InspectorFrontendHost.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;
-  }
-
-  /**
    * @param {!Object<string, string>} prefs
    */
   _gotPreferences(prefs) {
     console.timeStamp('Main._gotPreferences');
     this._createSettings(prefs);
     this._createAppUI();
   }
 
   /**
    * @param {!Object<string, string>} prefs
    * Note: this function is called from testSettings in Tests.js.
    */
   _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();
   }
 
   /**
    * @param {!Object<string, string>} prefs
    */
   _initializeExperiments(prefs) {
     Runtime.experiments.register('accessibilityInspection', 'Accessibility Inspection');
@@ skipping 958 matching lines @@
    * @override
    * @return {?Element}
    */
   settingElement() {
     return WebInspector.SettingsUI.createSettingCheckbox(
         WebInspector.UIString('Show rulers'), WebInspector.moduleSetting('showMetricsRulers'));
   }
 };
 
 new WebInspector.Main();