DevTools: respect isUnderTest conditions in the browser tests.

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 33 matching lines @@
    * @param {boolean} hard
    */
   static _reloadPage(hard) {
     var mainTarget = SDK.targetManager.mainTarget();
     if (mainTarget && mainTarget.hasBrowserCapability())
       SDK.targetManager.reloadPage(hard);
   }
 
   _loaded() {
     console.timeStamp('Main._loaded');
-
-    if (InspectorFrontendHost.isUnderTest())
-      self.runtime.useTestBase();
     Runtime.setPlatform(Host.platform());
     InspectorFrontendHost.getPreferences(this._gotPreferences.bind(this));
   }
 
   /**
    * @param {!Object<string, string>} prefs
    */
   _gotPreferences(prefs) {
     console.timeStamp('Main._gotPreferences');
+    if (Host.isUnderTest(prefs))
+      self.runtime.useTestBase();
     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 storagePrefix = '';
     if (Host.isCustomDevtoolsFrontend())
       storagePrefix = '__custom__';
     else if (
         !Runtime.queryParam('can_dock') && !!Runtime.queryParam('debugFrontend') &&
-        !InspectorFrontendHost.isUnderTest())
+        !Host.isUnderTest(prefs))
       storagePrefix = '__bundled__';
     var clearLocalStorage = window.localStorage ? window.localStorage.clear.bind(window.localStorage) : undefined;
     var localStorage =
         new Common.SettingsStorage(window.localStorage || {}, undefined, undefined, clearLocalStorage, storagePrefix);
     var globalStorage = new Common.SettingsStorage(
         prefs, InspectorFrontendHost.setPreference, InspectorFrontendHost.removePreference,
         InspectorFrontendHost.clearPreferences, storagePrefix);
     Common.settings = new Common.Settings(globalStorage, localStorage);
-
-    if (!InspectorFrontendHost.isUnderTest())
+    if (!Host.isUnderTest(prefs))
       new Common.VersionController().updateVersion();
   }
 
   /**
    * @param {!Object<string, string>} prefs
    */
   _initializeExperiments(prefs) {
     Runtime.experiments.register('accessibilityInspection', 'Accessibility Inspection');
     Runtime.experiments.register('applyCustomStylesheet', 'Allow custom UI themes');
     Runtime.experiments.register('audits2', 'Audits 2.0', true);
@@ skipping 20 matching lines @@
     Runtime.experiments.register('timelineFlowEvents', 'Timeline flow events', true);
     Runtime.experiments.register('timelineInvalidationTracking', 'Timeline invalidation tracking', true);
     Runtime.experiments.register('timelineRecordingPerspectives', 'Timeline recording perspectives UI');
     Runtime.experiments.register('timelineTracingJSProfile', 'Timeline tracing based JS profiler', true);
     Runtime.experiments.register('timelineV8RuntimeCallStats', 'V8 Runtime Call Stats on Timeline', true);
     Runtime.experiments.register('timelineRuleUsageRecording', 'Track CSS rules usage while recording Timeline.');
     Runtime.experiments.register('timelinePerFrameTrack', 'Show track per frame on Timeline', true);
 
     Runtime.experiments.cleanUpStaleExperiments();
 
-    if (InspectorFrontendHost.isUnderTest()) {
+    if (Host.isUnderTest(prefs)) {
       var testPath = JSON.parse(prefs['testPath'] || '""');
       // Enable experiments for testing.
       if (testPath.indexOf('layers/') !== -1)
         Runtime.experiments.enableForTest('layersPanel');
       if (testPath.indexOf('timeline/') !== -1 || testPath.indexOf('layers/') !== -1)
         Runtime.experiments.enableForTest('layersPanel');
       if (testPath.indexOf('security/') !== -1)
         Runtime.experiments.enableForTest('securityPanel');
       if (testPath.indexOf('accessibility/') !== -1)
         Runtime.experiments.enableForTest('accessibilityInspection');
@@ skipping 908 matching lines @@
    * @override
    * @return {?Element}
    */
   settingElement() {
     return UI.SettingsUI.createSettingCheckbox(
         Common.UIString('Show rulers'), Common.moduleSetting('showMetricsRulers'));
   }
 };
 
 new Main.Main();