| Index: chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
|
| diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
|
| index fd3e3dcba23c222ff339d07c080c57cc472fc923..3806c3e142b0a0b2eab501a12b9d50438fab3b51 100644
|
| --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
|
| +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
|
| @@ -10,6 +10,7 @@
|
| #include <set>
|
|
|
| #include "base/message_loop/message_loop.h"
|
| +#include "base/run_loop.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "build/build_config.h"
|
| @@ -56,7 +57,7 @@ void AssertIntercepted(
|
| base::Bind(AssertInterceptedIO,
|
| url,
|
| base::Unretained(interceptor)));
|
| - base::MessageLoop::current()->RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| // FakeURLRequestJobFactory returns NULL for all job creation requests and false
|
| @@ -117,7 +118,7 @@ void AssertWillHandle(
|
| scheme,
|
| expected,
|
| base::Unretained(interceptor)));
|
| - base::MessageLoop::current()->RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| base::DictionaryValue* GetProtocolHandlerValue(std::string protocol,
|
| @@ -738,7 +739,7 @@ TEST_F(ProtocolHandlerRegistryTest, TestOSRegistration) {
|
|
|
| registry()->OnAcceptRegisterProtocolHandler(ph_do1);
|
| registry()->OnDenyRegisterProtocolHandler(ph_dont);
|
| - base::MessageLoop::current()->Run(); // FILE thread needs to run.
|
| + base::RunLoop().Run(); // FILE thread needs to run.
|
| ASSERT_TRUE(delegate()->IsFakeRegisteredWithOS("do"));
|
| ASSERT_FALSE(delegate()->IsFakeRegisteredWithOS("dont"));
|
|
|
| @@ -768,10 +769,10 @@ TEST_F(ProtocolHandlerRegistryTest, MAYBE_TestOSRegistrationFailure) {
|
| ASSERT_FALSE(registry()->IsHandledProtocol("dont"));
|
|
|
| registry()->OnAcceptRegisterProtocolHandler(ph_do);
|
| - base::MessageLoop::current()->Run(); // FILE thread needs to run.
|
| + base::RunLoop().Run(); // FILE thread needs to run.
|
| delegate()->set_force_os_failure(true);
|
| registry()->OnAcceptRegisterProtocolHandler(ph_dont);
|
| - base::MessageLoop::current()->Run(); // FILE thread needs to run.
|
| + base::RunLoop().Run(); // FILE thread needs to run.
|
| ASSERT_TRUE(registry()->IsHandledProtocol("do"));
|
| ASSERT_EQ(static_cast<size_t>(1), registry()->GetHandlersFor("do").size());
|
| ASSERT_FALSE(registry()->IsHandledProtocol("dont"));
|
|
|