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

chrome/browser/web_applications/web_app_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/web_applications/web_app_win.h"
 
 #include <shlobj.h>
 
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
@@ skipping 90 matching lines @@
                 sizeof(base::MD5Digest)) != 0;
 }
 
 // Returns true if |shortcut_file_name| matches profile |profile_path|, and has
 // an --app-id flag.
 bool IsAppShortcutForProfile(const base::FilePath& shortcut_file_name,
                              const base::FilePath& profile_path) {
   base::string16 cmd_line_string;
   if (base::win::ResolveShortcut(shortcut_file_name, NULL, &cmd_line_string)) {
     cmd_line_string = L"program " + cmd_line_string;
-    CommandLine shortcut_cmd_line = CommandLine::FromString(cmd_line_string);
+    base::CommandLine shortcut_cmd_line =
+        base::CommandLine::FromString(cmd_line_string);
     return shortcut_cmd_line.HasSwitch(switches::kProfileDirectory) &&
            shortcut_cmd_line.GetSwitchValuePath(switches::kProfileDirectory) ==
                profile_path.BaseName() &&
            shortcut_cmd_line.HasSwitch(switches::kAppId);
   }
 
   return false;
 }
 
 // Finds shortcuts in |shortcut_path| that match profile for |profile_path| and
@@ skipping 66 matching lines @@
 
   base::FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
     return false;
   }
 
   // Working directory.
   base::FilePath working_dir(chrome_exe.DirName());
 
-  CommandLine cmd_line(CommandLine::NO_PROGRAM);
+  base::CommandLine cmd_line(base::CommandLine::NO_PROGRAM);
   cmd_line = ShellIntegration::CommandLineArgsForLauncher(shortcut_info.url,
       shortcut_info.extension_id, shortcut_info.profile_path);
 
   // TODO(evan): we rely on the fact that command_line_string() is
   // properly quoted for a Windows command line.  The method on
-  // CommandLine should probably be renamed to better reflect that
+  // base::CommandLine should probably be renamed to better reflect that
   // fact.
   base::string16 wide_switches(cmd_line.GetCommandLineString());
 
   // Sanitize description
   base::string16 description = shortcut_info.description;
   if (description.length() >= MAX_PATH)
     description.resize(MAX_PATH - 1);
 
   // Generates app id from web app url and profile path.
   std::string app_name(web_app::GenerateApplicationNameFromInfo(shortcut_info));
@@ skipping 116 matching lines @@
     }
   }
 }
 
 void CreateIconAndSetRelaunchDetails(const base::FilePath& web_app_path,
                                      const base::FilePath& icon_file,
                                      const web_app::ShortcutInfo& shortcut_info,
                                      HWND hwnd) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
-  CommandLine command_line =
+  base::CommandLine command_line =
       ShellIntegration::CommandLineArgsForLauncher(shortcut_info.url,
                                                    shortcut_info.extension_id,
                                                    shortcut_info.profile_path);
 
   base::FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
     return;
   }
   command_line.SetProgram(chrome_exe);
@@ skipping 56 matching lines @@
   return true;
 }
 
 // Gets the full command line for calling the shim binary. This will include a
 // placeholder "%1" argument, which Windows will substitute with the filename
 // chosen by the user.
 base::CommandLine GetAppShimCommandLine(const base::FilePath& app_shim_path,
                                         const std::string& extension_id,
                                         const base::FilePath& profile_path) {
   // Get the command-line to pass to the shim (e.g., "chrome.exe --app-id=...").
-  CommandLine chrome_cmd_line = ShellIntegration::CommandLineArgsForLauncher(
-      GURL(), extension_id, profile_path);
+  base::CommandLine chrome_cmd_line =
+      ShellIntegration::CommandLineArgsForLauncher(GURL(), extension_id,
+                                                   profile_path);
   chrome_cmd_line.AppendArg("%1");
 
   // Get the command-line for calling the shim (e.g.,
   // "app_shim [--chrome-sxs] -- --app-id=...").
-  CommandLine shim_cmd_line(app_shim_path);
+  base::CommandLine shim_cmd_line(app_shim_path);
   // If this is a canary build, launch the shim in canary mode.
   if (InstallUtil::IsChromeSxSProcess())
     shim_cmd_line.AppendSwitch(installer::switches::kChromeSxS);
   // Ensure all subsequent switches are treated as args to the shim.
   shim_cmd_line.AppendArg("--");
   for (size_t i = 1; i < chrome_cmd_line.argv().size(); ++i)
     shim_cmd_line.AppendArgNative(chrome_cmd_line.argv()[i]);
 
   return shim_cmd_line;
 }
@@ skipping 28 matching lines @@
   // will use for file associations with this application.
   base::string16 progid_base = L"chrome-";
   progid_base += base::UTF8ToUTF16(extension_id);
 
   // Create the app shim binary (see CreateAppShimBinary for rationale). Get the
   // command line for the shim.
   base::FilePath app_shim_path = web_app_path.Append(file_name);
   if (!CreateAppShimBinary(app_shim_path))
     return false;
 
-  CommandLine shim_cmd_line(
+  base::CommandLine shim_cmd_line(
       GetAppShimCommandLine(app_shim_path, extension_id, profile_path));
 
   // TODO(mgiuca): Get the file type name from the manifest, or generate a
   // default one. (If this is blank, Windows will generate one of the form
   // '<EXT> file'.)
   base::string16 file_type_name = L"";
 
   // TODO(mgiuca): Generate a new icon for this application's file associations
   // that looks like a page with the application icon inside.
   base::FilePath icon_file =
@@ skipping 277 matching lines @@
 
 }  // namespace internals
 
 void UpdateShortcutForTabContents(content::WebContents* web_contents) {
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(web_contents);
   worker->Run();
 }
 
 }  // namespace web_app