settings: Make DeviceOAuth2TokenServiceFactory::Get() async

chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc

 // Copyright (c) 2012 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/enrollment_handler_chromeos.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 143 matching lines @@
 
 void EnrollmentHandlerChromeOS::OnStoreLoaded(CloudPolicyStore* store) {
   DCHECK_EQ(store_, store);
 
   if (enrollment_step_ == STEP_LOADING_STORE) {
     // If the |store_| wasn't initialized when StartEnrollment() was
     // called, then AttemptRegistration() bails silently.  This gets
     // registration rolling again after the store finishes loading.
     AttemptRegistration();
   } else if (enrollment_step_ == STEP_STORE_POLICY) {
-    // Store the robot API auth refresh token.
-    // Currently optional, so always return success.
-    chromeos::DeviceOAuth2TokenService* token_service =
-        chromeos::DeviceOAuth2TokenServiceFactory::Get();
-    if (token_service && !robot_refresh_token_.empty()) {
-      token_service->SetAndSaveRefreshToken(robot_refresh_token_);
-
-    }
-    ReportResult(EnrollmentStatus::ForStatus(EnrollmentStatus::STATUS_SUCCESS));
+    chromeos::DeviceOAuth2TokenServiceFactory::Get(
+        base::Bind(&EnrollmentHandlerChromeOS::DidGetTokenService,
+                   weak_factory_.GetWeakPtr()));

[pneubeck (no reviews), 2013/10/22 09:05:03]

it needs some reading of the code to see whether it is safe to reuse
weak_factory_ here, because there are InvalidateWeakPtrs() calls.

Alternatively, add another factory and name them according to their usage:
weak_factory_for_lock_device_
weak_factory_for_get_token_service_

[satorux1, 2013/10/22 09:56:43]

good point. will take another look tomorrow.

[satorux1, 2013/10/23 06:35:44]

Took a look. It wasn't clear if it's safe to use the weak ptr factory here. I've
created a separate weak ptr factory for this as you suggested.

   }
 }
 
+void EnrollmentHandlerChromeOS::DidGetTokenService(
+    chromeos::DeviceOAuth2TokenService* token_service) {
+  // Store the robot API auth refresh token.
+  // Currently optional, so always return success.
+  if (token_service && !robot_refresh_token_.empty()) {
+    token_service->SetAndSaveRefreshToken(robot_refresh_token_);
+

[hashimoto, 2013/10/22 08:49:51]

nit: No need to have a blank line here?

[pneubeck (no reviews), 2013/10/22 09:05:03]

nit: remove { } and empty line

[satorux1, 2013/10/22 09:56:43]

Will fix. 

[satorux1, 2013/10/22 09:56:43]

will fix.

[satorux1, 2013/10/23 06:35:44]

Done.

+  }
+  ReportResult(EnrollmentStatus::ForStatus(EnrollmentStatus::STATUS_SUCCESS));
+}
+
 void EnrollmentHandlerChromeOS::OnStoreError(CloudPolicyStore* store) {
   DCHECK_EQ(store_, store);
   ReportResult(EnrollmentStatus::ForStoreError(store_->status(),
                                                store_->validation_status()));
 }
 
 void EnrollmentHandlerChromeOS::AttemptRegistration() {
   CHECK_EQ(STEP_LOADING_STORE, enrollment_step_);
   if (store_->is_initialized()) {
     enrollment_step_ = STEP_REGISTRATION;
@@ skipping 160 matching lines @@
                  << " " << status.client_status()
                  << " " << status.validation_status()
                  << " " << status.store_status();
   }
 
   if (!callback.is_null())
     callback.Run(status);
 }
 
 }  // namespace policy