| 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 ebea6d03bdeb0d0d3ddd7ce54cd4f19f8e63d52c..fbf29dfaa83e1444cb8cc7f633798ddf5910b6a2 100644
|
| --- a/chrome/browser/extensions/api/identity/identity_apitest.cc
|
| +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
|
| @@ -447,8 +447,8 @@ class MockQueuedMintRequest : public IdentityMintRequestQueue::Request {
|
| MOCK_METHOD1(StartMintToken, void(IdentityMintRequestQueue::MintType));
|
| };
|
|
|
| -AccountIds CreateIds(std::string email, std::string obfid) {
|
| - AccountIds ids;
|
| +gaia::AccountIds CreateIds(std::string email, std::string obfid) {
|
| + gaia::AccountIds ids;
|
| ids.account_key = email;
|
| ids.email = email;
|
| ids.gaia = obfid;
|
| @@ -462,7 +462,7 @@ class IdentityGetAccountsFunctionTest : public ExtensionBrowserTest {
|
| }
|
|
|
| protected:
|
| - void SetAccountState(AccountIds ids, bool is_signed_in) {
|
| + void SetAccountState(gaia::AccountIds ids, bool is_signed_in) {
|
| IdentityAPI::GetFactoryInstance()->Get(profile())->SetAccountStateForTest(
|
| ids, is_signed_in);
|
| }
|
| @@ -707,7 +707,7 @@ class GetAuthTokenFunctionTest : public AsyncExtensionBrowserTest {
|
| #endif
|
| }
|
|
|
| - void SetAccountState(AccountIds ids, bool is_signed_in) {
|
| + void SetAccountState(gaia::AccountIds ids, bool is_signed_in) {
|
| IdentityAPI::GetFactoryInstance()->Get(profile())->SetAccountStateForTest(
|
| ids, is_signed_in);
|
| }
|
| @@ -889,9 +889,6 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
|
| EXPECT_TRUE(StartsWithASCII(error, errors::kAuthFailure, false));
|
| EXPECT_FALSE(func->login_ui_shown());
|
| EXPECT_FALSE(func->scope_ui_shown());
|
| -
|
| - EXPECT_EQ(GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS,
|
| - id_api()->GetAuthStatusForTest().state());
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
|
| @@ -907,9 +904,6 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
|
| EXPECT_TRUE(StartsWithASCII(error, errors::kAuthFailure, false));
|
| EXPECT_FALSE(func->login_ui_shown());
|
| EXPECT_FALSE(func->scope_ui_shown());
|
| -
|
| - EXPECT_EQ(GoogleServiceAuthError::AuthErrorNone(),
|
| - id_api()->GetAuthStatusForTest());
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest,
|
|
|