[DevTools] Move ConsoleModel to it's own module

This finally moves ConsoleModel out of sdk. NetworkLog is next.

BUG=none

Review-Url: https://codereview.chromium.org/2751193003
Cr-Commit-Position: refs/heads/master@{#457499}

third_party/WebKit/LayoutTests/http/tests/inspector-enabled/console-clear-arguments-on-frame-navigation.html

@@ -24,7 +24,7 @@ function frameLoaded(event) {
 
 function test()
 {
-    for (var message of SDK.consoleModel.messages()) {
+    for (var message of ConsoleModel.consoleModel.messages()) {
         var args = (message.parameters || []).map((arg) => arg.type);
         InspectorTest.addResult("Message: \"" + message.messageText + "\", arguments: [" + args.join(", ") + "]");
     }

third_party/WebKit/LayoutTests/http/tests/inspector-enabled/console-clear-arguments-on-frame-remove.html

@@ -31,7 +31,7 @@ function createIFrame()
 
 function test()
 {
-    for (var message of SDK.consoleModel.messages()) {
+    for (var message of ConsoleModel.consoleModel.messages()) {
         var args = (message.parameters || []).map((arg) => arg.type);
         InspectorTest.addResult("Message: \"" + message.messageText + "\", arguments: [" + args.join(", ") + "]");
     }

third_party/WebKit/LayoutTests/http/tests/inspector/console-test.js

@@ -93,7 +93,7 @@ InspectorTest.dumpConsoleMessages = function(printOriginatingCommand, dumpClassN
 
 InspectorTest.dumpConsoleMessagesIntoArray = function(printOriginatingCommand, dumpClassNames, formatter)
 {
-    Common.settingForTest('messageLevelFilters2').set(SDK.ConsoleMessage.MessageLevel.Verbose);
+    Common.settingForTest('messageLevelFilters2').set(ConsoleModel.ConsoleMessage.MessageLevel.Verbose);
     formatter = formatter || InspectorTest.prepareConsoleMessageText;
     var result = [];
     InspectorTest.disableConsoleViewport();

third_party/WebKit/LayoutTests/http/tests/inspector/console/console-links-on-messages-before-inspection.html

@@ -15,8 +15,8 @@ function test()
 {
     var mainTarget = SDK.targetManager.mainTarget();
     var debuggerModel = SDK.DebuggerModel.fromTarget(mainTarget);
-    var message = new SDK.ConsoleMessage(mainTarget, SDK.ConsoleMessage.MessageSource.JS, SDK.ConsoleMessage.MessageLevel.Info, "hello?", null, "http://127.0.0.1:8000/inspector/resources/source2.js");
-    SDK.consoleModel.addMessage(message);
+    var message = new ConsoleModel.ConsoleMessage(mainTarget, ConsoleModel.ConsoleMessage.MessageSource.JS, ConsoleModel.ConsoleMessage.MessageLevel.Info, "hello?", null, "http://127.0.0.1:8000/inspector/resources/source2.js");
+    ConsoleModel.consoleModel.addMessage(message);
     debuggerModel.addEventListener(SDK.DebuggerModel.Events.ParsedScriptSource, onScriptAdded);
 
     InspectorTest.dumpConsoleMessages();

third_party/WebKit/LayoutTests/http/tests/inspector/inspector-test.js

@@ -668,7 +668,7 @@ InspectorTest.addSnifferPromise = function(receiver, methodName)
 
 InspectorTest.addConsoleSniffer = function(override, opt_sticky)
 {
-    InspectorTest.addSniffer(SDK.ConsoleModel.prototype, "addMessage", override, opt_sticky);
+    InspectorTest.addSniffer(ConsoleModel.ConsoleModel.prototype, "addMessage", override, opt_sticky);
 }
 
 InspectorTest.override = function(receiver, methodName, override, opt_sticky)
@@ -987,7 +987,7 @@ SDK.targetManager.observeTargets({
         InspectorTest.serviceWorkerManager = target.model(SDK.ServiceWorkerManager);
         InspectorTest.tracingManager = target.model(SDK.TracingManager);
         InspectorTest.mainTarget = target;
-        InspectorTest.consoleModel = SDK.consoleModel;
+        InspectorTest.consoleModel = ConsoleModel.consoleModel;
     },
 
     targetRemoved: function(target) { }

third_party/WebKit/LayoutTests/http/tests/inspector/service-workers/user-agent-override.html

@@ -30,13 +30,13 @@ function test()
     function waitForConsoleMessage(regex)
     {
         return new Promise(function(resolve) {
-            SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, sniff);
+            ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, sniff);
 
             function sniff(e)
             {
                 if (e.data && regex.test(e.data.messageText)) {
                     resolve(e.data);
-                    SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, sniff);
+                    ConsoleModel.consoleModel.removeEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, sniff);
                 }
             }
         });

third_party/WebKit/LayoutTests/inspector/console/console-eval-throw.html

@@ -9,12 +9,12 @@ function test()
     {
         InspectorTest.dumpConsoleMessagesIgnoreErrorStackFrames();
 
-        InspectorTest.consoleModel.addEventListener(SDK.ConsoleModel.Events.ConsoleCleared, afterCleared);
+        InspectorTest.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.ConsoleCleared, afterCleared);
         Console.ConsoleView.clearConsole();
 
         function afterCleared()
         {
-            InspectorTest.consoleModel.removeEventListener(SDK.ConsoleModel.Events.ConsoleCleared, afterCleared);
+            InspectorTest.consoleModel.removeEventListener(ConsoleModel.ConsoleModel.Events.ConsoleCleared, afterCleared);
             next();
         }
     }

third_party/WebKit/LayoutTests/inspector/console/console-filter-level-test.html

@@ -45,35 +45,35 @@ function test()
 
         function verbose(next)
         {
-            Common.settings.settingForTest('messageLevelFilters2').set(SDK.ConsoleMessage.MessageLevel.Verbose);
+            Common.settings.settingForTest('messageLevelFilters2').set(ConsoleModel.ConsoleMessage.MessageLevel.Verbose);
             dumpVisibleMessages();
             next();
         },
         
         function info(next)
         {
-            Common.settings.settingForTest('messageLevelFilters2').set(SDK.ConsoleMessage.MessageLevel.Info);
+            Common.settings.settingForTest('messageLevelFilters2').set(ConsoleModel.ConsoleMessage.MessageLevel.Info);
             dumpVisibleMessages();
             next();
         },
 
         function warning(next)
         {
-            Common.settings.settingForTest('messageLevelFilters2').set(SDK.ConsoleMessage.MessageLevel.Warning);
+            Common.settings.settingForTest('messageLevelFilters2').set(ConsoleModel.ConsoleMessage.MessageLevel.Warning);
             dumpVisibleMessages();
             next();
         },
               
         function error(next)
         {
-            Common.settings.settingForTest('messageLevelFilters2').set(SDK.ConsoleMessage.MessageLevel.Error);
+            Common.settings.settingForTest('messageLevelFilters2').set(ConsoleModel.ConsoleMessage.MessageLevel.Error);
             dumpVisibleMessages();
             next();
         },
        
         function abcMessagePlain(next)
         {
-            Common.settings.settingForTest('messageLevelFilters2').set(SDK.ConsoleMessage.MessageLevel.Verbose);
+            Common.settings.settingForTest('messageLevelFilters2').set(ConsoleModel.ConsoleMessage.MessageLevel.Verbose);
             Console.ConsoleView.instance()._filter._textFilterUI.setValue("abc");
             Console.ConsoleView.instance()._filter._textFilterChanged();
             dumpVisibleMessages();
@@ -90,7 +90,7 @@ function test()
 
         function abcMessageRegexWarning(next)
         {
-            Common.settings.settingForTest('messageLevelFilters2').set(SDK.ConsoleMessage.MessageLevel.Warning);
+            Common.settings.settingForTest('messageLevelFilters2').set(ConsoleModel.ConsoleMessage.MessageLevel.Warning);
             dumpVisibleMessages();
             next();
         }

third_party/WebKit/LayoutTests/inspector/console/console-preserve-log.html

@@ -5,7 +5,7 @@
 <script>
 function test()
 {
-    InspectorTest.consoleModel.addMessage(new SDK.ConsoleMessage(InspectorTest.mainTarget, SDK.ConsoleMessage.MessageSource.Other, SDK.ConsoleMessage.MessageLevel.Info, "PASS"));
+    InspectorTest.consoleModel.addMessage(new ConsoleModel.ConsoleMessage(InspectorTest.mainTarget, ConsoleModel.ConsoleMessage.MessageSource.Other, ConsoleModel.ConsoleMessage.MessageLevel.Info, "PASS"));
     Common.settingForTest("preserveConsoleLog").set(true);
     InspectorTest.reloadPage(function() {
         InspectorTest.dumpConsoleMessages();

third_party/WebKit/LayoutTests/inspector/console/console-revoke-error-in-worker.html

@@ -18,8 +18,8 @@ function handlePromiseRejection()
 
 function test()
 {
-    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, InspectorTest.wrapListener(messageAdded));
-    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageUpdated, InspectorTest.wrapListener(messageUpdated));
+    ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, InspectorTest.wrapListener(messageAdded));
+    ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageUpdated, InspectorTest.wrapListener(messageUpdated));
 
     InspectorTest.addResult("Creating worker with promise");
     InspectorTest.evaluateInPageWithTimeout("createPromise()");
@@ -29,7 +29,7 @@ function test()
         InspectorTest.addResult("");
         InspectorTest.addResult("Message added: " + event.data.level + " " + event.data.type);
 
-        if (event.data.level === SDK.ConsoleMessage.MessageLevel.Error) {
+        if (event.data.level === ConsoleModel.ConsoleMessage.MessageLevel.Error) {
             InspectorTest.dumpConsoleCounters();
             InspectorTest.addResult("");
             InspectorTest.addResult("Handling promise");

third_party/WebKit/LayoutTests/inspector/console/console-revoke-error.html

@@ -21,7 +21,7 @@ function handleSomeRejections()
 function test()
 {
     var messageAddedListener = InspectorTest.wrapListener(messageAdded);
-    InspectorTest.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, messageAddedListener);
+    InspectorTest.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, messageAddedListener);
 
     InspectorTest.addResult("Creating promise");
     InspectorTest.evaluateInPageWithTimeout("createPromises()");
@@ -34,11 +34,11 @@ function test()
             return;
         messageNumber = 0;
 
-        InspectorTest.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, messageAddedListener);
+        InspectorTest.consoleModel.removeEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, messageAddedListener);
         InspectorTest.addResult("");
 
         // Process array as a batch.
-        InspectorTest.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageUpdated, InspectorTest.wrapListener(messageUpdated));
+        InspectorTest.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageUpdated, InspectorTest.wrapListener(messageUpdated));
         InspectorTest.dumpConsoleCounters();
         InspectorTest.addResult("");
         InspectorTest.addResult("Handling promise");

third_party/WebKit/LayoutTests/inspector/console/console-tests.html

@@ -42,7 +42,7 @@ function onload()
 
 function test()
 {
-    Common.settings.settingForTest('messageLevelFilters2').set(SDK.ConsoleMessage.MessageLevel.Verbose);
+    Common.settings.settingForTest('messageLevelFilters2').set(ConsoleModel.ConsoleMessage.MessageLevel.Verbose);
     InspectorTest.dumpConsoleMessagesWithClasses();
     InspectorTest.completeTest();
 }

third_party/WebKit/LayoutTests/inspector/console/console-timestamp.html

@@ -13,10 +13,10 @@ function test()
 
     function addMessageWithFixedTimestamp(messageText, timestamp)
     {
-        var message = new SDK.ConsoleMessage(
+        var message = new ConsoleModel.ConsoleMessage(
             InspectorTest.mainTarget,
-            SDK.ConsoleMessage.MessageSource.Other, // source
-            SDK.ConsoleMessage.MessageLevel.Info, // level
+            ConsoleModel.ConsoleMessage.MessageSource.Other, // source
+            ConsoleModel.ConsoleMessage.MessageLevel.Info, // level
             messageText,
             undefined, // type
             undefined, // url

third_party/WebKit/LayoutTests/inspector/extensions/extensions-panel.html

@@ -64,11 +64,11 @@ function initialize_extensionsPanelTest()
         InspectorTest.disableConsoleViewport();
         InspectorTest.evaluateInPage("logMessage()");
         var wrappedConsoleMessageAdded = InspectorTest.safeWrap(consoleMessageAdded);
-        SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, wrappedConsoleMessageAdded);
+        ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, wrappedConsoleMessageAdded);
 
         function consoleMessageAdded()
         {
-            SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, wrappedConsoleMessageAdded);
+            ConsoleModel.consoleModel.removeEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, wrappedConsoleMessageAdded);
             Console.ConsoleView.instance()._viewportThrottler.flush();
             InspectorTest.deprecatedRunAfterPendingDispatches(clickOnMessage)
         }

third_party/WebKit/LayoutTests/inspector/initial-modules-load-expected.txt

@@ -6,6 +6,7 @@ Loaded modules:
     bindings
     common
     components
+    console_model
     dom_extension
     emulation
     extensions
@@ -28,6 +29,7 @@ Loaded modules:
     color_picker
     common
     components
+    console_model
     dom_extension
     elements
     emulation
@@ -55,6 +57,7 @@ Loaded modules:
     color_picker
     common
     components
+    console_model
     cookie_table
     data_grid
     diff
@@ -90,6 +93,7 @@ Loaded modules:
     color_picker
     common
     components
+    console_model
     cookie_table
     data_grid
     diff
@@ -128,6 +132,7 @@ Loaded modules:
     color_picker
     common
     components
+    console_model
     cookie_table
     data_grid
     diff

third_party/WebKit/LayoutTests/inspector/input-event-warning.html

@@ -62,7 +62,7 @@ function dispatchEvents()
 
 function test()
 {
-    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, InspectorTest.safeWrap(onConsoleMessage));
+    ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, InspectorTest.safeWrap(onConsoleMessage));
     step1();
 
     function step1()

third_party/WebKit/LayoutTests/inspector/open-with-rendering-option-enabled-expected.txt

@@ -4,6 +4,7 @@ Loaded modules:
     bindings
     common
     components
+    console_model
     dom_extension
     emulation
     extensions

third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/monitor-console-command.html

@@ -68,7 +68,7 @@ var test = function()
 
         function didReceive(message)
         {
-            if (message.type === SDK.ConsoleMessage.MessageType.Result) {
+            if (message.type === ConsoleModel.ConsoleMessage.MessageType.Result) {
                 InspectorTest.waitUntilMessageReceived(didReceive);
                 return;
             }

third_party/WebKit/LayoutTests/inspector/sources/debugger-ui/show-function-definition.html

@@ -40,7 +40,7 @@ function test()
         function testDumpFunctionDefinition(next)
         {
             InspectorTest.addSniffer(ObjectUI.ObjectPropertiesSection, "formatObjectAsFunction", onConsoleMessagesReceived);
-            SDK.consoleModel.evaluateCommandInConsole(UI.context.flavor(SDK.ExecutionContext), "jumpToMe");
+            ConsoleModel.consoleModel.evaluateCommandInConsole(UI.context.flavor(SDK.ExecutionContext), "jumpToMe");
 
             function onConsoleMessagesReceived()
             {

third_party/WebKit/Source/devtools/BUILD.gn

@@ -134,6 +134,8 @@ all_devtools_files = [
   "front_end/console/ConsoleViewMessage.js",
   "front_end/console/ConsoleViewport.js",
   "front_end/console/module.json",
+  "front_end/console_model/ConsoleModel.js",
+  "front_end/console_model/module.json",
   "front_end/cookie_table/CookiesTable.js",
   "front_end/cookie_table/module.json",
   "front_end/coverage/coverageListView.css",
@@ -436,7 +438,6 @@ all_devtools_files = [
   "front_end/screencast/screencastView.css",
   "front_end/screencast/ScreencastView.js",
   "front_end/sdk/Connections.js",
-  "front_end/sdk/ConsoleModel.js",
   "front_end/sdk/ContentProviders.js",
   "front_end/sdk/CookieModel.js",
   "front_end/sdk/CookieParser.js",

third_party/WebKit/Source/devtools/front_end/Tests.js

@@ -514,19 +514,23 @@
   TestSuite.prototype.testConsoleOnNavigateBack = function() {
 
     function filteredMessages() {
-      return SDK.consoleModel.messages().filter(a => a.source !== SDK.ConsoleMessage.MessageSource.Violation);
+      return ConsoleModel.consoleModel.messages().filter(
+          a => a.source !== ConsoleModel.ConsoleMessage.MessageSource.Violation);
     }
 
-    if (filteredMessages().length === 1)
+    if (filteredMessages().length === 1) {
       firstConsoleMessageReceived.call(this, null);
-    else
-      SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
+    } else {
+      ConsoleModel.consoleModel.addEventListener(
+          ConsoleModel.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
+    }
 
 
     function firstConsoleMessageReceived(event) {
-      if (event && event.data.source === SDK.ConsoleMessage.MessageSource.Violation)
+      if (event && event.data.source === ConsoleModel.ConsoleMessage.MessageSource.Violation)
         return;
-      SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
+      ConsoleModel.consoleModel.removeEventListener(
+          ConsoleModel.ConsoleModel.Events.MessageAdded, firstConsoleMessageReceived, this);
       this.evaluateInConsole_('clickLink();', didClickLink.bind(this));
     }
 
@@ -682,12 +686,13 @@
 
         messages.splice(index, 1);
         if (!messages.length) {
-          SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
+          ConsoleModel.consoleModel.removeEventListener(
+              ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
           next();
         }
       }
 
-      SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
+      ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
       SDK.multitargetNetworkManager.setNetworkConditions(preset);
     }
 
@@ -832,7 +837,7 @@
   };
 
   TestSuite.prototype.testWindowInitializedOnNavigateBack = function() {
-    var messages = SDK.consoleModel.messages();
+    var messages = ConsoleModel.consoleModel.messages();
     this.assertEquals(1, messages.length);
     var text = messages[0].messageText;
     if (text.indexOf('Uncaught') !== -1)
@@ -867,7 +872,7 @@
   };
 
   TestSuite.prototype.waitForTestResultsInConsole = function() {
-    var messages = SDK.consoleModel.messages();
+    var messages = ConsoleModel.consoleModel.messages();
     for (var i = 0; i < messages.length; ++i) {
       var text = messages[i].messageText;
       if (text === 'PASS')
@@ -884,7 +889,7 @@
         this.fail(text);
     }
 
-    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
+    ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
     this.takeControl();
   };
 
@@ -928,12 +933,12 @@
         Array.prototype.slice.call(arguments, 1, -1).map(arg => JSON.stringify(arg)).join(',') + ',';
     this.evaluateInConsole_(
         `${functionName}(${argsString} function() { console.log('${doneMessage}'); });`, function() {});
-    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage);
+    ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage);
 
     function onConsoleMessage(event) {
       var text = event.data.messageText;
       if (text === doneMessage) {
-        SDK.consoleModel.removeEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage);
+        ConsoleModel.consoleModel.removeEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage);
         callback();
       }
     }

third_party/WebKit/Source/devtools/front_end/bindings/PresentationConsoleMessageHelper.js

@@ -38,15 +38,17 @@ Bindings.PresentationConsoleMessageHelper = class {
   constructor(workspace) {
     this._workspace = workspace;
 
-    /** @type {!Object.<string, !Array.<!SDK.ConsoleMessage>>} */
+    /** @type {!Object.<string, !Array.<!ConsoleModel.ConsoleMessage>>} */
     this._pendingConsoleMessages = {};
 
     /** @type {!Array.<!Bindings.PresentationConsoleMessage>} */
     this._presentationConsoleMessages = [];
 
-    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
-    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdded, this);
-    SDK.consoleModel.messages().forEach(this._consoleMessageAdded, this);
+    ConsoleModel.consoleModel.addEventListener(
+        ConsoleModel.ConsoleModel.Events.ConsoleCleared, this._consoleCleared, this);
+    ConsoleModel.consoleModel.addEventListener(
+        ConsoleModel.ConsoleModel.Events.MessageAdded, this._onConsoleMessageAdded, this);
+    ConsoleModel.consoleModel.messages().forEach(this._consoleMessageAdded, this);
     // TODO(dgozman): setImmediate because we race with DebuggerWorkspaceBinding on ParsedScriptSource event delivery.
     SDK.targetManager.addModelListener(
         SDK.DebuggerModel, SDK.DebuggerModel.Events.ParsedScriptSource,
@@ -64,12 +66,12 @@ Bindings.PresentationConsoleMessageHelper = class {
    * @param {!Common.Event} event
    */
   _onConsoleMessageAdded(event) {
-    var message = /** @type {!SDK.ConsoleMessage} */ (event.data);
+    var message = /** @type {!ConsoleModel.ConsoleMessage} */ (event.data);
     this._consoleMessageAdded(message);
   }
 
   /**
-   * @param {!SDK.ConsoleMessage} message
+   * @param {!ConsoleModel.ConsoleMessage} message
    */
   _consoleMessageAdded(message) {
     if (!message.isErrorOrWarning())
@@ -83,7 +85,7 @@ Bindings.PresentationConsoleMessageHelper = class {
   }
 
   /**
-   * @param {!SDK.ConsoleMessage} message
+   * @param {!ConsoleModel.ConsoleMessage} message
    * @return {?SDK.DebuggerModel.Location}
    */
   _rawLocation(message) {
@@ -103,18 +105,18 @@ Bindings.PresentationConsoleMessageHelper = class {
   }
 
   /**
-   * @param {!SDK.ConsoleMessage} message
+   * @param {!ConsoleModel.ConsoleMessage} message
    * @param {!SDK.DebuggerModel.Location} rawLocation
    */
   _addConsoleMessageToScript(message, rawLocation) {
-    if (message.source === SDK.ConsoleMessage.MessageSource.Violation)
+    if (message.source === ConsoleModel.ConsoleMessage.MessageSource.Violation)
       return;
     this._presentationConsoleMessages.push(
         new Bindings.PresentationConsoleMessage(message, rawLocation, this._locationPool));
   }
 
   /**
-   * @param {!SDK.ConsoleMessage} message
+   * @param {!ConsoleModel.ConsoleMessage} message
    */
   _addPendingConsoleMessage(message) {
     if (!message.url)
@@ -170,13 +172,13 @@ Bindings.PresentationConsoleMessageHelper = class {
  */
 Bindings.PresentationConsoleMessage = class {
   /**
-   * @param {!SDK.ConsoleMessage} message
+   * @param {!ConsoleModel.ConsoleMessage} message
    * @param {!SDK.DebuggerModel.Location} rawLocation
    * @param {!Bindings.LiveLocationPool} locationPool
    */
   constructor(message, rawLocation, locationPool) {
     this._text = message.messageText;
-    this._level = message.level === SDK.ConsoleMessage.MessageLevel.Error ?
+    this._level = message.level === ConsoleModel.ConsoleMessage.MessageLevel.Error ?
         Workspace.UISourceCode.Message.Level.Error :
         Workspace.UISourceCode.Message.Level.Warning;
     Bindings.debuggerWorkspaceBinding.createLiveLocation(rawLocation, this._updateLocation.bind(this), locationPool);

third_party/WebKit/Source/devtools/front_end/bindings/module.json

@@ -3,7 +3,8 @@
         "sdk",
         "platform",
         "services",
-        "workspace"
+        "workspace",
+        "console_model"
     ],
     "scripts": [
         "LiveLocation.js",

third_party/WebKit/Source/devtools/front_end/console/ConsolePrompt.js

@@ -191,7 +191,7 @@ Console.ConsolePrompt = class extends UI.Widget {
     this.setText('');
     var currentExecutionContext = UI.context.flavor(SDK.ExecutionContext);
     if (currentExecutionContext) {
-      SDK.consoleModel.evaluateCommandInConsole(currentExecutionContext, text, useCommandLineAPI);
+      ConsoleModel.consoleModel.evaluateCommandInConsole(currentExecutionContext, text, useCommandLineAPI);
       if (Console.ConsolePanel.instance().isShowing())
         Host.userMetrics.actionTaken(Host.UserMetrics.Action.CommandEvaluatedInConsolePanel);
     }

third_party/WebKit/Source/devtools/front_end/console/module.json

@@ -125,7 +125,8 @@
     "dependencies": [
         "components",
         "data_grid",
-        "object_ui"
+        "object_ui",
+        "console_model"
     ],
     "scripts": [
         "ConsoleContextSelector.js",

third_party/WebKit/Source/devtools/front_end/console_model/module.json

+{
+    "dependencies": [
+        "sdk"
+    ],
+    "scripts": [
+        "ConsoleModel.js"
+    ]
+}

third_party/WebKit/Source/devtools/front_end/inspector.json

@@ -56,7 +56,8 @@
         { "name": "event_listeners" },
         { "name": "object_ui", "type": "autostart"},
         { "name": "help", "type": "autostart"},
-        { "name": "workspace_diff" }
+        { "name": "workspace_diff" },
+        { "name": "console_model", "type": "autostart"}
     ],
 
     "has_html": true

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

@@ -165,7 +165,7 @@ Main.Main = class {
     UI.ContextMenu.installHandler(document);
     UI.Tooltip.installHandler(document);
     Components.dockController = new Components.DockController(canDock);
-    SDK.consoleModel = new SDK.ConsoleModel();
+    ConsoleModel.consoleModel = new ConsoleModel.ConsoleModel();
     SDK.multitargetNetworkManager = new SDK.MultitargetNetworkManager();
     SDK.targetManager.addEventListener(
         SDK.TargetManager.Events.SuspendStateChanged, this._onSuspendStateChanged.bind(this));
@@ -602,9 +602,9 @@ Main.Main.WarningErrorCounter = class {
     this._warnings = this._createItem(shadowRoot, 'smallicon-warning');
     this._titles = [];
 
-    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.ConsoleCleared, this._update, this);
-    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, this._update, this);
-    SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageUpdated, this._update, this);
+    ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.ConsoleCleared, this._update, this);
+    ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, this._update, this);
+    ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageUpdated, this._update, this);
     this._update();
   }
 
@@ -637,8 +637,8 @@ Main.Main.WarningErrorCounter = class {
   }
 
   _update() {
-    var errors = SDK.consoleModel.errors();
-    var warnings = SDK.consoleModel.warnings();
+    var errors = ConsoleModel.consoleModel.errors();
+    var warnings = ConsoleModel.consoleModel.warnings();
 
     this._titles = [];
     this._toolbarItem.setVisible(!!(errors || warnings));

third_party/WebKit/Source/devtools/front_end/main/module.json

@@ -436,7 +436,8 @@
         "platform",
         "sdk",
         "persistence",
-        "help"
+        "help",
+        "console_model"
     ],
     "scripts": [
         "RenderingOptions.js",

third_party/WebKit/Source/devtools/front_end/sdk/module.json

@@ -120,7 +120,6 @@
         "Target.js",
         "TargetManager.js",
         "Connections.js",
-        "ConsoleModel.js",
         "ContentProviders.js",
         "CookieModel.js",
         "CookieParser.js",

third_party/WebKit/Source/devtools/front_end/snippets/ScriptSnippetModel.js

@@ -275,10 +275,10 @@ Snippets.ScriptSnippetModel = class extends Common.Object {
    * @param {?string=} sourceURL
    */
   _printRunScriptResult(target, result, scriptId, sourceURL) {
-    var consoleMessage = new SDK.ConsoleMessage(
-        target, SDK.ConsoleMessage.MessageSource.JS, SDK.ConsoleMessage.MessageLevel.Info, '', undefined, sourceURL,
-        undefined, undefined, undefined, [result], undefined, undefined, undefined, scriptId);
-    SDK.consoleModel.addMessage(consoleMessage);
+    var consoleMessage = new ConsoleModel.ConsoleMessage(
+        target, ConsoleModel.ConsoleMessage.MessageSource.JS, ConsoleModel.ConsoleMessage.MessageLevel.Info, '',
+        undefined, sourceURL, undefined, undefined, undefined, [result], undefined, undefined, undefined, scriptId);
+    ConsoleModel.consoleModel.addMessage(consoleMessage);
   }
 
   /**
@@ -287,8 +287,8 @@ Snippets.ScriptSnippetModel = class extends Common.Object {
    * @param {?string=} sourceURL
    */
   _printRunOrCompileScriptResultFailure(target, exceptionDetails, sourceURL) {
-    SDK.consoleModel.addMessage(
-        SDK.ConsoleMessage.fromException(target, exceptionDetails, undefined, undefined, sourceURL || undefined));
+    ConsoleModel.consoleModel.addMessage(ConsoleModel.ConsoleMessage.fromException(
+        target, exceptionDetails, undefined, undefined, sourceURL || undefined));
   }
 
   /**

third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js

@@ -956,7 +956,7 @@ Sources.SourcesPanel = class extends UI.Panel {
       if (wasThrown || !result || result.type !== 'string') {
         failedToSave(result);
       } else {
-        SDK.consoleModel.evaluateCommandInConsole(
+        ConsoleModel.consoleModel.evaluateCommandInConsole(
             /** @type {!SDK.ExecutionContext} */ (currentExecutionContext), result.value,
             /* useCommandLineAPI */ false);
       }
@@ -1268,7 +1268,7 @@ Sources.SourcesPanel.DebuggingActionDelegate = class {
           var text = frame.textEditor.text(frame.textEditor.selection());
           var executionContext = UI.context.flavor(SDK.ExecutionContext);
           if (executionContext)
-            SDK.consoleModel.evaluateCommandInConsole(executionContext, text, /* useCommandLineAPI */ true);
+            ConsoleModel.consoleModel.evaluateCommandInConsole(executionContext, text, /* useCommandLineAPI */ true);
         }
         return true;
     }

third_party/WebKit/Source/devtools/scripts/extract_module/extract_module.js

@@ -24,17 +24,13 @@ const APPLICATION_DESCRIPTORS = [
 const MODULES_TO_REMOVE = [];
 
 const JS_FILES_MAPPING = [
-  {file: 'components/CustomPreviewComponent.js', new: 'object_ui'},
-  {file: 'components/ObjectPopoverHelper.js', new: 'object_ui'},
-  {file: 'components/ObjectPropertiesSection.js', new: 'object_ui'},
-  {file: 'components/JavaScriptAutocomplete.js', new: 'object_ui'},
-  {file: 'components/RemoteObjectPreviewFormatter.js', new: 'object_ui'},
+  {file: 'sdk/ConsoleModel.js', new: 'console_model'},
 ];
 
 const MODULE_MAPPING = {
-  object_ui: {
-    dependencies: ['ui', 'sdk', 'components'],
-    dependents: ['console', 'sources', 'extensions', 'event_listeners', 'resources', 'profiler', 'network'],
+  console_model: {
+    dependencies: ['sdk'],
+    dependents: ['bindings', 'console', 'main'],
     applications: ['inspector.json'],
     autostart: true,  // set to autostart because of extensions
   },