components/storage_monitor/storage_monitor_chromeos_unittest.cc - Issue 120303003: [StorageMonitor] Move gallery name generation to StorageInfo.

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: components/storage_monitor/storage_monitor_chromeos_unittest.cc

Issue 120303003: [StorageMonitor] Move gallery name generation to StorageInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update Created 6 years, 10 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

« components/storage_monitor/storage_info.cc ('K') | « components/storage_monitor/storage_monitor_chromeos.cc ('k') | components/storage_monitor/storage_monitor_linux.cc » ('j') | components/storage_monitor/test_volume_mount_watcher_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/storage_monitor/storage_monitor_chromeos_unittest.cc

diff --git a/components/storage_monitor/storage_monitor_chromeos_unittest.cc b/components/storage_monitor/storage_monitor_chromeos_unittest.cc

index 60f5364f19e0961d3ff3cd92d6e6d6719decc401..3ece5eb901fd3e42602ab2476696ef3d2bc79234 100644

--- a/components/storage_monitor/storage_monitor_chromeos_unittest.cc

+++ b/components/storage_monitor/storage_monitor_chromeos_unittest.cc

@@ -334,7 +334,6 @@ TEST_F(StorageMonitorCrosTest, NoDCIM) {

EXPECT_EQ(1, observer().attach_calls());

EXPECT_EQ(0, observer().detach_calls());

EXPECT_EQ(device_id, observer().last_attached().device_id());

- EXPECT_EQ(base::string16(), observer().last_attached().name());

EXPECT_EQ(mount_path.value(), observer().last_attached().location());

}

@@ -411,7 +410,6 @@ TEST_F(StorageMonitorCrosTest, SDCardAttachDetach) {

EXPECT_EQ(0, observer().detach_calls());

EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),

observer().last_attached().device_id());

- EXPECT_EQ(base::string16(), observer().last_attached().name());

EXPECT_EQ(mount_path1.value(), observer().last_attached().location());

UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info1);

@@ -439,7 +437,6 @@ TEST_F(StorageMonitorCrosTest, SDCardAttachDetach) {

EXPECT_EQ(1, observer().detach_calls());

EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),

observer().last_attached().device_id());

- EXPECT_EQ(base::string16(), observer().last_attached().name());

EXPECT_EQ(mount_path2.value(), observer().last_attached().location());

UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info2);

@@ -469,7 +466,6 @@ TEST_F(StorageMonitorCrosTest, AttachDeviceWithEmptyLabel) {

EXPECT_EQ(0, observer().detach_calls());

EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),

observer().last_attached().device_id());

- EXPECT_EQ(base::string16(), observer().last_attached().name());

EXPECT_EQ(mount_path1.value(), observer().last_attached().location());

UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info);

@@ -499,7 +495,6 @@ TEST_F(StorageMonitorCrosTest, GetStorageSize) {

EXPECT_EQ(0, observer().detach_calls());

EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),

observer().last_attached().device_id());

- EXPECT_EQ(base::string16(), observer().last_attached().name());

EXPECT_EQ(mount_path1.value(), observer().last_attached().location());

EXPECT_EQ(kDevice1SizeInBytes, GetDeviceStorageSize(mount_path1.value()));