| Index: chrome/browser/chrome_web_usb_browser_client_unittest.cc
|
| diff --git a/chrome/browser/chrome_webusb_browser_client_unittest.cc b/chrome/browser/chrome_web_usb_browser_client_unittest.cc
|
| similarity index 93%
|
| rename from chrome/browser/chrome_webusb_browser_client_unittest.cc
|
| rename to chrome/browser/chrome_web_usb_browser_client_unittest.cc
|
| index c2503d9e8dd2a80d355c706e136ab8e055ae634b..4b77776c04ea1a2260d69c6f1f94063ad6903cd0 100644
|
| --- a/chrome/browser/chrome_webusb_browser_client_unittest.cc
|
| +++ b/chrome/browser/chrome_web_usb_browser_client_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 "chrome/browser/chrome_webusb_browser_client.h"
|
| +#include "chrome/browser/chrome_web_usb_browser_client.h"
|
|
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| #include "base/strings/string16.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "components/webusb/webusb_detector.h"
|
| +#include "chrome/browser/usb/web_usb_detector.h"
|
| #include "device/core/mock_device_client.h"
|
| #include "device/usb/mock_usb_device.h"
|
| #include "device/usb/mock_usb_service.h"
|
| @@ -47,7 +47,7 @@ class ChromeWebUsbBrowserClientTest : public testing::Test {
|
|
|
| protected:
|
| device::MockDeviceClient device_client_;
|
| - ChromeWebUsbBrowserClient chrome_webusb_browser_client_;
|
| + ChromeWebUsbBrowserClient chrome_web_usb_browser_client_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(ChromeWebUsbBrowserClientTest);
|
| @@ -59,7 +59,7 @@ TEST_F(ChromeWebUsbBrowserClientTest, UsbDeviceAddedAndRemoved) {
|
| 0, 1, "Google", kProductName_1, "002", landing_page));
|
| std::string guid = device->guid();
|
|
|
| - webusb::WebUsbDetector webusb_detector(&chrome_webusb_browser_client_);
|
| + WebUsbDetector web_usb_detector(&chrome_web_usb_browser_client_);
|
|
|
| device_client_.usb_service()->AddDevice(device);
|
|
|
| @@ -96,7 +96,7 @@ TEST_F(ChromeWebUsbBrowserClientTest,
|
| 0, 1, "Google", product_name, "002", landing_page));
|
| std::string guid = device->guid();
|
|
|
| - webusb::WebUsbDetector webusb_detector(&chrome_webusb_browser_client_);
|
| + WebUsbDetector web_usb_detector(&chrome_web_usb_browser_client_);
|
|
|
| device_client_.usb_service()->AddDevice(device);
|
|
|
| @@ -119,7 +119,7 @@ TEST_F(ChromeWebUsbBrowserClientTest,
|
| 0, 1, "Google", kProductName_1, "002", landing_page));
|
| std::string guid = device->guid();
|
|
|
| - webusb::WebUsbDetector webusb_detector(&chrome_webusb_browser_client_);
|
| + WebUsbDetector web_usb_detector(&chrome_web_usb_browser_client_);
|
|
|
| device_client_.usb_service()->AddDevice(device);
|
|
|
| @@ -141,7 +141,7 @@ TEST_F(ChromeWebUsbBrowserClientTest, UsbDeviceWasThereBeforeAndThenRemoved) {
|
| 0, 1, "Google", kProductName_1, "002", landing_page));
|
| std::string guid = device->guid();
|
|
|
| - webusb::WebUsbDetector webusb_detector(&chrome_webusb_browser_client_);
|
| + WebUsbDetector web_usb_detector(&chrome_web_usb_browser_client_);
|
|
|
| message_center::MessageCenter* message_center =
|
| message_center::MessageCenter::Get();
|
| @@ -173,7 +173,7 @@ TEST_F(ChromeWebUsbBrowserClientTest, ThreeUsbDevicesAddedAndRemoved) {
|
| 6, 7, "Google", kProductName_3, "008", landing_page_3));
|
| std::string guid_3 = device_3->guid();
|
|
|
| - webusb::WebUsbDetector webusb_detector(&chrome_webusb_browser_client_);
|
| + WebUsbDetector web_usb_detector(&chrome_web_usb_browser_client_);
|
|
|
| device_client_.usb_service()->AddDevice(device_1);
|
| device_client_.usb_service()->AddDevice(device_2);
|
|
|