| Index: chrome/browser/policy/policy_browsertest.cc
|
| diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
|
| index 1f420d7e65a06904322bec9ec587818f86c29d27..46d91bebdbabd19732246f93fbb8572d63552739 100644
|
| --- a/chrome/browser/policy/policy_browsertest.cc
|
| +++ b/chrome/browser/policy/policy_browsertest.cc
|
| @@ -203,14 +203,14 @@ class MakeRequestFail {
|
| BrowserThread::PostTaskAndReply(
|
| BrowserThread::IO, FROM_HERE,
|
| base::Bind(MakeRequestFailOnIO, host_),
|
| - MessageLoop::QuitClosure());
|
| + base::MessageLoop::QuitClosure());
|
| content::RunMessageLoop();
|
| }
|
| ~MakeRequestFail() {
|
| BrowserThread::PostTaskAndReply(
|
| BrowserThread::IO, FROM_HERE,
|
| base::Bind(UndoMakeRequestFailOnIO, host_),
|
| - MessageLoop::QuitClosure());
|
| + base::MessageLoop::QuitClosure());
|
| content::RunMessageLoop();
|
| }
|
|
|
| @@ -327,13 +327,13 @@ bool IsJavascriptEnabled(content::WebContents* contents) {
|
| void CopyPluginListAndQuit(std::vector<webkit::WebPluginInfo>* out,
|
| const std::vector<webkit::WebPluginInfo>& in) {
|
| *out = in;
|
| - MessageLoop::current()->QuitWhenIdle();
|
| + base::MessageLoop::current()->QuitWhenIdle();
|
| }
|
|
|
| template<typename T>
|
| void CopyValueAndQuit(T* out, T in) {
|
| *out = in;
|
| - MessageLoop::current()->QuitWhenIdle();
|
| + base::MessageLoop::current()->QuitWhenIdle();
|
| }
|
|
|
| void GetPluginList(std::vector<webkit::WebPluginInfo>* plugins) {
|
| @@ -456,7 +456,7 @@ class PolicyTest : public InProcessBrowserTest {
|
| BrowserThread::PostTaskAndReply(
|
| BrowserThread::IO, FROM_HERE,
|
| base::Bind(URLRequestMockHTTPJob::AddUrlHandler, root_http),
|
| - MessageLoop::current()->QuitWhenIdleClosure());
|
| + base::MessageLoop::current()->QuitWhenIdleClosure());
|
| content::RunMessageLoop();
|
| }
|
|
|
| @@ -525,7 +525,7 @@ class PolicyTest : public InProcessBrowserTest {
|
| BrowserThread::IO,
|
| FROM_HERE,
|
| base::Bind(base::DoNothing),
|
| - MessageLoop::QuitClosure());
|
| + base::MessageLoop::QuitClosure());
|
| content::RunMessageLoop();
|
| }
|
| #endif
|
| @@ -580,7 +580,7 @@ class PolicyTest : public InProcessBrowserTest {
|
|
|
| void UpdateProviderPolicy(const PolicyMap& policy) {
|
| provider_.UpdateChromePolicy(policy);
|
| - DCHECK(MessageLoop::current());
|
| + DCHECK(base::MessageLoop::current());
|
| base::RunLoop loop;
|
| loop.RunUntilIdle();
|
| }
|
| @@ -2057,7 +2057,7 @@ class MediaStreamDevicesControllerBrowserTest
|
| base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this));
|
| controller.DismissInfoBarAndTakeActionOnSettings();
|
|
|
| - MessageLoop::current()->QuitWhenIdle();
|
| + base::MessageLoop::current()->QuitWhenIdle();
|
| }
|
|
|
| void FinishVideoTest() {
|
| @@ -2070,7 +2070,7 @@ class MediaStreamDevicesControllerBrowserTest
|
| base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this));
|
| controller.DismissInfoBarAndTakeActionOnSettings();
|
|
|
| - MessageLoop::current()->QuitWhenIdle();
|
| + base::MessageLoop::current()->QuitWhenIdle();
|
| }
|
|
|
| bool policy_value_;
|
| @@ -2102,7 +2102,7 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
|
| base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishAudioTest,
|
| this));
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
|
| @@ -2159,7 +2159,7 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
|
| base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishVideoTest,
|
| this));
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
|
|
|