Chromium Code Reviews| Index: chrome/browser/extensions/extension_service_unittest.cc |
| diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc |
| index d1db9a512532d39208a36ddd687e7cc302365015..9c4e76eed60f1c170c77a0b133d5a31f2138ffb2 100644 |
| --- a/chrome/browser/extensions/extension_service_unittest.cc |
| +++ b/chrome/browser/extensions/extension_service_unittest.cc |
| @@ -420,7 +420,7 @@ ExtensionServiceInitParams() |
| // Our message loop may be used in tests which require it to be an IO loop. |
| ExtensionServiceTestBase::ExtensionServiceTestBase() |
| - : loop_(MessageLoop::TYPE_IO), |
| + : loop_(base::MessageLoop::TYPE_IO), |
| service_(NULL), |
| management_policy_(NULL), |
| expected_extensions_count_(0), |
| @@ -443,9 +443,9 @@ ExtensionServiceTestBase::~ExtensionServiceTestBase() { |
| // can be destroyed while BrowserThreads and MessageLoop are still around |
| // (they are used in the destruction process). |
| service_ = NULL; |
| - MessageLoop::current()->RunUntilIdle(); |
| + base::MessageLoop::current()->RunUntilIdle(); |
| profile_.reset(NULL); |
| - MessageLoop::current()->RunUntilIdle(); |
| + base::MessageLoop::current()->RunUntilIdle(); |
| } |
| void ExtensionServiceTestBase::InitializeExtensionService( |
| @@ -1122,7 +1122,7 @@ void PackExtensionTestClient::OnPackSuccess( |
| // on with the rest of the test. |
| // This call to |Quit()| matches the call to |Run()| in the |
| // |PackPunctuatedExtension| test. |
| - MessageLoop::current()->Quit(); |
| + base::MessageLoop::current()->Quit(); |
| EXPECT_EQ(expected_crx_path_.value(), crx_path.value()); |
| EXPECT_EQ(expected_private_key_path_.value(), private_key_path.value()); |
| ASSERT_TRUE(file_util::PathExists(private_key_path)); |
| @@ -2021,7 +2021,7 @@ TEST_F(ExtensionServiceTest, PackPunctuatedExtension) { |
| // block and catch the notification; otherwise, the process would exit. |
| // This call to |Run()| is matched by a call to |Quit()| in the |
| // |PackExtensionTestClient|'s notification handling code. |
| - MessageLoop::current()->Run(); |
| + base::MessageLoop::current()->Run(); |
| if (HasFatalFailure()) |
| return; |
| @@ -3805,23 +3805,24 @@ TEST_F(ExtensionServiceTest, UnpackedRequirements) { |
| class ExtensionCookieCallback { |
| public: |
| ExtensionCookieCallback() |
| - : result_(false), |
| - weak_factory_(MessageLoop::current()) {} |
| + : result_(false), weak_factory_(base::MessageLoop::current()) {} |
|
brettw
2013/04/28 04:26:27
In other cases you were a bit too aggressive putti
|
| void SetCookieCallback(bool result) { |
| - MessageLoop::current()->PostTask( |
| - FROM_HERE, base::Bind(&MessageLoop::Quit, weak_factory_.GetWeakPtr())); |
| + base::MessageLoop::current()->PostTask( |
| + FROM_HERE, |
|
brettw
2013/04/28 04:26:27
Old way was fine, below also.
|
| + base::Bind(&base::MessageLoop::Quit, weak_factory_.GetWeakPtr())); |
| result_ = result; |
| } |
| void GetAllCookiesCallback(const net::CookieList& list) { |
| - MessageLoop::current()->PostTask( |
| - FROM_HERE, base::Bind(&MessageLoop::Quit, weak_factory_.GetWeakPtr())); |
| + base::MessageLoop::current()->PostTask( |
| + FROM_HERE, |
| + base::Bind(&base::MessageLoop::Quit, weak_factory_.GetWeakPtr())); |
| list_ = list; |
| } |
| net::CookieList list_; |
| bool result_; |
| - base::WeakPtrFactory<MessageLoop> weak_factory_; |
| + base::WeakPtrFactory<base::MessageLoop> weak_factory_; |
| }; |
| // Verifies extension state is removed upon uninstall. |
| @@ -4638,7 +4639,7 @@ TEST(ExtensionServiceTestSimple, Enabledness) { |
| ExtensionErrorReporter::Init(false); // no noisy errors |
| ExtensionsReadyRecorder recorder; |
| scoped_ptr<TestingProfile> profile(new TestingProfile()); |
| - MessageLoop loop; |
| + base::MessageLoop loop; |
| content::TestBrowserThread ui_thread(BrowserThread::UI, &loop); |
| content::TestBrowserThread file_thread(BrowserThread::FILE, &loop); |
| #if defined OS_CHROMEOS |