chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc - Issue 490643005: Files.app: Start to use DeviceEventRouter.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc

Issue 490643005: Files.app: Start to use DeviceEventRouter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 6 years, 4 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

« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager/device_event_router.cc ('k') | chrome/browser/chromeos/extensions/file_manager/event_router.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 72e0d6d67da3e40ec0e743aae9c212e956ad67a4..7b1a560c14c0fb8ed8470b880fe175140e399336 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

@@ -140,7 +140,7 @@ 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_ADDED,

+ EXPECT_EQ(file_browser_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,

@@ -159,10 +159,10 @@ 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_ADDED,

+ EXPECT_EQ(file_browser_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_CANCELED,

+ EXPECT_EQ(file_browser_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,