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 0850b45a6cc83c8a00e241bfb887243d1fea39f9..e3323231fa85c8ff1eac8d88f7c6cd5a150894d5 100644 |
--- a/chrome/browser/extensions/api/identity/identity_apitest.cc |
+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc |
@@ -801,7 +801,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, |
func->set_mint_token_result(TestOAuth2MintTokenFlow::MINT_TOKEN_FAILURE); |
std::string error = |
utils::RunFunctionAndReturnError(func.get(), "[{}]", browser()); |
- EXPECT_TRUE(base::StartsWithASCII(error, errors::kAuthFailure, false)); |
+ EXPECT_TRUE(base::StartsWith(error, errors::kAuthFailure, |
+ base::CompareCase::INSENSITIVE_ASCII)); |
EXPECT_FALSE(func->login_ui_shown()); |
EXPECT_FALSE(func->scope_ui_shown()); |
} |
@@ -814,7 +815,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, |
func->set_login_access_token_result(false); |
std::string error = utils::RunFunctionAndReturnError( |
func.get(), "[{}]", browser()); |
- EXPECT_TRUE(base::StartsWithASCII(error, errors::kAuthFailure, false)); |
+ EXPECT_TRUE(base::StartsWith(error, errors::kAuthFailure, |
+ base::CompareCase::INSENSITIVE_ASCII)); |
} |
IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, |
@@ -843,7 +845,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, |
TestOAuth2MintTokenFlow::MINT_TOKEN_BAD_CREDENTIALS); |
std::string error = |
utils::RunFunctionAndReturnError(func.get(), "[{}]", browser()); |
- EXPECT_TRUE(base::StartsWithASCII(error, errors::kAuthFailure, false)); |
+ EXPECT_TRUE(base::StartsWith(error, errors::kAuthFailure, |
+ base::CompareCase::INSENSITIVE_ASCII)); |
EXPECT_FALSE(func->login_ui_shown()); |
EXPECT_FALSE(func->scope_ui_shown()); |
} |
@@ -857,7 +860,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, |
TestOAuth2MintTokenFlow::MINT_TOKEN_SERVICE_ERROR); |
std::string error = |
utils::RunFunctionAndReturnError(func.get(), "[{}]", browser()); |
- EXPECT_TRUE(base::StartsWithASCII(error, errors::kAuthFailure, false)); |
+ EXPECT_TRUE(base::StartsWith(error, errors::kAuthFailure, |
+ base::CompareCase::INSENSITIVE_ASCII)); |
EXPECT_FALSE(func->login_ui_shown()); |
EXPECT_FALSE(func->scope_ui_shown()); |
} |
@@ -959,7 +963,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, |
func->set_mint_token_result(TestOAuth2MintTokenFlow::MINT_TOKEN_FAILURE); |
std::string error = utils::RunFunctionAndReturnError( |
func.get(), "[{\"interactive\": true}]", browser()); |
- EXPECT_TRUE(base::StartsWithASCII(error, errors::kAuthFailure, false)); |
+ EXPECT_TRUE(base::StartsWith(error, errors::kAuthFailure, |
+ base::CompareCase::INSENSITIVE_ASCII)); |
EXPECT_TRUE(func->login_ui_shown()); |
EXPECT_FALSE(func->scope_ui_shown()); |
} |
@@ -972,7 +977,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, |
func->set_login_access_token_result(false); |
std::string error = utils::RunFunctionAndReturnError( |
func.get(), "[{\"interactive\": true}]", browser()); |
- EXPECT_TRUE(base::StartsWithASCII(error, errors::kAuthFailure, false)); |
+ EXPECT_TRUE(base::StartsWith(error, errors::kAuthFailure, |
+ base::CompareCase::INSENSITIVE_ASCII)); |
EXPECT_TRUE(func->login_ui_shown()); |
EXPECT_FALSE(func->scope_ui_shown()); |
} |
@@ -1076,7 +1082,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, |
func->set_scope_ui_failure(GaiaWebAuthFlow::SERVICE_AUTH_ERROR); |
std::string error = utils::RunFunctionAndReturnError( |
func.get(), "[{\"interactive\": true}]", browser()); |
- EXPECT_TRUE(base::StartsWithASCII(error, errors::kAuthFailure, false)); |
+ EXPECT_TRUE(base::StartsWith(error, errors::kAuthFailure, |
+ base::CompareCase::INSENSITIVE_ASCII)); |
EXPECT_FALSE(func->login_ui_shown()); |
EXPECT_TRUE(func->scope_ui_shown()); |
} |
@@ -1498,7 +1505,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, |
func->set_mint_token_result(TestOAuth2MintTokenFlow::MINT_TOKEN_FAILURE); |
std::string error = utils::RunFunctionAndReturnError( |
func.get(), "[{\"account\": { \"id\": \"2\" } }]", browser()); |
- EXPECT_TRUE(base::StartsWithASCII(error, errors::kAuthFailure, false)); |
+ EXPECT_TRUE(base::StartsWith(error, errors::kAuthFailure, |
+ base::CompareCase::INSENSITIVE_ASCII)); |
EXPECT_FALSE(func->login_ui_shown()); |
EXPECT_FALSE(func->scope_ui_shown()); |
} |
@@ -1515,7 +1523,8 @@ IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, |
func->set_login_access_token_result(false); |
std::string error = utils::RunFunctionAndReturnError( |
func.get(), "[{\"account\": { \"id\": \"2\" } }]", browser()); |
- EXPECT_TRUE(base::StartsWithASCII(error, errors::kAuthFailure, false)); |
+ EXPECT_TRUE(base::StartsWith(error, errors::kAuthFailure, |
+ base::CompareCase::INSENSITIVE_ASCII)); |
} |
IN_PROC_BROWSER_TEST_F(GetAuthTokenFunctionTest, |