components/storage_monitor/media_storage_util_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/media_storage_util_unittest.cc

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

Patch Set: fix unittest build error on mac/linux/chromeos Created 6 years, 9 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 | « components/storage_monitor/image_capture_device_manager.mm ('k') | components/storage_monitor/media_transfer_protocol_device_observer_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/storage_monitor/media_storage_util_unittest.cc

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

index 1d32e499d8286cee0e3951803844abac6e5f432a..aa0f37cd0ca1bfa947442cfc58f9e4ff1b6d383a 100644

--- a/components/storage_monitor/media_storage_util_unittest.cc

+++ b/components/storage_monitor/media_storage_util_unittest.cc

@@ -43,9 +43,8 @@ class MediaStorageUtilTest : public testing::Test {

}

void ProcessAttach(const std::string& id,

- const base::string16& name,

const base::FilePath::StringType& location) {

- StorageInfo info(id, name, location, base::string16(), base::string16(),

+ StorageInfo info(id, location, base::string16(), base::string16(),

base::string16(), 0);

monitor_->receiver()->ProcessAttach(info);

}

@@ -141,8 +140,7 @@ TEST_F(MediaStorageUtilTest, DetectDeviceFiltered) {

event.Wait();

EXPECT_FALSE(devices.find(kImageCaptureDeviceId) != devices.end());

- ProcessAttach(kImageCaptureDeviceId, base::ASCIIToUTF16("name"),

- FILE_PATH_LITERAL("/location"));

+ ProcessAttach(kImageCaptureDeviceId, FILE_PATH_LITERAL("/location"));

devices.insert(kImageCaptureDeviceId);

event.Reset();

BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,