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

Unified Diff: chrome/browser/policy/cloud/device_management_service_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/cloud/device_management_service_browsertest.cc
diff --git a/chrome/browser/policy/cloud/device_management_service_browsertest.cc b/chrome/browser/policy/cloud/device_management_service_browsertest.cc
index df27a8db15ab663f7756a95a04165821747303a8..f72b40dc907451b0e9c1de07d2e84e0473c0715c 100644
--- a/chrome/browser/policy/cloud/device_management_service_browsertest.cc
+++ b/chrome/browser/policy/cloud/device_management_service_browsertest.cc
@@ -107,12 +107,10 @@ class DeviceManagementServiceIntegrationTest
void PerformRegistration() {
ExpectRequest();
- EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS, _))
- .WillOnce(
- DoAll(Invoke(this,
- &DeviceManagementServiceIntegrationTest::RecordToken),
- InvokeWithoutArgs(MessageLoop::current(),
- &MessageLoop::Quit)));
+ EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS, _)).WillOnce(DoAll(
+ Invoke(this, &DeviceManagementServiceIntegrationTest::RecordToken),
+ InvokeWithoutArgs(base::MessageLoop::current(),
+ &base::MessageLoop::Quit)));
scoped_ptr<DeviceManagementRequestJob> job(
service_->CreateJob(DeviceManagementRequestJob::TYPE_REGISTRATION));
job->SetGaiaToken("gaia_auth_token");
@@ -121,7 +119,7 @@ class DeviceManagementServiceIntegrationTest
job->GetRequest()->mutable_register_request();
job->Start(base::Bind(&DeviceManagementServiceIntegrationTest::OnJobDone,
base::Unretained(this)));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
}
virtual void SetUpOnMainThread() OVERRIDE {
@@ -163,7 +161,8 @@ IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, PolicyFetch) {
ExpectRequest();
EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS, _))
- .WillOnce(InvokeWithoutArgs(MessageLoop::current(), &MessageLoop::Quit));
+ .WillOnce(InvokeWithoutArgs(base::MessageLoop::current(),
+ &base::MessageLoop::Quit));
scoped_ptr<DeviceManagementRequestJob> job(
service_->CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH));
job->SetDMToken(token_);
@@ -174,7 +173,7 @@ IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, PolicyFetch) {
request->add_request()->set_policy_type(dm_protocol::kChromeUserPolicyType);
job->Start(base::Bind(&DeviceManagementServiceIntegrationTest::OnJobDone,
base::Unretained(this)));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
}
IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, Unregistration) {
@@ -182,7 +181,8 @@ IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, Unregistration) {
ExpectRequest();
EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS, _))
- .WillOnce(InvokeWithoutArgs(MessageLoop::current(), &MessageLoop::Quit));
+ .WillOnce(InvokeWithoutArgs(base::MessageLoop::current(),
+ &base::MessageLoop::Quit));
scoped_ptr<DeviceManagementRequestJob> job(
service_->CreateJob(DeviceManagementRequestJob::TYPE_UNREGISTRATION));
job->SetDMToken(token_);
@@ -190,13 +190,14 @@ IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, Unregistration) {
job->GetRequest()->mutable_unregister_request();
job->Start(base::Bind(&DeviceManagementServiceIntegrationTest::OnJobDone,
base::Unretained(this)));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
}
IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, AutoEnrollment) {
ExpectRequest();
EXPECT_CALL(*this, OnJobDone(DM_STATUS_SUCCESS, _))
- .WillOnce(InvokeWithoutArgs(MessageLoop::current(), &MessageLoop::Quit));
+ .WillOnce(InvokeWithoutArgs(base::MessageLoop::current(),
+ &base::MessageLoop::Quit));
scoped_ptr<DeviceManagementRequestJob> job(
service_->CreateJob(DeviceManagementRequestJob::TYPE_AUTO_ENROLLMENT));
job->SetClientID("testid");
@@ -204,7 +205,7 @@ IN_PROC_BROWSER_TEST_P(DeviceManagementServiceIntegrationTest, AutoEnrollment) {
job->GetRequest()->mutable_auto_enrollment_request()->set_modulus(1);
job->Start(base::Bind(&DeviceManagementServiceIntegrationTest::OnJobDone,
base::Unretained(this)));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
}
INSTANTIATE_TEST_CASE_P(

Powered by Google App Engine
This is Rietveld 408576698