chrome/browser/extensions/api/identity/identity_apitest.cc - Issue 144013009: Extensions: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAccountId.

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/extensions/api/identity/identity_apitest.cc

Issue 144013009: Extensions: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAccountId. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/extensions/api/identity/identity_api.cc ('k') | chrome/browser/extensions/api/identity/identity_signin_flow.cc » ('j') | chrome/browser/extensions/api/push_messaging/push_messaging_api.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/identity/identity_apitest.cc

diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc

index 1dbcb13b8439061d06b16667ae17c43062804a39..1f089aa2e17b80b270e3c08d1f6f692a19c4f45b 100644

--- a/chrome/browser/extensions/api/identity/identity_apitest.cc

+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc

@@ -14,8 +14,8 @@

#include "chrome/browser/extensions/extension_function_test_utils.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/profiles/profile.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/browser/ui/browser.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/common/chrome_switches.h"

@@ -371,9 +371,9 @@ class GetAuthTokenFunctionTest : public AsyncExtensionBrowserTest {

}

const std::string GetPrimaryAccountId() {

- ProfileOAuth2TokenService* token_service =

- ProfileOAuth2TokenServiceFactory::GetForProfile(browser()->profile());

- return token_service->GetPrimaryAccountId();

+ SigninManagerBase* signin_manager =

+ SigninManagerFactory::GetForProfile(browser()->profile());

+ return signin_manager->GetAuthenticatedAccountId();

}

void SetCachedToken(const IdentityTokenCacheValue& token_data) {