WIP - command line experiment

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 "base/command_line.h"
 #include "base/environment.h"
@@ skipping 167 matching lines @@
                                        base::Environment* environment,
                                        CommandLine* command_line) {
     std::string key_value = baked_in_value;
     std::string temp;
     if (environment->GetVar(environment_variable_name, &temp)) {
       key_value = temp;
       LOG(INFO) << "Overriding API key " << environment_variable_name
                 << " with value " << key_value << " from environment variable.";
     }
 
-    if (command_line_switch && command_line->HasSwitch(command_line_switch)) {
+    if (command_line_switch &&
+        command_line->HasStringSwitch(command_line_switch)) {
       key_value = command_line->GetSwitchValueASCII(command_line_switch);
       LOG(INFO) << "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
       // GOOGLE_DEFAULT_* keys.  The default keys don't trigger this
       // check as their "unset" value is not DUMMY_API_TOKEN.
@@ skipping 41 matching lines @@
 
 std::string GetOAuth2ClientID(OAuth2Client client) {
   return g_api_key_cache.Get().GetClientID(client);
 }
 
 std::string GetOAuth2ClientSecret(OAuth2Client client) {
   return g_api_key_cache.Get().GetClientSecret(client);
 }
 
 }  // namespace google_apis