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

chrome/browser/ui/browser.cc

 // Copyright 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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 226 matching lines @@
 
 // How long we wait before updating the browser chrome while loading a page.
 const int kUIUpdateCoalescingTimeMS = 200;
 
 BrowserWindow* CreateBrowserWindow(Browser* browser) {
   return BrowserWindow::CreateBrowserWindow(browser);
 }
 
 // Is the fast tab unload experiment enabled?
 bool IsFastTabUnloadEnabled() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableFastUnload);
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableFastUnload);
 }
 
 bool IsWebAppFrameEnabled() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableWebAppFrame);
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableWebAppFrame);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, CreateParams:
 
 Browser::CreateParams::CreateParams(Profile* profile,
                                     chrome::HostDesktopType host_desktop_type)
     : type(TYPE_TABBED),
@@ skipping 880 matching lines @@
   bool allow_overscroll = ui::IsTouchDevicePresent();
 #elif defined(USE_AURA)
   bool allow_overscroll = true;
 #else
   bool allow_overscroll = false;
 #endif
 
   if (!allow_overscroll)
     return false;
 
-  const std::string value = CommandLine::ForCurrentProcess()->
-      GetSwitchValueASCII(switches::kOverscrollHistoryNavigation);
+  const std::string value =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kOverscrollHistoryNavigation);
   bool overscroll_enabled = value != "0";
   if (!overscroll_enabled)
     return false;
   if (is_app() || is_devtools() || !is_type_tabbed())
     return false;
 
   // The detached bookmark bar has appearance of floating above the
   // web-contents. This does not play nicely with overscroll navigation
   // gestures. So disable overscroll navigation when the bookmark bar is in the
   // detached state and the overscroll effect moves the layers.
@@ skipping 181 matching lines @@
 
   PopupBlockerTabHelper* popup_blocker_helper = NULL;
   if (source)
     popup_blocker_helper = PopupBlockerTabHelper::FromWebContents(source);
 
   if (popup_blocker_helper) {
     if ((params.disposition == NEW_POPUP ||
          params.disposition == NEW_FOREGROUND_TAB ||
          params.disposition == NEW_BACKGROUND_TAB ||
          params.disposition == NEW_WINDOW) &&
-        !params.user_gesture && !CommandLine::ForCurrentProcess()->HasSwitch(
-                                    switches::kDisablePopupBlocking)) {
+        !params.user_gesture &&
+        !base::CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kDisablePopupBlocking)) {
       if (popup_blocker_helper->MaybeBlockPopup(nav_params,
                                                 WebWindowFeatures())) {
         return NULL;
       }
     }
   }
 
   chrome::Navigate(&nav_params);
 
   return nav_params.target_contents;
@@ skipping 1140 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         ui::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }