| Index: chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc
|
| diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc b/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc
|
| index 3f2dcefd23287219ed55df440fdfc7a6411a18ff..fb40f64ce91a92eff7acaf88cef4e9dfc0468543 100644
|
| --- a/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc
|
| +++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc
|
| @@ -15,13 +15,13 @@
|
| namespace file_manager {
|
| namespace {
|
|
|
| -namespace file_browser_private = extensions::api::file_browser_private;
|
| +namespace file_manager_private = extensions::api::file_manager_private;
|
| typedef chromeos::disks::DiskMountManager::Disk Disk;
|
|
|
| const char kTestDevicePath[] = "/device/test";
|
|
|
| struct DeviceEvent {
|
| - extensions::api::file_browser_private::DeviceEventType type;
|
| + extensions::api::file_manager_private::DeviceEventType type;
|
| std::string device_path;
|
| };
|
|
|
| @@ -34,7 +34,7 @@ class DeviceEventRouterImpl : public DeviceEventRouter {
|
| virtual ~DeviceEventRouterImpl() {}
|
|
|
| // DeviceEventRouter overrides.
|
| - virtual void OnDeviceEvent(file_browser_private::DeviceEventType type,
|
| + virtual void OnDeviceEvent(file_manager_private::DeviceEventType type,
|
| const std::string& device_path) OVERRIDE {
|
| DeviceEvent event;
|
| event.type = type;
|
| @@ -119,7 +119,7 @@ TEST_F(DeviceEventRouterTest, AddAndRemoveDevice) {
|
| device_event_router->OnDiskRemoved(disk1_unmounted);
|
| device_event_router->OnDeviceRemoved("/device/test");
|
| ASSERT_EQ(1u, device_event_router->events.size());
|
| - EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_REMOVED,
|
| + EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_REMOVED,
|
| device_event_router->events[0].type);
|
| EXPECT_EQ("/device/test", device_event_router->events[0].device_path);
|
| }
|
| @@ -138,10 +138,10 @@ TEST_F(DeviceEventRouterTest, DeviceScan) {
|
| device_event_router->OnDiskRemoved(disk_unmounted);
|
| device_event_router->OnDeviceRemoved("/device/test");
|
| ASSERT_EQ(2u, device_event_router->events.size());
|
| - EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
|
| + EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
|
| device_event_router->events[0].type);
|
| EXPECT_EQ("/device/test", device_event_router->events[0].device_path);
|
| - EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_REMOVED,
|
| + EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_REMOVED,
|
| device_event_router->events[1].type);
|
| EXPECT_EQ("/device/test", device_event_router->events[1].device_path);
|
| }
|
| @@ -157,13 +157,13 @@ TEST_F(DeviceEventRouterTest, DeviceScanCancelled) {
|
| device_event_router->OnDiskRemoved(disk_unmounted);
|
| device_event_router->OnDeviceRemoved("/device/test");
|
| ASSERT_EQ(3u, device_event_router->events.size());
|
| - EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
|
| + EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
|
| device_event_router->events[0].type);
|
| EXPECT_EQ("/device/test", device_event_router->events[0].device_path);
|
| - EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_SCAN_CANCELLED,
|
| + EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_SCAN_CANCELLED,
|
| device_event_router->events[1].type);
|
| EXPECT_EQ("/device/test", device_event_router->events[1].device_path);
|
| - EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_REMOVED,
|
| + EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_REMOVED,
|
| device_event_router->events[2].type);
|
| EXPECT_EQ("/device/test", device_event_router->events[2].device_path);
|
| }
|
| @@ -179,10 +179,10 @@ TEST_F(DeviceEventRouterTest, HardUnplugged) {
|
| device_event_router->OnDeviceRemoved(kTestDevicePath);
|
| base::RunLoop().RunUntilIdle();
|
| ASSERT_EQ(2u, device_event_router->events.size());
|
| - EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_HARD_UNPLUGGED,
|
| + EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_HARD_UNPLUGGED,
|
| device_event_router->events[0].type);
|
| EXPECT_EQ("/device/test", device_event_router->events[0].device_path);
|
| - EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_REMOVED,
|
| + EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_REMOVED,
|
| device_event_router->events[1].type);
|
| EXPECT_EQ("/device/test", device_event_router->events[1].device_path);
|
| }
|
|
|