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

Unified Diff: extensions/browser/api/usb/usb_apitest.cc

Issue 1265833005: Get all the UsbConfigDescriptor for the device configuration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use const auto Created 5 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
Index: extensions/browser/api/usb/usb_apitest.cc
diff --git a/extensions/browser/api/usb/usb_apitest.cc b/extensions/browser/api/usb/usb_apitest.cc
index 0219b9d510ede9f05157514402b52dcb6d806b93..3a53aaed0de4883ffc231a2d7292714eb0b2c475 100644
--- a/extensions/browser/api/usb/usb_apitest.cc
+++ b/extensions/browser/api/usb/usb_apitest.cc
@@ -120,7 +120,7 @@ IN_PROC_BROWSER_TEST_F(UsbApiTest, SetConfiguration) {
EXPECT_CALL(*mock_device_handle_.get(), SetConfiguration(1, _))
.WillOnce(InvokeCallback<1>(true));
EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(1);
- EXPECT_CALL(*mock_device_.get(), GetConfiguration())
+ EXPECT_CALL(*mock_device_.get(), GetActiveConfiguration())
.WillOnce(Return(nullptr))
.WillOnce(Return(&config_descriptor));
ASSERT_TRUE(RunAppTest("api_test/usb/set_configuration"));
@@ -129,7 +129,7 @@ IN_PROC_BROWSER_TEST_F(UsbApiTest, SetConfiguration) {
IN_PROC_BROWSER_TEST_F(UsbApiTest, ListInterfaces) {
UsbConfigDescriptor config_descriptor;
EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(1);
- EXPECT_CALL(*mock_device_.get(), GetConfiguration())
+ EXPECT_CALL(*mock_device_.get(), GetActiveConfiguration())
.WillOnce(Return(&config_descriptor));
ASSERT_TRUE(RunAppTest("api_test/usb/list_interfaces"));
}
« device/devices_app/usb/device_impl.cc ('K') | « extensions/browser/api/usb/usb_api.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698