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

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

Issue 1265833005: Get all the UsbConfigDescriptor for the device configuration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated chromeos related code again Created 5 years, 5 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
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 7f73ba65dcff86f711d4668b7a54639e254458a0..ce081a22bd2a76af376026d27ceed0e475ab3ed2 100644
--- a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
+++ b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
@@ -415,10 +415,14 @@ class MockUsbDevice : public UsbDevice {
new MockUsbDeviceHandle<T>(this))));
}
- const UsbConfigDescriptor* GetConfiguration() override {
+ const UsbConfigDescriptor* GetCurrentConfiguration() override {
return T::kConfigured ? &config_desc_ : nullptr;
}
+ const std::vector<UsbConfigDescriptor>& configurations() const override {
+ return configurations_;
+ }
+
bool Close(scoped_refptr<UsbDeviceHandle> handle) override {
return true;
}
@@ -430,6 +434,7 @@ class MockUsbDevice : public UsbDevice {
private:
UsbConfigDescriptor config_desc_;
+ std::vector<UsbConfigDescriptor> configurations_;
};
class MockUsbService : public UsbService {

Powered by Google App Engine
This is Rietveld 408576698