DevTools: extract ADB command classes, change objects' lifetimes

chrome/browser/resources/inspect/inspect.js

 // Copyright (c) 2012 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.
 
 /**
  * ADB Device representation. This class has static methods for querying for
  * devices as well as instance methods for device manipulation.
  * @param {string} deviceLine Raw device descriprion line.
  * @constructor
  */
@@ skipping 86 matching lines @@
   } catch (e) {
   }
   return null;
 };
 
 /**
  * Discovers ADB devices.
  * @return {?Object} ADB query result.
  * @private
  */
-AdbDevice.adbDevices_ = function() {
+AdbDevice.adbPages_ = function() {
   var xhr = new XMLHttpRequest();
-  xhr.open('GET', 'adb-devices', false);
+  xhr.open('GET', 'adb-pages', false);
   xhr.send(null);
   if (xhr.status !== 200)
     return null;
 
   try {
-    var result = JSON.parse(xhr.responseText);
-    return result[0] ? null : result[1];
+    return JSON.parse(xhr.responseText);
   } catch (e) {
   }
   return null;
 };
 
 /**
  * Returns next available (unmapped) port to use in forwarding.
  * @param {Object<string,string>} forwards Forwards map.
  * @return {number} Next available port.
  * @private
@@ skipping 30 matching lines @@
 AdbDevice.prototype.targets = function() {
   var pages = this.queryJson_('list');
   var targets = [];
   for (var j = 0; pages && j < pages.length; j++) {
     var json = pages[j];
     var target = {};
     target['type'] = 'mobile';
     target['name'] = json['title'];
     target['url'] = json['url'];
     target['attached'] = !json['webSocketDebuggerUrl'];
-    target['favicon_url'] = json['faviconUrl'];
-    target['inspect_url'] = json['devtoolsFrontendUrl'];
+    target['faviconUrl'] = json['faviconUrl'];
+    target['inspectUrl'] = json['devtoolsFrontendUrl'];
     targets.push(target);
   }
   return targets;
 };
 
 /**
  * Issues synchronous json request against target device.
  * @param {string} query DevTools protocol /json query.
  * @return {?Object} Result object.
  * @private
@@ skipping 19 matching lines @@
 function requestData() {
   var xhr = new XMLHttpRequest();
   xhr.open('GET', 'targets-data.json', false);
   xhr.send(null);
   if (xhr.status === 200)
     return JSON.parse(xhr.responseText);
   return [];
 }
 
 function inspect(data) {
-  if (data['inspect_url']) {
-    window.open(data['inspect_url'], undefined,
+  if (data['inspectUrl']) {
+    window.open(data['inspectUrl'], undefined,
         'location=0,width=800,height=600');
     return;
   }
   chrome.send('inspect',
               [String(data.processId), String(data.routeId)]);
 }
 
 function terminate(data) {
   chrome.send('terminate',
               [String(data.processId), String(data.routeId)]);
@@ skipping 51 matching lines @@
     var details = version['Browser'] || version['User-Agent'];
     sectionElement.textContent = device.model + ' (' + details + ')';
     var listElement = document.createElement('div');
     listElement.id = 'device-' + device.serial;
     listElement.className = 'list device';
     document.body.appendChild(sectionElement);
     document.body.appendChild(listElement);
 
     for (var j = 0; j < targets.length; j++) {
       addTargetToList(targets[j], 'device-' + device.serial,
-            ['favicon_url', 'name', 'url']);
+            ['faviconUrl', 'name', 'url']);
     }
   }
   setTimeout(populateDeviceLists, 1000);
 }
 
 function addToPagesList(data) {
-  addTargetToList(data, 'pages', ['favicon_url', 'name', 'url']);
+  addTargetToList(data, 'pages', ['faviconUrl', 'name', 'url']);
 }
 
 function addToExtensionsList(data) {
   addTargetToList(data, 'extensions', ['name', 'url']);
 }
 
 function addToWorkersList(data) {
   addTargetToList(data,
                   'workers',
                   ['name', 'url', 'pid'],
                   true);
 }
 
 function addToOthersList(data) {
   addTargetToList(data, 'others', ['url']);
 }
 
 function formatValue(data, property) {
   var value = data[property];
 
-  if (property == 'favicon_url') {
+  if (property == 'faviconUrl') {
     var faviconElement = document.createElement('img');
     if (value)
       faviconElement.src = value;
     return faviconElement;
   }
 
   var text = value ? String(value) : '';
   if (text.length > 100)
     text = text.substring(0, 100) + '\u2026';
 
@@ skipping 42 matching lines @@
   link.setAttribute('href', '#');
   link.textContent = ' terminate ';
   link.addEventListener(
       'click',
       terminate.bind(this, data),
       true);
   return link;
 }
 
 document.addEventListener('DOMContentLoaded', onload);