Quick-fixes to about:tracing following move

chrome/browser/resources/tracing/tracing_controller.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 /**
  * @fileoverview State and UI for trace data collection.
  */
 cr.define('tracing', function() {
 
@@ skipping 18 matching lines @@
 
     if (browserBridge.debugMode) {
       var tracingControllerTests = document.createElement('script');
       tracingControllerTests.src =
           './tracing/tracing_controller_tests.js';
       document.body.appendChild(tracingControllerTests);
     }
 
     this.onKeydownBoundToThis_ = this.onKeydown_.bind(this);
     this.onKeypressBoundToThis_ = this.onKeypress_.bind(this);
+
+    chrome.send('tracingControllerInitialized');
   }
 
   TracingController.prototype = {
     __proto__: cr.EventTarget.prototype,
 
+    gpuInfo_: undefined,
+    clientInfo_: undefined,
     tracingEnabled_: false,
     tracingEnding_: false,
 
     onRequestBufferPercentFullComplete: function(percent_full) {
       if (!this.overlay_.visible)
         return;
 
       window.setTimeout(this.beginRequestBufferPercentFull_.bind(this), 250);
 
       this.bufferPercentDiv_.textContent = 'Buffer usage: ' +
@@ skipping 48 matching lines @@
       if (e.keyCode == 27) {
         this.endTracing();
       }
     },
 
     onKeypress_: function(e) {
       if (e.keyIdentifier == 'Enter') {
         this.endTracing();
       }
     },
+
+    /**
+     * Called from gpu c++ code when ClientInfo is updated.
+     */
+    onClientInfoUpdate: function(clientInfo) {
+      this.clientInfo_ = clientInfo;
+    },
+
+    /**
+     * Called from gpu c++ code when GPU Info is updated.
+     */
+    onGpuInfoUpdate: function(gpuInfo) {
+      this.gpuInfo_ = gpuInfo;
+    },
+
     /**
      * Checks whether tracing is enabled
      */
     get isTracingEnabled() {
       return this.tracingEnabled_;
     },
 
     /**
      * Gets the currently traced events. If tracing is active, then
      * this can change on the fly.
@@ skipping 79 matching lines @@
     onLoadTraceFileCanceled: function() {
       cr.dispatchSimpleEvent(this, 'loadTraceFileCanceled');
     },
 
     /**
      * Tells browser to put up a save dialog and save the trace file
      */
     beginSaveTraceFile: function(traceEvents) {
       var data = {
         traceEvents: traceEvents,
-        clientInfo: browserBridge.clientInfo,
-        gpuInfo: browserBridge.gpuInfo
+        clientInfo: this.clientInfo_,
+        gpuInfo: this.gpuInfo_
       };
       chrome.send('saveTraceFile', [JSON.stringify(data)]);
     },
 
     /**
      * Called by the browser when a trace file is saveed.
      */
     onSaveTraceFileComplete: function() {
       cr.dispatchSimpleEvent(this, 'saveTraceFileComplete');
     },
 
     /**
      * Called by the browser when saving a trace file was canceled.
      */
     onSaveTraceFileCanceled: function() {
       cr.dispatchSimpleEvent(this, 'saveTraceFileCanceled');
     },
 
     selfTest: function() {
       this.beginTracing();
       window.setTimeout(this.endTracing.bind(This), 500);
     }
   };
   return {
     TracingController: TracingController
   };
 });