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

Side by Side Diff: chrome/browser/chromeos/policy/consumer_enrollment_handler.cc

Issue 2033753002: Remove use of deprecated MessageLoop methods in chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: manual change Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/policy/consumer_enrollment_handler.h" 5 #include "chrome/browser/chromeos/policy/consumer_enrollment_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/single_thread_task_runner.h"
11 #include "base/threading/thread_task_runner_handle.h"
11 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/browser_process_platform_part.h" 13 #include "chrome/browser/browser_process_platform_part.h"
13 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" 14 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h"
14 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 15 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
15 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 16 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
16 #include "chrome/browser/chromeos/policy/consumer_management_stage.h" 17 #include "chrome/browser/chromeos/policy/consumer_management_stage.h"
17 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" 18 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
18 #include "chrome/browser/chromeos/policy/enrollment_config.h" 19 #include "chrome/browser/chromeos/policy/enrollment_config.h"
19 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h" 20 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
20 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 RemoveObserver(this); 58 RemoveObserver(this);
58 OnOwnerRefreshTokenAvailable(); 59 OnOwnerRefreshTokenAvailable();
59 } 60 }
60 } 61 }
61 62
62 void ConsumerEnrollmentHandler::OnGetTokenSuccess( 63 void ConsumerEnrollmentHandler::OnGetTokenSuccess(
63 const OAuth2TokenService::Request* request, 64 const OAuth2TokenService::Request* request,
64 const std::string& access_token, 65 const std::string& access_token,
65 const base::Time& expiration_time) { 66 const base::Time& expiration_time) {
66 DCHECK_EQ(token_request_.get(), request); 67 DCHECK_EQ(token_request_.get(), request);
67 base::MessageLoop::current()->DeleteSoon(FROM_HERE, token_request_.release()); 68 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE,
69 token_request_.release());
68 70
69 OnOwnerAccessTokenAvailable(access_token); 71 OnOwnerAccessTokenAvailable(access_token);
70 } 72 }
71 73
72 void ConsumerEnrollmentHandler::OnGetTokenFailure( 74 void ConsumerEnrollmentHandler::OnGetTokenFailure(
73 const OAuth2TokenService::Request* request, 75 const OAuth2TokenService::Request* request,
74 const GoogleServiceAuthError& error) { 76 const GoogleServiceAuthError& error) {
75 DCHECK_EQ(token_request_.get(), request); 77 DCHECK_EQ(token_request_.get(), request);
76 base::MessageLoop::current()->DeleteSoon(FROM_HERE, token_request_.release()); 78 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE,
79 token_request_.release());
77 80
78 LOG(ERROR) << "Failed to get the access token: " << error.ToString(); 81 LOG(ERROR) << "Failed to get the access token: " << error.ToString();
79 EndEnrollment(ConsumerManagementStage::EnrollmentGetTokenFailed()); 82 EndEnrollment(ConsumerManagementStage::EnrollmentGetTokenFailed());
80 } 83 }
81 84
82 void ConsumerEnrollmentHandler::ContinueEnrollmentProcess() { 85 void ConsumerEnrollmentHandler::ContinueEnrollmentProcess() {
83 // First, we need to ensure that the refresh token is available. 86 // First, we need to ensure that the refresh token is available.
84 ProfileOAuth2TokenService* token_service = 87 ProfileOAuth2TokenService* token_service =
85 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_); 88 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
86 if (token_service->RefreshTokenIsAvailable(gaia_account_id_)) { 89 if (token_service->RefreshTokenIsAvailable(gaia_account_id_)) {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 140
138 EndEnrollment(ConsumerManagementStage::EnrollmentSuccess()); 141 EndEnrollment(ConsumerManagementStage::EnrollmentSuccess());
139 } 142 }
140 143
141 void ConsumerEnrollmentHandler::EndEnrollment( 144 void ConsumerEnrollmentHandler::EndEnrollment(
142 const ConsumerManagementStage& stage) { 145 const ConsumerManagementStage& stage) {
143 consumer_management_service_->SetStage(stage); 146 consumer_management_service_->SetStage(stage);
144 } 147 }
145 148
146 } // namespace policy 149 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698