Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(927)

Unified Diff: chrome/browser/storage_monitor/media_storage_util_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
Index: chrome/browser/storage_monitor/media_storage_util_unittest.cc
===================================================================
--- chrome/browser/storage_monitor/media_storage_util_unittest.cc (revision 218837)
+++ chrome/browser/storage_monitor/media_storage_util_unittest.cc (working copy)
@@ -45,9 +45,9 @@
}
void ProcessAttach(const std::string& id,
- const string16& name,
const base::FilePath::StringType& location) {
- StorageInfo info(id, name, location, string16(), string16(), string16(), 0);
+ StorageInfo info(id, location, base::string16(), base::string16(),
+ base::string16(), 0);
monitor_->receiver()->ProcessAttach(info);
}
@@ -143,8 +143,7 @@
event.Wait();
EXPECT_FALSE(devices.find(kImageCaptureDeviceId) != devices.end());
- ProcessAttach(kImageCaptureDeviceId, ASCIIToUTF16("name"),
- FILE_PATH_LITERAL("/location"));
+ ProcessAttach(kImageCaptureDeviceId, FILE_PATH_LITERAL("/location"));
devices.insert(kImageCaptureDeviceId);
event.Reset();
BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,

Powered by Google App Engine
This is Rietveld 408576698