| Index: chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
|
| diff --git a/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc b/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
|
| index af5aaca324a4da9582622c83d718b732ecd536d8..36dfd84a68d9564e1132903c46b244cb55be3cae 100644
|
| --- a/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
|
| +++ b/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
|
| @@ -141,9 +141,9 @@ string16 GetDeviceName(const std::string& device) {
|
|
|
| class TestStorageMonitorLinux : public StorageMonitorLinux {
|
| public:
|
| - TestStorageMonitorLinux(const base::FilePath& path, MessageLoop* message_loop)
|
| - : StorageMonitorLinux(path),
|
| - message_loop_(message_loop) {
|
| + TestStorageMonitorLinux(const base::FilePath& path,
|
| + base::MessageLoop* message_loop)
|
| + : StorageMonitorLinux(path), message_loop_(message_loop) {
|
| SetMediaTransferProtocolManagerForTest(
|
| new TestMediaTransferProtocolManagerLinux());
|
| SetGetDeviceInfoCallbackForTest(base::Bind(&GetDeviceInfo));
|
| @@ -154,10 +154,10 @@ class TestStorageMonitorLinux : public StorageMonitorLinux {
|
| virtual void UpdateMtab(
|
| const MtabWatcherLinux::MountPointDeviceMap& new_mtab) OVERRIDE {
|
| StorageMonitorLinux::UpdateMtab(new_mtab);
|
| - message_loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure());
|
| + message_loop_->PostTask(FROM_HERE, base::MessageLoop::QuitClosure());
|
| }
|
|
|
| - MessageLoop* message_loop_;
|
| + base::MessageLoop* message_loop_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestStorageMonitorLinux);
|
| };
|
| @@ -179,10 +179,9 @@ class StorageMonitorLinuxTest : public testing::Test {
|
| };
|
|
|
| StorageMonitorLinuxTest()
|
| - : message_loop_(MessageLoop::TYPE_IO),
|
| + : message_loop_(base::MessageLoop::TYPE_IO),
|
| ui_thread_(content::BrowserThread::UI, &message_loop_),
|
| - file_thread_(content::BrowserThread::FILE, &message_loop_) {
|
| - }
|
| + file_thread_(content::BrowserThread::FILE, &message_loop_) {}
|
| virtual ~StorageMonitorLinuxTest() {}
|
|
|
| protected:
|
| @@ -323,7 +322,7 @@ class StorageMonitorLinuxTest : public testing::Test {
|
| }
|
|
|
| // The message loop and file thread to run tests on.
|
| - MessageLoop message_loop_;
|
| + base::MessageLoop message_loop_;
|
| content::TestBrowserThread ui_thread_;
|
| content::TestBrowserThread file_thread_;
|
|
|
|
|