Remove Remoting API Key

Chromoting host no longer needs API Key, so the key can be removed.

Change-Id: I0960660ce2ddd5f4352ab691468d7c3881530d8d
Reviewed-on: https://chromium-review.googlesource.com/540035Reviewed-by: Roger Tawa <rogerta@chromium.org>
Reviewed-by: Joe Downing <joedow@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#480940}

google_apis/google_api_keys.cc

@@ -34,10 +34,6 @@
 #define GOOGLE_API_KEY DUMMY_API_TOKEN
 #endif
 
-#if !defined(GOOGLE_API_KEY_REMOTING)
-#define GOOGLE_API_KEY_REMOTING DUMMY_API_TOKEN
-#endif
-
 #if !defined(GOOGLE_CLIENT_ID_MAIN)
 #define GOOGLE_CLIENT_ID_MAIN DUMMY_API_TOKEN
 #endif
@@ -115,14 +111,6 @@ class APIKeyCache {
     api_key_non_stable_ = api_key_;
 #endif
 
-    api_key_remoting_ =
-        CalculateKeyValue(GOOGLE_API_KEY_REMOTING,
-                          STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY_REMOTING),
-                          NULL,
-                          std::string(),
-                          environment.get(),
-                          command_line);
-
     std::string default_client_id =
         CalculateKeyValue(GOOGLE_DEFAULT_CLIENT_ID,
                           STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID),
@@ -210,7 +198,6 @@ class APIKeyCache {
   void set_api_key(const std::string& api_key) { api_key_ = api_key; }
 #endif
   std::string api_key_non_stable() const { return api_key_non_stable_; }
-  std::string api_key_remoting() const { return api_key_remoting_; }
 
   std::string GetClientID(OAuth2Client client) const {
     DCHECK_LT(client, CLIENT_NUM_ITEMS);
@@ -299,7 +286,6 @@ class APIKeyCache {
 
   std::string api_key_;
   std::string api_key_non_stable_;
-  std::string api_key_remoting_;
   std::string client_ids_[CLIENT_NUM_ITEMS];
   std::string client_secrets_[CLIENT_NUM_ITEMS];
 };
@@ -330,10 +316,6 @@ std::string GetNonStableAPIKey() {
   return g_api_key_cache.Get().api_key_non_stable();
 }
 
-std::string GetRemotingAPIKey() {
-  return g_api_key_cache.Get().api_key_remoting();
-}
-
 #if defined(OS_IOS)
 void SetAPIKey(const std::string& api_key) {
   g_api_key_cache.Get().set_api_key(api_key);

google_apis/google_api_keys.h

@@ -71,8 +71,6 @@ std::string GetAPIKey();
 // Non-stable channels may have a different Google API key.
 std::string GetNonStableAPIKey();
 
-std::string GetRemotingAPIKey();
-
 #if defined(OS_IOS)
 // Sets the API key. This should be called as early as possible before this
 // API key is even accessed.

google_apis/google_api_keys.py

@@ -75,11 +75,6 @@ def GetAPIKeyPhysicalWebTest():
   return _GetToken('GOOGLE_API_KEY_PHYSICAL_WEB_TEST')
 
 
-def GetAPIKeyRemoting():
-  """Returns the simple API key."""
-  return _GetToken('GOOGLE_API_KEY_REMOTING')
-
-
 def GetClientID(client_name):
   """Returns the OAuth 2.0 client ID for the client of the given name."""
   return _GetToken('GOOGLE_CLIENT_ID_%s' % client_name)
@@ -92,7 +87,6 @@ def GetClientSecret(client_name):
 
 if __name__ == "__main__":
   print 'GOOGLE_API_KEY=%s' % GetAPIKey()
-  print 'GOOGLE_API_KEY_REMOTING=%s' % GetAPIKeyRemoting()
   print 'GOOGLE_CLIENT_ID_MAIN=%s' % GetClientID('MAIN')
   print 'GOOGLE_CLIENT_SECRET_MAIN=%s' % GetClientSecret('MAIN')
   print 'GOOGLE_CLIENT_ID_CLOUD_PRINT=%s' % GetClientID('CLOUD_PRINT')

remoting/webapp/build-webapp.py

@@ -293,7 +293,6 @@ def buildWebApp(buildtype, version, destination, zip_path,
   # For overriding the client ID/secret via env vars, see google_api_keys.py.
   apiClientId = google_api_keys.GetClientID('REMOTING')
   apiClientSecret = google_api_keys.GetClientSecret('REMOTING')
-  apiKey = google_api_keys.GetAPIKeyRemoting()
 
   apiClientIdV2 = os.environ.get(
       'REMOTING_IDENTITY_API_CLIENT_ID',
@@ -301,7 +300,6 @@ def buildWebApp(buildtype, version, destination, zip_path,
 
   replaceString(destination, 'API_CLIENT_ID', apiClientId)
   replaceString(destination, 'API_CLIENT_SECRET', apiClientSecret)
-  replaceString(destination, 'API_KEY', apiKey)
 
   # Use a fixed key in the app manifest. For dev builds, this ensures that the
   # app can be run directly from the output directory. For official CRD builds,