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