[DevTools] Add uiTest.testSettings.

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 19 matching lines @@
 
 /**
  * @constructor
  * @implements {InspectorAgent.Dispatcher}
  * @implements {WebInspector.Console.UIDelegate}
  * @suppressGlobalPropertiesCheck
  */
 WebInspector.Main = function()
 {
     WebInspector.console.setUIDelegate(this);
+    WebInspector.Main._instance = this;
     runOnWindowLoad(this._loaded.bind(this));
 }
 
 WebInspector.Main.prototype = {
     /**
      * @override
      * @return {!Promise.<undefined>}
      */
     showConsole: function()
     {
         return WebInspector.Revealer.revealPromise(WebInspector.console);
     },
 
+    /**
+     * @param {function()} callback
+     */
+    _resetSettingsForTest: function(callback)

[pfeldman, 2015/06/09 12:24:51]

Why is this here?

[dgozman, 2015/06/09 13:55:35]

Moved to test.

+    {
+        Runtime.experiments.clearForTest();
+        InspectorFrontendHost.getPreferences(this._createSettings.bind(this, callback));
+    },
+
     _loaded: function()
     {
         console.timeStamp("Main._loaded");
 
         if (InspectorFrontendHost.isUnderTest())
             self.runtime.useTestBase();
-        InspectorFrontendHost.getPreferences(this._createSettings.bind(this));
+        InspectorFrontendHost.getPreferences(this._createSettings.bind(this, this._createAppUI.bind(this)));
     },
 
     /**
+     * @param {function()} callback
      * @param {!Object<string, string>} prefs
      */
-    _createSettings: function(prefs)
+    _createSettings: function(callback, prefs)

[pfeldman, 2015/06/09 12:24:51]

This adds indirection.

     {
         // Patch settings from the URL param (for tests).
         var settingsParam = Runtime.queryParam("settings");
         if (settingsParam) {
             try {
                 var settings = JSON.parse(window.decodeURI(settingsParam));
                 for (var key in settings)
                     prefs[key] = settings[key];
             } catch(e) {
                 // Ignore malformed settings.
@@ skipping 20 matching lines @@
                     InspectorFrontendHost.removePreference(name);
             }
         }
 
         Object.observe(prefs, trackPrefsObject);
         WebInspector.settings = new WebInspector.Settings(prefs);
 
         if (!InspectorFrontendHost.isUnderTest())
             new WebInspector.VersionController().updateVersion();
 
-        this._createAppUI();

[pfeldman, 2015/06/09 12:57:34]

Just move this line to the call site (extract a two-line one in the _loaded).

[dgozman, 2015/06/09 13:55:35]

Done.

+        callback();
     },
 
     /**
      * @param {!Object<string, string>} prefs
      */
     _initializeExperiments: function(prefs)
     {
         Runtime.experiments.register("accessibilityInspection", "Accessibility Inspection");
         Runtime.experiments.register("animationInspection", "Animation Inspection");
         Runtime.experiments.register("applyCustomStylesheet", "Allow custom UI themes");
@@ skipping 722 matching lines @@
     p.classList.add("help-section");
     p.textContent = WebInspector.UIString("Inspected worker has terminated. Once it restarts we will attach to it automatically.");
 }
 
 WebInspector.WorkerTerminatedScreen.prototype = {
 
     __proto__: WebInspector.HelpScreen.prototype
 }
 
 new WebInspector.Main();