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

chrome/browser/shell_integration_win.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 "chrome/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shlwapi.h>
 #include <shobjidl.h>
 #include <propkey.h>  // Needs to come after shobjidl.h.
@@ skipping 73 matching lines @@
 
 base::string16 GetAppListAppName() {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   base::string16 app_name(dist->GetBaseAppId());
   app_name.append(kAppListAppNameSuffix);
   return app_name;
 }
 
 // Gets expected app id for given Chrome (based on |command_line| and
 // |is_per_user_install|).
-base::string16 GetExpectedAppId(const CommandLine& command_line,
+base::string16 GetExpectedAppId(const base::CommandLine& command_line,
                                 bool is_per_user_install) {
   base::FilePath user_data_dir;
   if (command_line.HasSwitch(switches::kUserDataDir))
     user_data_dir = command_line.GetSwitchValuePath(switches::kUserDataDir);
   else
     chrome::GetDefaultUserDataDirectory(&user_data_dir);
   // Adjust with any policy that overrides any other way to set the path.
   policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
   DCHECK(!user_data_dir.empty());
 
@@ skipping 349 matching lines @@
   base::string16 arguments;
   base::win::ScopedPropVariant propvariant;
   for (base::FilePath shortcut = shortcuts_enum.Next(); !shortcut.empty();
        shortcut = shortcuts_enum.Next()) {
     // TODO(gab): Use ProgramCompare instead of comparing FilePaths below once
     // it is fixed to work with FilePaths with spaces.
     if (!base::win::ResolveShortcut(shortcut, &target_path, &arguments) ||
         chrome_exe != target_path) {
       continue;
     }
-    CommandLine command_line(CommandLine::FromString(base::StringPrintf(
-        L"\"%ls\" %ls", target_path.value().c_str(), arguments.c_str())));
+    base::CommandLine command_line(
+        base::CommandLine::FromString(base::StringPrintf(
+            L"\"%ls\" %ls", target_path.value().c_str(), arguments.c_str())));
 
     // Get the expected AppId for this Chrome shortcut.
     base::string16 expected_app_id(
         GetExpectedAppId(command_line, is_per_user_install));
     if (expected_app_id.empty())
       continue;
 
     // Load the shortcut.
     base::win::ScopedComPtr<IShellLink> shell_link;
     base::win::ScopedComPtr<IPersistFile> persist_file;
@@ skipping 99 matching lines @@
     }
 
     shortcut = shortcut.Append(shortcut_name).Append(shortcut_name +
                                                      installer::kLnkExt);
     if (base::PathExists(shortcut))
       return shortcut;
   }
 
   return base::FilePath();
 }