Disable environment variable override of API keys on official builds.

google_apis/google_api_keys.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/google_api_keys.h"
 
 // If you add more includes to this list, you also need to add them to
 // google_api_keys_unittest.cc.
 
 #include <stddef.h>
@@ skipping 228 matching lines @@
     return SPDY_PROXY_AUTH_VALUE;
 #else
     return std::string();
 #endif
   }
 
  private:
   // Gets a value for a key.  In priority order, this will be the value
   // provided via a command-line switch, the value provided via an
   // environment variable, or finally a value baked into the build.
-  // |command_line_switch| may be NULL.
+  // |command_line_switch| may be NULL. Official Google Chrome builds will not
+  // use the value provided by an environment variable.
   static std::string CalculateKeyValue(const char* baked_in_value,
                                        const char* environment_variable_name,
                                        const char* command_line_switch,
                                        const std::string& default_if_unset,
                                        base::Environment* environment,
                                        base::CommandLine* command_line) {
     std::string key_value = baked_in_value;
     std::string temp;
 #if defined(OS_MACOSX)
     // macOS and iOS can also override the API key with a value from the
     // Info.plist.
     temp = ::google_apis::GetAPIKeyFromInfoPlist(environment_variable_name);
     if (!temp.empty()) {
       key_value = temp;
       VLOG(1) << "Overriding API key " << environment_variable_name
               << " with value " << key_value << " from Info.plist.";
     }
 #endif
+
+#if !defined(GOOGLE_CHROME_BUILD)
+    // Don't allow using the environment to override API keys for official
+    // Google Chrome builds. There have been reports of mangled environments
+    // affecting users (crbug.com/710575).
     if (environment->GetVar(environment_variable_name, &temp)) {
       key_value = temp;
       VLOG(1) << "Overriding API key " << environment_variable_name
               << " with value " << key_value << " from environment variable.";
     }
+#endif
 
     if (command_line_switch && command_line->HasSwitch(command_line_switch)) {
       key_value = command_line->GetSwitchValueASCII(command_line_switch);
       VLOG(1) << "Overriding API key " << environment_variable_name
               << " with value " << key_value << " from command-line switch.";
     }
 
     if (key_value == DUMMY_API_TOKEN) {
 #if defined(GOOGLE_CHROME_BUILD)
       // No key should be unset in an official build except the
@@ skipping 82 matching lines @@
 
 bool IsGoogleChromeAPIKeyUsed() {
 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_OFFICIAL_GOOGLE_API_KEYS)
   return true;
 #else
   return false;
 #endif
 }
 
 }  // namespace google_apis