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

Side by Side Diff: chrome/browser/usb/usb_chooser_controller_unittest.cc

Issue 2615353002: Typemap device.usb.DeviceFilter to device::UsbDeviceFilter. (Closed)
Patch Set: Addressed juncai@'s feedback. 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <memory> 5 #include <memory>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/usb/usb_chooser_controller.h" 10 #include "chrome/browser/usb/usb_chooser_controller.h"
(...skipping 29 matching lines...) Expand all
40 40
41 } // namespace 41 } // namespace
42 42
43 class UsbChooserControllerTest : public ChromeRenderViewHostTestHarness { 43 class UsbChooserControllerTest : public ChromeRenderViewHostTestHarness {
44 public: 44 public:
45 UsbChooserControllerTest() {} 45 UsbChooserControllerTest() {}
46 46
47 void SetUp() override { 47 void SetUp() override {
48 ChromeRenderViewHostTestHarness::SetUp(); 48 ChromeRenderViewHostTestHarness::SetUp();
49 49
50 std::vector<device::usb::DeviceFilterPtr> device_filters; 50 std::vector<device::UsbDeviceFilter> device_filters;
51 device::usb::ChooserService::GetPermissionCallback callback; 51 device::usb::ChooserService::GetPermissionCallback callback;
52 content::WebContentsTester* web_contents_tester = 52 content::WebContentsTester* web_contents_tester =
53 content::WebContentsTester::For(web_contents()); 53 content::WebContentsTester::For(web_contents());
54 web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl)); 54 web_contents_tester->NavigateAndCommit(GURL(kDefaultTestUrl));
55 usb_chooser_controller_.reset( 55 usb_chooser_controller_.reset(
56 new UsbChooserController(main_rfh(), device_filters, callback)); 56 new UsbChooserController(main_rfh(), device_filters, callback));
57 mock_usb_chooser_view_.reset(new MockUsbChooserView()); 57 mock_usb_chooser_view_.reset(new MockUsbChooserView());
58 usb_chooser_controller_->set_view(mock_usb_chooser_view_.get()); 58 usb_chooser_controller_->set_view(mock_usb_chooser_view_.get());
59 } 59 }
60 60
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 EXPECT_EQ(base::ASCIIToUTF16("a (001)"), 151 EXPECT_EQ(base::ASCIIToUTF16("a (001)"),
152 usb_chooser_controller_->GetOption(0)); 152 usb_chooser_controller_->GetOption(0));
153 EXPECT_EQ(base::ASCIIToUTF16("b"), usb_chooser_controller_->GetOption(1)); 153 EXPECT_EQ(base::ASCIIToUTF16("b"), usb_chooser_controller_->GetOption(1));
154 EXPECT_EQ(base::ASCIIToUTF16("a (002)"), 154 EXPECT_EQ(base::ASCIIToUTF16("a (002)"),
155 usb_chooser_controller_->GetOption(2)); 155 usb_chooser_controller_->GetOption(2));
156 156
157 device_client_.usb_service()->RemoveDevice(device_a_1); 157 device_client_.usb_service()->RemoveDevice(device_a_1);
158 EXPECT_EQ(base::ASCIIToUTF16("b"), usb_chooser_controller_->GetOption(0)); 158 EXPECT_EQ(base::ASCIIToUTF16("b"), usb_chooser_controller_->GetOption(0));
159 EXPECT_EQ(base::ASCIIToUTF16("a"), usb_chooser_controller_->GetOption(1)); 159 EXPECT_EQ(base::ASCIIToUTF16("a"), usb_chooser_controller_->GetOption(1));
160 } 160 }
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_chooser_controller.cc ('k') | chrome/browser/usb/web_usb_chooser_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698