| Index: google_apis/gaia/oauth2_api_call_flow_unittest.cc
|
| diff --git a/google_apis/gaia/oauth2_api_call_flow_unittest.cc b/google_apis/gaia/oauth2_api_call_flow_unittest.cc
|
| index 137eaeb13e9db8215d0b23304ebbaaa44055901c..4e8692e3a4d2f7e2529c47efcf7db2a8eba1316a 100644
|
| --- a/google_apis/gaia/oauth2_api_call_flow_unittest.cc
|
| +++ b/google_apis/gaia/oauth2_api_call_flow_unittest.cc
|
| @@ -158,8 +158,8 @@ class OAuth2ApiCallFlowTest : public testing::Test {
|
| GURL url(CreateApiUrl());
|
| EXPECT_CALL(*flow_, CreateApiCallBody()).WillOnce(Return(body));
|
| EXPECT_CALL(*flow_, CreateApiCallUrl()).WillOnce(Return(url));
|
| - TestURLFetcher* url_fetcher = CreateURLFetcher(
|
| - url, succeeds, status, "");
|
| + TestURLFetcher* url_fetcher =
|
| + CreateURLFetcher(url, succeeds, status, std::string());
|
| EXPECT_CALL(factory_, CreateURLFetcher(_, url, _, _))
|
| .WillOnce(Return(url_fetcher));
|
| return url_fetcher;
|
| @@ -240,7 +240,7 @@ TEST_F(OAuth2ApiCallFlowTest, EmptyAccessTokenFirstApiCallSucceeds) {
|
| std::string at = "access_token";
|
| std::vector<std::string> scopes(CreateTestScopes());
|
|
|
| - CreateFlow(rt, "", scopes);
|
| + CreateFlow(rt, std::string(), scopes);
|
| SetupAccessTokenFetcher(rt, scopes);
|
| TestURLFetcher* url_fetcher = SetupApiCall(true, net::HTTP_OK);
|
| EXPECT_CALL(*flow_, ProcessApiCallSuccess(url_fetcher));
|
| @@ -256,7 +256,7 @@ TEST_F(OAuth2ApiCallFlowTest, EmptyAccessTokenApiCallFails) {
|
| std::string at = "access_token";
|
| std::vector<std::string> scopes(CreateTestScopes());
|
|
|
| - CreateFlow(rt, "", scopes);
|
| + CreateFlow(rt, std::string(), scopes);
|
| SetupAccessTokenFetcher(rt, scopes);
|
| TestURLFetcher* url_fetcher = SetupApiCall(false, net::HTTP_BAD_GATEWAY);
|
| EXPECT_CALL(*flow_, ProcessApiCallFailure(url_fetcher));
|
| @@ -272,7 +272,7 @@ TEST_F(OAuth2ApiCallFlowTest, EmptyAccessTokenNewTokenGenerationFails) {
|
| std::string at = "access_token";
|
| std::vector<std::string> scopes(CreateTestScopes());
|
|
|
| - CreateFlow(rt, "", scopes);
|
| + CreateFlow(rt, std::string(), scopes);
|
| SetupAccessTokenFetcher(rt, scopes);
|
| GoogleServiceAuthError error(
|
| GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
|
|
|