Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2135)

Unified Diff: chrome/browser/policy/policy_browsertest.cc

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 5ac8b2eb5e4a98088b3a96f102378b2f8976f247..7034c57cf9c6e7a227e488a494dd1f6bb87b0321 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -192,17 +192,17 @@ class MakeRequestFail {
public:
// Sets up the filter on IO thread such that requests to |host| fail.
explicit MakeRequestFail(const std::string& host) : host_(host) {
- BrowserThread::PostTaskAndReply(
- BrowserThread::IO, FROM_HERE,
- base::Bind(MakeRequestFailOnIO, host_),
- MessageLoop::QuitClosure());
+ BrowserThread::PostTaskAndReply(BrowserThread::IO,
+ FROM_HERE,
+ base::Bind(MakeRequestFailOnIO, host_),
+ base::MessageLoop::QuitClosure());
content::RunMessageLoop();
}
~MakeRequestFail() {
- BrowserThread::PostTaskAndReply(
- BrowserThread::IO, FROM_HERE,
- base::Bind(UndoMakeRequestFailOnIO, host_),
- MessageLoop::QuitClosure());
+ BrowserThread::PostTaskAndReply(BrowserThread::IO,
+ FROM_HERE,
+ base::Bind(UndoMakeRequestFailOnIO, host_),
+ base::MessageLoop::QuitClosure());
content::RunMessageLoop();
}
@@ -319,13 +319,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) {
@@ -445,9 +445,10 @@ class PolicyTest : public InProcessBrowserTest {
base::FilePath root_http;
PathService::Get(content::DIR_TEST_DATA, &root_http);
BrowserThread::PostTaskAndReply(
- BrowserThread::IO, FROM_HERE,
+ BrowserThread::IO,
+ FROM_HERE,
base::Bind(URLRequestMockHTTPJob::AddUrlHandler, root_http),
- MessageLoop::current()->QuitWhenIdleClosure());
+ base::MessageLoop::current()->QuitWhenIdleClosure());
content::RunMessageLoop();
}
@@ -512,11 +513,10 @@ class PolicyTest : public InProcessBrowserTest {
ash::TAKE_SCREENSHOT, ui::Accelerator());
// TAKE_SCREENSHOT handler posts write file task on success, wait for it.
- BrowserThread::PostTaskAndReply(
- BrowserThread::IO,
- FROM_HERE,
- base::Bind(base::DoNothing),
- MessageLoop::QuitClosure());
+ BrowserThread::PostTaskAndReply(BrowserThread::IO,
+ FROM_HERE,
+ base::Bind(base::DoNothing),
+ base::MessageLoop::QuitClosure());
content::RunMessageLoop();
}
#endif
@@ -557,7 +557,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();
}
@@ -1979,7 +1979,7 @@ class MediaStreamDevicesControllerBrowserTest
base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this));
controller.DismissInfoBarAndTakeActionOnSettings();
- MessageLoop::current()->QuitWhenIdle();
+ base::MessageLoop::current()->QuitWhenIdle();
}
void FinishVideoTest() {
@@ -1995,7 +1995,7 @@ class MediaStreamDevicesControllerBrowserTest
base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this));
controller.DismissInfoBarAndTakeActionOnSettings();
- MessageLoop::current()->QuitWhenIdle();
+ base::MessageLoop::current()->QuitWhenIdle();
}
bool policy_value_;
@@ -2022,7 +2022,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,
@@ -2046,7 +2046,7 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishVideoTest,
this));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
}
INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance,

Powered by Google App Engine
This is Rietveld 408576698