diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
| commit | 69d7f89d6a93e0fbce451960287066195c6d4ea0 (patch) | |
| tree | 51c8c1f971d39d652ec38ed76070539bb33e85c7 /google_apis/google_api_keys.cc | |
| parent | e3748a79b523a8d365d4a33ef986eebb4186fa78 (diff) | |
| download | chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.zip chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.gz chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.bz2 | |
Revert "Rewrite std::string("") to std::string(), Linux edition."
This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6.
Revert "Fix build after r193020."
This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a.
Revert "Really fix build after r193020."
This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/google_api_keys.cc')
| -rw-r--r-- | google_apis/google_api_keys.cc | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc index c05435e..cd13b9e 100644 --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc @@ -98,25 +98,22 @@ class APIKeyCache { api_key_ = CalculateKeyValue(GOOGLE_API_KEY, STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY), - NULL, - std::string(), + NULL, "", environment.get(), command_line); - std::string default_client_id = - CalculateKeyValue(GOOGLE_DEFAULT_CLIENT_ID, - STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), - NULL, - std::string(), - environment.get(), - command_line); - std::string default_client_secret = - CalculateKeyValue(GOOGLE_DEFAULT_CLIENT_SECRET, - STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), - NULL, - std::string(), - environment.get(), - command_line); + std::string default_client_id = CalculateKeyValue( + GOOGLE_DEFAULT_CLIENT_ID, + STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), + NULL, "", + environment.get(), + command_line); + std::string default_client_secret = CalculateKeyValue( + GOOGLE_DEFAULT_CLIENT_SECRET, + STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), + NULL, "", + environment.get(), + command_line); // We currently only allow overriding the baked-in values for the // default OAuth2 client ID and secret using a command-line |