chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc - Issue 137553007: User cloud policy token forwarder: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAc

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 137553007: User cloud policy token forwarder: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 6 years, 10 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

« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.h » ('j') | chrome/browser/services/gcm/gcm_profile_service_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc

index 4fd6864e3a46d9dd53c8e59925b982c7876a5e5d..c82cb15550fca0ecfcf8d9425e4f14afe17170b2 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc

@@ -23,6 +23,8 @@

#include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h"

#include "chrome/browser/signin/profile_oauth2_token_service.h"

#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

+#include "chrome/browser/signin/signin_manager.h"

+#include "chrome/browser/signin/signin_manager_factory.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/test/base/testing_browser_process.h"

#include "chrome/test/base/testing_profile.h"

@@ -180,8 +182,12 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {

ProfileOAuth2TokenService* token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);

ASSERT_TRUE(token_service);

+ SigninManagerBase* signin_manager =

+ SigninManagerFactory::GetForProfile(profile_);

+ ASSERT_TRUE(signin_manager);

token_forwarder_.reset(

- new UserCloudPolicyTokenForwarder(manager_.get(), token_service));

+ new UserCloudPolicyTokenForwarder(manager_.get(), token_service,

+ signin_manager));

}

@@ -535,7 +541,10 @@ TEST_F(UserCloudPolicyManagerChromeOSTest, NonBlockingFirstFetch) {

static_cast<FakeProfileOAuth2TokenService*>(

ProfileOAuth2TokenServiceFactory::GetForProfile(profile_));

ASSERT_TRUE(token_service);

- const std::string account_id = token_service->GetPrimaryAccountId();

+ SigninManagerBase* signin_manager =

+ SigninManagerFactory::GetForProfile(profile_);

+ ASSERT_TRUE(signin_manager);

+ const std::string& account_id = signin_manager->GetAuthenticatedAccountId();

EXPECT_FALSE(token_service->RefreshTokenIsAvailable(account_id));

token_service->UpdateCredentials(account_id, "refresh_token");

EXPECT_TRUE(token_service->RefreshTokenIsAvailable(account_id));