diff options
| author | treib <treib@chromium.org> | 2016-02-26 01:36:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-26 09:37:51 +0000 |
| commit | f8ac6cd226a73b270abb0386c26f3f94f701b374 (patch) | |
| tree | 4a76f51b98cc537ec9bff1d4cd09ef6181eb77a6 /google_apis | |
| parent | 86e62e260857d13e00afb7ea816aadb2b3246987 (diff) | |
| download | chromium_src-f8ac6cd226a73b270abb0386c26f3f94f701b374.zip chromium_src-f8ac6cd226a73b270abb0386c26f3f94f701b374.tar.gz chromium_src-f8ac6cd226a73b270abb0386c26f3f94f701b374.tar.bz2 | |
Remove special API key for SafeSites
We're using the regular Chrome key now
BUG=none
Review URL: https://codereview.chromium.org/1731313002
Cr-Commit-Position: refs/heads/master@{#377860}
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/google_api_keys.cc | 18 | ||||
| -rw-r--r-- | google_apis/google_api_keys.h | 2 |
2 files changed, 0 insertions, 20 deletions
diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc index 4721575..b4727bb 100644 --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc @@ -29,10 +29,6 @@ #define GOOGLE_API_KEY DUMMY_API_TOKEN #endif -#if !defined(GOOGLE_API_KEY_SAFESITES) -#define GOOGLE_API_KEY_SAFESITES DUMMY_API_TOKEN -#endif - #if !defined(GOOGLE_API_KEY_REMOTING) #define GOOGLE_API_KEY_REMOTING DUMMY_API_TOKEN #endif @@ -100,14 +96,6 @@ class APIKeyCache { environment.get(), command_line); - api_key_safesites_ = - CalculateKeyValue(GOOGLE_API_KEY_SAFESITES, - STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY_SAFESITES), - NULL, - std::string(), - environment.get(), - command_line); - api_key_remoting_ = CalculateKeyValue(GOOGLE_API_KEY_REMOTING, STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY_REMOTING), @@ -199,7 +187,6 @@ class APIKeyCache { } std::string api_key() const { return api_key_; } - std::string api_key_safesites() const { return api_key_safesites_; } std::string api_key_remoting() const { return api_key_remoting_; } std::string GetClientID(OAuth2Client client) const { @@ -266,7 +253,6 @@ class APIKeyCache { } std::string api_key_; - std::string api_key_safesites_; std::string api_key_remoting_; std::string client_ids_[CLIENT_NUM_ITEMS]; std::string client_secrets_[CLIENT_NUM_ITEMS]; @@ -294,10 +280,6 @@ std::string GetAPIKey() { return g_api_key_cache.Get().api_key(); } -std::string GetSafeSitesAPIKey() { - return g_api_key_cache.Get().api_key_safesites(); -} - std::string GetRemotingAPIKey() { return g_api_key_cache.Get().api_key_remoting(); } diff --git a/google_apis/google_api_keys.h b/google_apis/google_api_keys.h index 56f91c3..be046f1 100644 --- a/google_apis/google_api_keys.h +++ b/google_apis/google_api_keys.h @@ -68,8 +68,6 @@ bool HasKeysConfigured(); // e.g. URL-escaped if you use it in a URL. std::string GetAPIKey(); -std::string GetSafeSitesAPIKey(); - std::string GetRemotingAPIKey(); // Represents the different sets of client IDs and secrets in use. |