| Index: chrome/browser/policy/policy_browsertest.cc
|
| diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
|
| index 78070ed76f5f0821b7e8e0cd45d01a45818a4c35..4e33d0ba4c2f48e5a3b2cb4f60ce86e740595e41 100644
|
| --- a/chrome/browser/policy/policy_browsertest.cc
|
| +++ b/chrome/browser/policy/policy_browsertest.cc
|
| @@ -202,14 +202,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();
|
| }
|
|
|
| @@ -326,13 +326,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) {
|
| @@ -455,7 +455,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();
|
| }
|
|
|
| @@ -524,7 +524,7 @@ class PolicyTest : public InProcessBrowserTest {
|
| BrowserThread::IO,
|
| FROM_HERE,
|
| base::Bind(base::DoNothing),
|
| - MessageLoop::QuitClosure());
|
| + base::MessageLoop::QuitClosure());
|
| content::RunMessageLoop();
|
| }
|
| #endif
|
| @@ -579,7 +579,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();
|
| }
|
| @@ -2017,7 +2017,7 @@ class MediaStreamDevicesControllerBrowserTest
|
| base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this));
|
| controller.DismissInfoBarAndTakeActionOnSettings();
|
|
|
| - MessageLoop::current()->QuitWhenIdle();
|
| + base::MessageLoop::current()->QuitWhenIdle();
|
| }
|
|
|
| void FinishVideoTest() {
|
| @@ -2030,7 +2030,7 @@ class MediaStreamDevicesControllerBrowserTest
|
| base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this));
|
| controller.DismissInfoBarAndTakeActionOnSettings();
|
|
|
| - MessageLoop::current()->QuitWhenIdle();
|
| + base::MessageLoop::current()->QuitWhenIdle();
|
| }
|
|
|
| bool policy_value_;
|
| @@ -2057,7 +2057,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,
|
| @@ -2081,7 +2081,7 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
|
| base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishVideoTest,
|
| this));
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
| }
|
|
|
| INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance,
|
|
|