Refactor ArcAndroidManagementChecker.

chrome/browser/chromeos/policy/android_management_client.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/android_management_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/callback_helpers.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 namespace em = enterprise_management;
 
 namespace policy {
@@ skipping 27 matching lines @@
     const base::Time& expiration_time) {
   DCHECK_EQ(token_request_.get(), request);
   token_request_.reset();
 
   CheckAndroidManagement(access_token);
 }
 
 void AndroidManagementClient::OnGetTokenFailure(
     const OAuth2TokenService::Request* request,
     const GoogleServiceAuthError& error) {
   DCHECK_EQ(token_request_.get(), request);

[Luis Héctor Chávez, 2016/10/24 22:36:03]

DCHECK(!callback_.is_null());

[hidehiko, 2016/10/25 07:22:42]

Done.

   token_request_.reset();
   LOG(ERROR) << "Token request failed: " << error.ToString();
 
-  callback_.Run(RESULT_ERROR);
-  callback_.Reset();
+  base::ResetAndReturn(&callback_).Run(RESULT_ERROR);
 }
 
 void AndroidManagementClient::RequestAccessToken() {
   DCHECK(!token_request_);
   // The user must be signed in already.
   DCHECK(token_service_->RefreshTokenIsAvailable(account_id_));
 
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaConstants::kDeviceManagementServiceOAuth);
   scopes.insert(GaiaConstants::kOAuthWrapBridgeUserInfoScope);
@@ skipping 10 matching lines @@
   request_job_->GetRequest()->mutable_check_android_management_request();
 
   request_job_->Start(
       base::Bind(&AndroidManagementClient::OnAndroidManagementChecked,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void AndroidManagementClient::OnAndroidManagementChecked(
     DeviceManagementStatus status,
     int net_error,
     const em::DeviceManagementResponse& response) {

[Luis Héctor Chávez, 2016/10/24 22:36:03]

DCHECK(!callback_.is_null());

[hidehiko, 2016/10/25 07:22:42]

Done.

   if (status == DM_STATUS_SUCCESS &&
       !response.has_check_android_management_response()) {
     LOG(WARNING) << "Invalid check android management response.";
     status = DM_STATUS_RESPONSE_DECODING_ERROR;
   }
 
   Result result;
   switch (status) {
     case DM_STATUS_SUCCESS:
       result = RESULT_UNMANAGED;
       break;
     case DM_STATUS_SERVICE_DEVICE_ID_CONFLICT:
       result = RESULT_MANAGED;
       break;
     default:
       result = RESULT_ERROR;
   }
 
   request_job_.reset();
-  callback_.Run(result);
-  callback_.Reset();
+  base::ResetAndReturn(&callback_).Run(result);
 }
 
 }  // namespace policy