|
1 | 1 | diff --git a/google_apis/api_key_cache.cc b/google_apis/api_key_cache.cc
|
2 |
| -index e8bc9bb79704..38e5d2bd005f 100644 |
| 2 | +index 9af5930ae639..a37a12dc07ad 100644 |
3 | 3 | --- a/google_apis/api_key_cache.cc
|
4 | 4 | +++ b/google_apis/api_key_cache.cc
|
5 |
| -@@ -221,14 +221,14 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) { |
| 5 | +@@ -192,13 +192,13 @@ ApiKeyCache::ApiKeyCache(const DefaultApiKeys& default_api_keys) { |
6 | 6 |
|
7 | 7 | std::string default_client_id = CalculateKeyValue(
|
8 | 8 | default_api_keys.google_default_client_id,
|
9 |
| -- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), nullptr, |
10 |
| -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(), ::switches::kOAuth2ClientID, |
11 |
| - std::string(), environment.get(), command_line, gaia_config, |
| 9 | +- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr, std::string(), |
| 10 | ++ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID, std::string(), |
| 11 | + environment.get(), command_line, gaia_config, |
12 | 12 | default_api_keys.allow_override_via_environment,
|
13 | 13 | default_api_keys.allow_unset_values);
|
14 | 14 | std::string default_client_secret = CalculateKeyValue(
|
15 | 15 | default_api_keys.google_default_client_secret,
|
16 |
| - STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(), |
17 |
| -- nullptr, std::string(), environment.get(), command_line, gaia_config, |
18 |
| -+ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config, |
| 16 | +- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr, |
| 17 | ++ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret, |
| 18 | + std::string(), environment.get(), command_line, gaia_config, |
19 | 19 | default_api_keys.allow_override_via_environment,
|
20 | 20 | default_api_keys.allow_unset_values);
|
21 |
| - |
0 commit comments