| Index: chrome/browser/extensions/user_script_listener_unittest.cc
|
| diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
|
| index ed379bb7f78c13d89b3e73b317b40e873bad2b62..18d899a169790bf826719a59b428eb316d072291 100644
|
| --- a/chrome/browser/extensions/user_script_listener_unittest.cc
|
| +++ b/chrome/browser/extensions/user_script_listener_unittest.cc
|
| @@ -143,14 +143,14 @@ class UserScriptListenerTest : public ExtensionServiceTestBase {
|
|
|
| InitializeEmptyExtensionService();
|
| service_->Init();
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
|
|
| listener_ = new UserScriptListener();
|
| }
|
|
|
| virtual void TearDown() OVERRIDE {
|
| listener_ = NULL;
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
| ExtensionServiceTestBase::TearDown();
|
| }
|
|
|
| @@ -203,7 +203,7 @@ namespace {
|
|
|
| TEST_F(UserScriptListenerTest, DelayAndUpdate) {
|
| LoadTestExtension();
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
|
|
| net::TestDelegate delegate;
|
| net::TestURLRequestContext context;
|
| @@ -215,13 +215,13 @@ TEST_F(UserScriptListenerTest, DelayAndUpdate) {
|
| chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
|
| content::Source<Profile>(profile_.get()),
|
| content::NotificationService::NoDetails());
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
| EXPECT_EQ(kTestData, delegate.data_received());
|
| }
|
|
|
| TEST_F(UserScriptListenerTest, DelayAndUnload) {
|
| LoadTestExtension();
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
|
|
| net::TestDelegate delegate;
|
| net::TestURLRequestContext context;
|
| @@ -230,7 +230,7 @@ TEST_F(UserScriptListenerTest, DelayAndUnload) {
|
| ASSERT_FALSE(request->is_pending());
|
|
|
| UnloadTestExtension();
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
|
|
| // This is still not enough to start delayed requests. We have to notify the
|
| // listener that the user scripts have been updated.
|
| @@ -240,7 +240,7 @@ TEST_F(UserScriptListenerTest, DelayAndUnload) {
|
| chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
|
| content::Source<Profile>(profile_.get()),
|
| content::NotificationService::NoDetails());
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
| EXPECT_EQ(kTestData, delegate.data_received());
|
| }
|
|
|
| @@ -253,13 +253,13 @@ TEST_F(UserScriptListenerTest, NoDelayNoExtension) {
|
| // The request should be started immediately.
|
| ASSERT_TRUE(request->is_pending());
|
|
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
| EXPECT_EQ(kTestData, delegate.data_received());
|
| }
|
|
|
| TEST_F(UserScriptListenerTest, NoDelayNotMatching) {
|
| LoadTestExtension();
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
|
|
| net::TestDelegate delegate;
|
| net::TestURLRequestContext context;
|
| @@ -270,13 +270,13 @@ TEST_F(UserScriptListenerTest, NoDelayNotMatching) {
|
| // The request should be started immediately.
|
| ASSERT_TRUE(request->is_pending());
|
|
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
| EXPECT_EQ(kTestData, delegate.data_received());
|
| }
|
|
|
| TEST_F(UserScriptListenerTest, MultiProfile) {
|
| LoadTestExtension();
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
|
|
| // Fire up a second profile and have it load and extension with a content
|
| // script.
|
| @@ -303,7 +303,7 @@ TEST_F(UserScriptListenerTest, MultiProfile) {
|
| chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
|
| content::Source<Profile>(profile_.get()),
|
| content::NotificationService::NoDetails());
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
| ASSERT_FALSE(request->is_pending());
|
| EXPECT_TRUE(delegate.data_received().empty());
|
|
|
| @@ -312,7 +312,7 @@ TEST_F(UserScriptListenerTest, MultiProfile) {
|
| chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
|
| content::Source<Profile>(&profile2),
|
| content::NotificationService::NoDetails());
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
| EXPECT_EQ(kTestData, delegate.data_received());
|
| }
|
|
|
| @@ -321,7 +321,7 @@ TEST_F(UserScriptListenerTest, MultiProfile) {
|
| // throttles.
|
| TEST_F(UserScriptListenerTest, ResumeBeforeStart) {
|
| LoadTestExtension();
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
| net::TestDelegate delegate;
|
| net::TestURLRequestContext context;
|
| GURL url(kMatchingUrl);
|
| @@ -339,7 +339,7 @@ TEST_F(UserScriptListenerTest, ResumeBeforeStart) {
|
| chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
|
| content::Source<Profile>(profile_.get()),
|
| content::NotificationService::NoDetails());
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
|
|
| bool defer = false;
|
| throttle->WillStartRequest(&defer);
|
|
|