chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc - Issue 19489006: Media Galleries: Move gallery name generation back to StorageMonitor.

Unified Diff: chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc

Issue 19489006: Media Galleries: Move gallery name generation back to StorageMonitor. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: rebase Created 7 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/storage_monitor/storage_monitor_chromeos.cc ('k') | chrome/browser/storage_monitor/storage_monitor_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc

===================================================================

--- chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc (revision 218837)

+++ chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc (working copy)

@@ -280,7 +280,6 @@

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

EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),

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

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

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

UnmountDevice(MOUNT_ERROR_NONE, mount_info);

@@ -301,7 +300,6 @@

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

EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),

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

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

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

UnmountDevice(MOUNT_ERROR_NONE, mount_info2);

@@ -329,7 +327,6 @@

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

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

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

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

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

}

@@ -379,7 +376,6 @@

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

EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),

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

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

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

UnmountDevice(MOUNT_ERROR_NONE, mount_info1);

@@ -400,7 +396,6 @@

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

EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),

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

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

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

UnmountDevice(MOUNT_ERROR_NONE, mount_info2);

@@ -423,7 +418,6 @@

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

EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),

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

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

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

UnmountDevice(MOUNT_ERROR_NONE, mount_info);

@@ -446,7 +440,6 @@

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

EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),

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

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

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

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