Add chrome.usbPrivate API for use by USB device WEBUI.

chrome/browser/devtools/device/usb/android_usb_browsertest.cc

 // Copyright 2014 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.
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "chrome/browser/devtools/device/usb/android_usb_device.h"
 #include "chrome/browser/devtools/device/usb/usb_device_provider.h"
@@ skipping 25 matching lines @@
 };
 
 const uint32 kMaxPayload = 4096;
 const uint32 kVersion = 0x01000000;
 
 const char kOpenedUnixSocketsCommand[] = "shell:cat /proc/net/unix";
 const char kDeviceModelCommand[] = "shell:getprop ro.product.model";
 const char kDumpsysCommand[] = "shell:dumpsys window policy";
 const char kListProcessesCommand[] = "shell:ps";
 const char kInstalledChromePackagesCommand[] = "shell:pm list packages";
+const char kDeviceManufacturer[] = "Google Inc.";

[dgozman, 2014/08/14 02:57:58]

I'd prefer "Test manufacturer".

 const char kDeviceModel[] = "Nexus 5";
 const char kDeviceSerial[] = "Sample serial";
 
 const char kSampleOpenedUnixSockets[] =
     "Num       RefCount Protocol Flags    Type St Inode Path\n"
     "00000000: 00000004 00000000"
     " 00000000 0002 01  3328 /dev/socket/wpa_wlan0\n"
     "00000000: 00000002 00000000"
     " 00010000 0001 01  5394 /dev/socket/vold\n";
 
@@ skipping 191 matching lines @@
   }
 
   virtual bool SetInterfaceAlternateSetting(
       const int interface_number,
       const int alternate_setting) OVERRIDE {
     return true;
   }
 
   virtual bool ResetDevice() OVERRIDE { return true; }
 
+  virtual bool GetManufacturer(base::string16* manufacturer) OVERRIDE {
+    *manufacturer = base::UTF8ToUTF16(kDeviceManufacturer);
+    return true;
+  }
+
+  virtual bool GetProduct(base::string16* product) OVERRIDE {
+    *product = base::UTF8ToUTF16(kDeviceModel);
+    return true;
+  }
+
   virtual bool GetSerial(base::string16* serial) OVERRIDE {
     *serial = base::UTF8ToUTF16(kDeviceSerial);
     return true;
   }
 
   // Async IO. Can be called on any thread.
   virtual void ControlTransfer(const UsbEndpointDirection direction,
                                const TransferRequestType request_type,
                                const TransferRecipient recipient,
                                const uint8 request,
@@ skipping 567 matching lines @@
   runner_->Run();
   EXPECT_EQ(2, listener.invoked_);
   EXPECT_EQ(listener.invoked_ - 1, scheduler_invoked_);
 }
 
 IN_PROC_BROWSER_TEST_F(AndroidUsbTraitsTest, TestDeviceCounting) {
   MockCountListenerForCheckingTraits listener(adb_bridge_);
   adb_bridge_->AddDeviceCountListener(&listener);
   runner_->Run();
 }