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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2146663002: Move //components/webusb/ to //chrome/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix variable names Created 4 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
« chrome/browser/chrome_web_usb_browser_client.h ('K') | « chrome/browser/usb/web_usb_detector.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/usb/web_usb_detector_unittest.cc
diff --git a/components/webusb/webusb_detector_unittest.cc b/chrome/browser/usb/web_usb_detector_unittest.cc
similarity index 75%
rename from components/webusb/webusb_detector_unittest.cc
rename to chrome/browser/usb/web_usb_detector_unittest.cc
index eebede8a3070439b8d302dc1f03401319f52cc41..1458f827d5a5e8efa7230d7ac5fa226db316eaed 100644
--- a/components/webusb/webusb_detector_unittest.cc
+++ b/chrome/browser/usb/web_usb_detector_unittest.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/webusb/webusb_detector.h"
+#include "chrome/browser/usb/web_usb_detector.h"
#include <string>
#include "base/macros.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/webusb/webusb_browser_client.h"
+#include "chrome/browser/usb/web_usb_browser_client.h"
#include "device/core/mock_device_client.h"
#include "device/usb/mock_usb_device.h"
#include "device/usb/mock_usb_service.h"
@@ -29,25 +29,17 @@ const char* kLandingPage_1 = "https://www.google.com/A";
const char* kLandingPage_2 = "https://www.google.com/B";
const char* kLandingPage_3 = "https://www.google.com/C";
-} // namespace
-
-namespace webusb {
-
-namespace {
-
-class MockWebUsbBrowserClient : public webusb::WebUsbBrowserClient {
+class MockWebUsbBrowserClient : public WebUsbBrowserClient {
public:
MockWebUsbBrowserClient() {}
~MockWebUsbBrowserClient() override {}
- // webusb::WebUsbBrowserClient implementation
+ // WebUsbBrowserClient:
MOCK_METHOD3(OnDeviceAdded,
void(const base::string16& product_name,
const GURL& landing_page,
const std::string& notification_id));
-
- // webusb::WebUsbBrowserClient implementation
MOCK_METHOD1(OnDeviceRemoved, void(const std::string& notification_id));
private:
@@ -64,7 +56,7 @@ class WebUsbDetectorTest : public testing::Test {
protected:
device::MockDeviceClient device_client_;
- MockWebUsbBrowserClient mock_webusb_browser_client_;
+ MockWebUsbBrowserClient mock_web_usb_browser_client_;
private:
DISALLOW_COPY_AND_ASSIGN(WebUsbDetectorTest);
@@ -77,13 +69,13 @@ TEST_F(WebUsbDetectorTest, UsbDeviceAdded) {
0, 1, "Google", kProductName_1, "002", landing_page));
std::string guid = device->guid();
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name, landing_page, guid))
.Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(testing::_))
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(testing::_))
.Times(0);
- webusb::WebUsbDetector webusb_detector(&mock_webusb_browser_client_);
+ WebUsbDetector web_usb_detector(&mock_web_usb_browser_client_);
device_client_.usb_service()->AddDevice(device);
}
@@ -97,13 +89,13 @@ TEST_F(WebUsbDetectorTest, UsbDeviceAddedAndRemoved) {
{
testing::InSequence s;
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name, landing_page, guid))
.Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid)).Times(1);
}
- webusb::WebUsbDetector webusb_detector(&mock_webusb_browser_client_);
+ WebUsbDetector web_usb_detector(&mock_web_usb_browser_client_);
device_client_.usb_service()->AddDevice(device);
device_client_.usb_service()->RemoveDevice(device);
@@ -116,12 +108,12 @@ TEST_F(WebUsbDetectorTest, UsbDeviceWithoutProductNameAddedAndRemoved) {
0, 1, "Google", product_name, "002", landing_page));
std::string guid = device->guid();
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(testing::_, testing::_, testing::_))
.Times(0);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid)).Times(1);
- webusb::WebUsbDetector webusb_detector(&mock_webusb_browser_client_);
+ WebUsbDetector web_usb_detector(&mock_web_usb_browser_client_);
device_client_.usb_service()->AddDevice(device);
device_client_.usb_service()->RemoveDevice(device);
@@ -133,12 +125,12 @@ TEST_F(WebUsbDetectorTest, UsbDeviceWithoutLandingPageAddedAndRemoved) {
0, 1, "Google", kProductName_1, "002", landing_page));
std::string guid = device->guid();
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(testing::_, testing::_, testing::_))
.Times(0);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid)).Times(1);
- webusb::WebUsbDetector webusb_detector(&mock_webusb_browser_client_);
+ WebUsbDetector web_usb_detector(&mock_web_usb_browser_client_);
device_client_.usb_service()->AddDevice(device);
device_client_.usb_service()->RemoveDevice(device);
@@ -149,13 +141,13 @@ TEST_F(WebUsbDetectorTest, WebUsbBrowserClientIsNullptr) {
scoped_refptr<device::MockUsbDevice> device(new device::MockUsbDevice(
0, 1, "Google", kProductName_1, "002", landing_page));
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(testing::_, testing::_, testing::_))
.Times(0);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(testing::_))
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(testing::_))
.Times(0);
- webusb::WebUsbDetector webusb_detector(nullptr);
+ WebUsbDetector web_usb_detector(nullptr);
device_client_.usb_service()->AddDevice(device);
device_client_.usb_service()->RemoveDevice(device);
@@ -166,13 +158,13 @@ TEST_F(WebUsbDetectorTest, NoUsbService) {
scoped_refptr<device::MockUsbDevice> device(new device::MockUsbDevice(
0, 1, "Google", kProductName_1, "002", landing_page));
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(testing::_, testing::_, testing::_))
.Times(0);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(testing::_))
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(testing::_))
.Times(0);
- webusb::WebUsbDetector webusb_detector(&mock_webusb_browser_client_);
+ WebUsbDetector web_usb_detector(&mock_web_usb_browser_client_);
}
TEST_F(WebUsbDetectorTest, UsbDeviceWasThereBeforeAndThenRemoved) {
@@ -181,15 +173,15 @@ TEST_F(WebUsbDetectorTest, UsbDeviceWasThereBeforeAndThenRemoved) {
0, 1, "Google", kProductName_1, "002", landing_page));
std::string guid = device->guid();
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(testing::_, testing::_, testing::_))
.Times(0);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid)).Times(1);
- // usb device was added before webusb_detector was created
+ // usb device was added before web_usb_detector was created
device_client_.usb_service()->AddDevice(device);
- webusb::WebUsbDetector webusb_detector(&mock_webusb_browser_client_);
+ WebUsbDetector web_usb_detector(&mock_web_usb_browser_client_);
device_client_.usb_service()->RemoveDevice(device);
}
@@ -215,21 +207,21 @@ TEST_F(
6, 7, "Google", kProductName_3, "008", landing_page_3));
std::string guid_3 = device_3->guid();
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_1, landing_page_1, guid_1))
.Times(0);
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_2, landing_page_2, guid_2))
.Times(0);
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_3, landing_page_3, guid_3))
.Times(0);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_1)).Times(0);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_2)).Times(0);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_3)).Times(0);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_1)).Times(0);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_2)).Times(0);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_3)).Times(0);
- // three usb devices were added and removed before webusb_detector was
+ // three usb devices were added and removed before web_usb_detector was
// created
device_client_.usb_service()->AddDevice(device_1);
device_client_.usb_service()->AddDevice(device_2);
@@ -239,7 +231,7 @@ TEST_F(
device_client_.usb_service()->RemoveDevice(device_2);
device_client_.usb_service()->RemoveDevice(device_3);
- webusb::WebUsbDetector webusb_detector(&mock_webusb_browser_client_);
+ WebUsbDetector web_usb_detector(&mock_web_usb_browser_client_);
}
TEST_F(
@@ -263,30 +255,30 @@ TEST_F(
6, 7, "Google", kProductName_3, "008", landing_page_3));
std::string guid_3 = device_3->guid();
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_1, landing_page_1, guid_1))
.Times(0);
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_2, landing_page_2, guid_2))
.Times(0);
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_3, landing_page_3, guid_3))
.Times(0);
{
testing::InSequence s;
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_1)).Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_2)).Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_3)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_1)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_2)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_3)).Times(1);
}
- // three usb devices were added before webusb_detector was created
+ // three usb devices were added before web_usb_detector was created
device_client_.usb_service()->AddDevice(device_1);
device_client_.usb_service()->AddDevice(device_2);
device_client_.usb_service()->AddDevice(device_3);
- webusb::WebUsbDetector webusb_detector(&mock_webusb_browser_client_);
+ WebUsbDetector web_usb_detector(&mock_web_usb_browser_client_);
device_client_.usb_service()->RemoveDevice(device_1);
device_client_.usb_service()->RemoveDevice(device_2);
@@ -313,29 +305,29 @@ TEST_F(WebUsbDetectorTest,
6, 7, "Google", kProductName_3, "008", landing_page_3));
std::string guid_3 = device_3->guid();
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_1, landing_page_1, guid_1))
.Times(0);
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_3, landing_page_3, guid_3))
.Times(0);
{
testing::InSequence s;
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_1)).Times(1);
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_1)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_2, landing_page_2, guid_2))
.Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_3)).Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_2)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_3)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_2)).Times(1);
}
- // two usb devices were added before webusb_detector was created
+ // two usb devices were added before web_usb_detector was created
device_client_.usb_service()->AddDevice(device_1);
device_client_.usb_service()->AddDevice(device_3);
- webusb::WebUsbDetector webusb_detector(&mock_webusb_browser_client_);
+ WebUsbDetector web_usb_detector(&mock_web_usb_browser_client_);
device_client_.usb_service()->RemoveDevice(device_1);
device_client_.usb_service()->AddDevice(device_2);
@@ -365,23 +357,23 @@ TEST_F(WebUsbDetectorTest, ThreeUsbDevicesAddedAndRemoved) {
{
testing::InSequence s;
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_1, landing_page_1, guid_1))
.Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_1)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_1)).Times(1);
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_2, landing_page_2, guid_2))
.Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_2)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_2)).Times(1);
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_3, landing_page_3, guid_3))
.Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_3)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_3)).Times(1);
}
- webusb::WebUsbDetector webusb_detector(&mock_webusb_browser_client_);
+ WebUsbDetector web_usb_detector(&mock_web_usb_browser_client_);
device_client_.usb_service()->AddDevice(device_1);
device_client_.usb_service()->RemoveDevice(device_1);
@@ -413,26 +405,26 @@ TEST_F(WebUsbDetectorTest, ThreeUsbDeviceAddedAndRemovedDifferentOrder) {
{
testing::InSequence s;
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_1, landing_page_1, guid_1))
.Times(1);
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_2, landing_page_2, guid_2))
.Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_2)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_2)).Times(1);
- EXPECT_CALL(mock_webusb_browser_client_,
+ EXPECT_CALL(mock_web_usb_browser_client_,
OnDeviceAdded(product_name_3, landing_page_3, guid_3))
.Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_1)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_1)).Times(1);
- EXPECT_CALL(mock_webusb_browser_client_, OnDeviceRemoved(guid_3)).Times(1);
+ EXPECT_CALL(mock_web_usb_browser_client_, OnDeviceRemoved(guid_3)).Times(1);
}
- webusb::WebUsbDetector webusb_detector(&mock_webusb_browser_client_);
+ WebUsbDetector web_usb_detector(&mock_web_usb_browser_client_);
device_client_.usb_service()->AddDevice(device_1);
device_client_.usb_service()->AddDevice(device_2);
@@ -441,5 +433,3 @@ TEST_F(WebUsbDetectorTest, ThreeUsbDeviceAddedAndRemovedDifferentOrder) {
device_client_.usb_service()->RemoveDevice(device_1);
device_client_.usb_service()->RemoveDevice(device_3);
}
-
-} // namespace webusb
« chrome/browser/chrome_web_usb_browser_client.h ('K') | « chrome/browser/usb/web_usb_detector.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698