settings: Make DeviceOAuth2TokenServiceFactory::Get() async

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.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/device_cloud_policy_manager_chromeos.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 40 matching lines @@
 namespace policy {
 namespace {
 
 void CopyLockResult(base::RunLoop* loop,
                     EnterpriseInstallAttributes::LockResult* out,
                     EnterpriseInstallAttributes::LockResult result) {
   *out = result;
   loop->Quit();
 }
 
+void CopyTokenService(chromeos::DeviceOAuth2TokenService** out_token_service,
+                      chromeos::DeviceOAuth2TokenService* in_token_service) {
+  *out_token_service = in_token_service;
+}
+
 class DeviceCloudPolicyManagerChromeOSTest
     : public chromeos::DeviceSettingsTestBase {
  protected:
   DeviceCloudPolicyManagerChromeOSTest() : store_(NULL) {
     EXPECT_CALL(mock_statistics_provider_,
                 GetMachineStatistic(_, _))
         .WillRepeatedly(Return(false));
     EXPECT_CALL(mock_statistics_provider_,
                 GetMachineStatistic("serial_number", _))
         .WillRepeatedly(DoAll(SetArgumentPointee<1>(std::string("test_sn")),
@@ skipping 306 matching lines @@
 
     // Key installation, policy load and refresh token save.
     device_settings_test_helper_.set_policy_blob(loaded_blob_);
     owner_key_util_->SetPublicKeyFromPrivateKey(
         *device_policy_.GetNewSigningKey());
     ReloadDeviceSettings();
 
     if (done_)
       return;
 
-    chromeos::DeviceOAuth2TokenService* token_service =
-        chromeos::DeviceOAuth2TokenServiceFactory::Get();
+    chromeos::DeviceOAuth2TokenService* token_service = NULL;
+    chromeos::DeviceOAuth2TokenServiceFactory::Get(
+        base::Bind(&CopyTokenService, &token_service));
+    base::RunLoop().RunUntilIdle();

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

nit: How about having ASSERT_TRUE(token_service) here?

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

good idea. will do.

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

Done.

+
     // Process robot refresh token store.
     EXPECT_EQ(
         "refreshToken4Test",
         token_service->GetRefreshToken(token_service->GetRobotAccountId()));
   }
 
   bool is_auto_enrollment_;
 
   DeviceManagementStatus register_status_;
   em::DeviceManagementResponse register_response_;
@@ skipping 112 matching lines @@
 TEST_F(DeviceCloudPolicyManagerChromeOSEnrollmentTest, LoadError) {
   loaded_blob_.clear();
   RunTest();
   ExpectFailedEnrollment(EnrollmentStatus::STATUS_STORE_ERROR);
   EXPECT_EQ(CloudPolicyStore::STATUS_LOAD_ERROR,
             status_.store_status());
 }
 
 }  // namespace
 }  // namespace policy