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

chrome/browser/ui/webui/help/help_handler.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/ui/webui/help/help_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 260 matching lines @@
       "channelChangePageDelayedChangeMessage",
       l10n_util::GetStringFUTF16(
           IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_DELAYED_CHANGE_MESSAGE,
           product_name));
   localized_strings->SetString(
       "channelChangePageUnstableMessage",
       l10n_util::GetStringFUTF16(
           IDS_ABOUT_PAGE_CHANNEL_CHANGE_PAGE_UNSTABLE_MESSAGE,
           product_name));
 
-  if (CommandLine::ForCurrentProcess()->
-      HasSwitch(chromeos::switches::kDisableNewChannelSwitcherUI)) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kDisableNewChannelSwitcherUI)) {
     localized_strings->SetBoolean("disableNewChannelSwitcherUI", true);
   }
 #endif
 
   base::string16 tos = l10n_util::GetStringFUTF16(
       IDS_ABOUT_TERMS_OF_SERVICE, base::UTF8ToUTF16(chrome::kChromeUITermsURL));
   localized_strings->SetString("productTOS", tos);
 
   localized_strings->SetString("webkitVersion", content::GetWebKitVersion());
 
   localized_strings->SetString("jsEngine", "V8");
   localized_strings->SetString("jsEngineVersion", v8::V8::GetVersion());
 
   localized_strings->SetString("userAgentInfo", GetUserAgent());
 
-  CommandLine::StringType command_line =
-      CommandLine::ForCurrentProcess()->GetCommandLineString();
+  base::CommandLine::StringType command_line =
+      base::CommandLine::ForCurrentProcess()->GetCommandLineString();
   localized_strings->SetString("commandLineInfo", command_line);
 }
 
 void HelpHandler::RegisterMessages() {
 #if defined(OS_CHROMEOS)
   version_updater_.reset(
       VersionUpdater::Create(web_ui()->GetWebContents()->GetBrowserContext()));
 #endif
   registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                  content::NotificationService::AllSources());
@@ skipping 302 matching lines @@
 }
 
 void HelpHandler::OnFCCLabelTextRead(const std::string& text) {
   // Remove unnecessary whitespace.
   web_ui()->CallJavascriptFunction(
       "help.HelpPage.setProductLabelText",
       base::StringValue(base::CollapseWhitespaceASCII(text, true)));
 }
 
 #endif // defined(OS_CHROMEOS)