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

Unified Diff: chrome/browser/usb/usb_chooser_controller_unittest.cc

Issue 2607063002: Remove mojo::Array. (Closed)
Patch Set: rebase Created 3 years, 11 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/usb/usb_chooser_controller_unittest.cc
diff --git a/chrome/browser/usb/usb_chooser_controller_unittest.cc b/chrome/browser/usb/usb_chooser_controller_unittest.cc
index 78fc50fa2745520115c0215eca84e89776413814..34f0083dbc6f472b7018fe582d99645cc4d29b73 100644
--- a/chrome/browser/usb/usb_chooser_controller_unittest.cc
+++ b/chrome/browser/usb/usb_chooser_controller_unittest.cc
@@ -14,7 +14,6 @@
#include "device/usb/mock_usb_device.h"
#include "device/usb/mock_usb_service.h"
#include "device/usb/public/interfaces/device_manager.mojom.h"
-#include "mojo/public/cpp/bindings/array.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
@@ -48,13 +47,13 @@ class UsbChooserControllerTest : public ChromeRenderViewHostTestHarness {
void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();
- mojo::Array<device::usb::DeviceFilterPtr> device_filters;
+ std::vector<device::usb::DeviceFilterPtr> device_filters;
device::usb::ChooserService::GetPermissionCallback callback;
content::WebContentsTester* web_contents_tester =
content::WebContentsTester::For(web_contents());
web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl));
- usb_chooser_controller_.reset(new UsbChooserController(
- main_rfh(), std::move(device_filters), callback));
+ usb_chooser_controller_.reset(
+ new UsbChooserController(main_rfh(), device_filters, callback));
mock_usb_chooser_view_.reset(new MockUsbChooserView());
usb_chooser_controller_->set_view(mock_usb_chooser_view_.get());
}

Powered by Google App Engine
This is Rietveld 408576698