settings: Make DeviceOAuth2TokenServiceFactory::Get() async

chrome/browser/chromeos/login/kiosk_browsertest.cc

 // Copyright (c) 2013 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 "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 99 matching lines @@
   LOG(INFO) << "kiosk locked  = " << in_locked;
   *out_locked = in_locked;
   runner_quit_task.Run();
 }
 
 // Helper function for WaitForNetworkTimeOut.
 void OnNetworkWaitTimedOut(const base::Closure& runner_quit_task) {
   runner_quit_task.Run();
 }
 
+// Helper function for DeviceOAuth2TokenServiceFactory::Get().
+void CopyTokenService(DeviceOAuth2TokenService** out_token_service,
+                      DeviceOAuth2TokenService* in_token_service) {
+  *out_token_service = in_token_service;
+}
+
 }  // namespace
 
 // Fake NetworkChangeNotifier used to simulate network connectivity.
 class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
  public:
   FakeNetworkChangeNotifier() : connection_type_(CONNECTION_NONE) {}
 
   virtual ConnectionType GetCurrentConnectionType() const OVERRIDE {
     return connection_type_;
   }
@@ skipping 561 matching lines @@
         device_policy_test_helper_.device_policy()->GetBlob(),
         base::Bind(&KioskEnterpriseTest::StorePolicyCallback));
 
     DeviceSettingsService::Get()->Load();
 
     // Configure OAuth authentication.
     FakeGaia::AccessTokenInfo token_info;
     token_info.token = kTestAccessToken;
     token_info.email = kTestEnterpriseServiceAccountId;
     fake_gaia_.IssueOAuthToken(kTestRefreshToken, token_info);
-    DeviceOAuth2TokenServiceFactory::Get()
-        ->SetAndSaveRefreshToken(kTestRefreshToken);
+    DeviceOAuth2TokenService* token_service = NULL;
+    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.

+    token_service->SetAndSaveRefreshToken(kTestRefreshToken);
 
     KioskTest::SetUpOnMainThread();
   }
 
   static void StorePolicyCallback(bool result) {
     ASSERT_TRUE(result);
   }
 
   policy::DevicePolicyCrosTestHelper device_policy_test_helper_;
 
@@ skipping 48 matching lines @@
   window->GetBaseWindow()->Close();
   content::RunAllPendingInMessageLoop();
 }
 
 // Disabled due to failures; http://crbug.com/306611.
 INSTANTIATE_TEST_CASE_P(DISABLED_KioskEnterpriseTestInstantiation,
                         KioskEnterpriseTest,
                         testing::Bool());
 
 }  // namespace chromeos