| 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,
|
|
|