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

Unified Diff: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

Issue 34523003: settings: Make DeviceOAuth2TokenServiceFactory::Get() async (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index 7ee648e6f01c8e4e663b42398be7572031b26106..4d321dc6515e5f44669d6d640150e435f5fa2fb7 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -58,6 +58,11 @@ void CopyLockResult(base::RunLoop* loop,
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:
@@ -384,8 +389,12 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
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();
+ ASSERT_TRUE(token_service);
+
// Process robot refresh token store.
EXPECT_EQ(
"refreshToken4Test",
« no previous file with comments | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | chrome/browser/chromeos/policy/enrollment_handler_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698