Make callers of CommandLine use it via the base:: namespace.

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 63 matching lines @@
 #define GOOGLE_DEFAULT_CLIENT_SECRET ""
 #endif
 
 namespace google_apis {
 
 // This is used as a lazy instance to determine keys once and cache them.
 class APIKeyCache {
  public:
   APIKeyCache() {
     scoped_ptr<base::Environment> environment(base::Environment::Create());
-    CommandLine* command_line = CommandLine::ForCurrentProcess();
+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
     api_key_ = CalculateKeyValue(GOOGLE_API_KEY,
                                  STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY),
                                  NULL,
                                  std::string(),
                                  environment.get(),
                                  command_line);
 
     api_key_safesites_ =
         CalculateKeyValue(GOOGLE_API_KEY_SAFESITES,
@@ skipping 109 matching lines @@
  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.
   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,
-                                       CommandLine* command_line) {
+                                       base::CommandLine* command_line) {
     std::string key_value = baked_in_value;
     std::string temp;
     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.";
     }
 
     if (command_line_switch && command_line->HasSwitch(command_line_switch)) {
       key_value = command_line->GetSwitchValueASCII(command_line_switch);
@@ skipping 67 matching lines @@
 
 bool IsGoogleChromeAPIKeyUsed() {
 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_OFFICIAL_GOOGLE_API_KEYS)
   return true;
 #else
   return false;
 #endif
 }
 
 }  // namespace google_apis