Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2120)

Unified Diff: chrome/browser/devtools/device/usb/android_usb_browsertest.cc

Issue 463493006: Add chrome.usbPrivate API for use by USB device WEBUI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change "Google Inc." to "Test Manufacturer". Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/usb_service/usb_device_handle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/device/usb/android_usb_browsertest.cc
diff --git a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
index be1f167abeecdd9d13f4ee900bbf40ad185a47ce..c6b4af1f066c42537c35c83b74318c7289ac5115 100644
--- a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
+++ b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
@@ -43,6 +43,7 @@ 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[] = "Test Manufacturer";
const char kDeviceModel[] = "Nexus 5";
const char kDeviceSerial[] = "Sample serial";
@@ -254,6 +255,16 @@ class MockUsbDeviceHandle : public UsbDeviceHandle {
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;
« no previous file with comments | « no previous file | components/usb_service/usb_device_handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698