DevTools: wrap DebuggerAgent.Location with DebuggerModel.Location.

Source/devtools/front_end/ConsoleModel.js

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
- * @extends {WebInspector.Object}
+ * @extends {WebInspector.TargetAwareObject}
  * @param {!WebInspector.Target} target
  */
 WebInspector.ConsoleModel = function(target)
 {
+    WebInspector.TargetAwareObject.call(this, target);
+
     /** @type {!Array.<!WebInspector.ConsoleMessage>} */
     this.messages = [];
     this.warnings = 0;
     this.errors = 0;
-    this._target = target;
     this._consoleAgent = target.consoleAgent();
     target.registerConsoleDispatcher(new WebInspector.ConsoleDispatcher(this));
     this._enableAgent();
 }
 
 WebInspector.ConsoleModel.Events = {
     ConsoleCleared: "ConsoleCleared",
     MessageAdded: "MessageAdded",
     CommandEvaluated: "CommandEvaluated",
 }
@@ skipping 57 matching lines @@
          * @param {?RuntimeAgent.RemoteObject=} valueResult
          * @this {WebInspector.ConsoleModel}
          */
         function printResult(result, wasThrown, valueResult)
         {
             if (!result)
                 return;
 
             this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.CommandEvaluated, {result: result, wasThrown: wasThrown, text: text, commandMessage: commandMessage});
         }
-        this._target.runtimeModel.evaluate(text, "console", useCommandLineAPI, false, false, true, printResult.bind(this));
+        this.target().runtimeModel.evaluate(text, "console", useCommandLineAPI, false, false, true, printResult.bind(this));
 
         WebInspector.userMetrics.ConsoleEvaluated.record();
     },
 
     show: function()
     {
         WebInspector.Revealer.reveal(this);
     },
 
     /**
@@ skipping 52 matching lines @@
 
     clearMessages: function()
     {
         this.dispatchEventToListeners(WebInspector.ConsoleModel.Events.ConsoleCleared);
 
         this.messages = [];
         this.errors = 0;
         this.warnings = 0;
     },
 
-    __proto__: WebInspector.Object.prototype
+    __proto__: WebInspector.TargetAwareObject.prototype
 }
 
 /**
  * @constructor
  * @param {string} source
  * @param {?string} level
  * @param {string} messageText
  * @param {string=} type
  * @param {?string=} url
  * @param {number=} line
@@ skipping 197 matching lines @@
     {
         if (!WebInspector.settings.preserveConsoleLog.get())
             this._console.clearMessages();
     }
 }
 
 /**
  * @type {!WebInspector.ConsoleModel}
  */
 WebInspector.console;