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

chrome/browser/search/search.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/search/search.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 312 matching lines @@
       "ion=1&" : std::string();
 }
 
 bool IsQueryExtractionEnabled() {
 #if defined(OS_IOS) || defined(OS_ANDROID)
   return true;
 #else
   if (!IsInstantExtendedAPIEnabled())
     return false;
 
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableQueryExtraction))
     return true;
 
   FieldTrialFlags flags;
   return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
       kEnableQueryExtractionFlagName, false, flags);
 #endif  // defined(OS_IOS) || defined(OS_ANDROID)
 }
 
 base::string16 ExtractSearchTermsFromURL(Profile* profile, const GURL& url) {
@@ skipping 183 matching lines @@
 
 GURL GetSearchResultPrefetchBaseURL(Profile* profile) {
   return ShouldPrefetchSearchResults() ? GetInstantURL(profile, true) : GURL();
 }
 
 bool ShouldPrefetchSearchResults() {
   if (!IsInstantExtendedAPIEnabled())
     return false;
 
 #if defined(OS_ANDROID)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kPrefetchSearchResults)) {
     return true;
   }
 
   FieldTrialFlags flags;
   return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
       kPrefetchSearchResultsFlagName, false, flags);
 #else
   return true;
 #endif
@@ skipping 28 matching lines @@
 #else
   return true;
 #endif
 }
 
 GURL GetLocalInstantURL(Profile* profile) {
   return GURL(chrome::kChromeSearchLocalNtpUrl);
 }
 
 DisplaySearchButtonConditions GetDisplaySearchButtonConditions() {
-  const CommandLine* cl = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   if (cl->HasSwitch(switches::kDisableSearchButtonInOmnibox))
     return DISPLAY_SEARCH_BUTTON_NEVER;
   if (cl->HasSwitch(switches::kEnableSearchButtonInOmniboxForStr))
     return DISPLAY_SEARCH_BUTTON_FOR_STR;
   if (cl->HasSwitch(switches::kEnableSearchButtonInOmniboxForStrOrIip))
     return DISPLAY_SEARCH_BUTTON_FOR_STR_OR_IIP;
   if (cl->HasSwitch(switches::kEnableSearchButtonInOmniboxAlways))
     return DISPLAY_SEARCH_BUTTON_ALWAYS;
 
   FieldTrialFlags flags;
   if (!GetFieldTrialInfo(&flags))
     return DISPLAY_SEARCH_BUTTON_NEVER;
   uint64 value =
       GetUInt64ValueForFlagWithDefault(kDisplaySearchButtonFlagName, 0, flags);
   return (value < DISPLAY_SEARCH_BUTTON_NUM_VALUES) ?
       static_cast<DisplaySearchButtonConditions>(value) :
       DISPLAY_SEARCH_BUTTON_NEVER;
 }
 
 bool ShouldDisplayOriginChip() {
   return GetOriginChipCondition() != ORIGIN_CHIP_DISABLED;
 }
 
 OriginChipCondition GetOriginChipCondition() {
-  const CommandLine* cl = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   if (cl->HasSwitch(switches::kDisableOriginChip))
     return ORIGIN_CHIP_DISABLED;
   if (cl->HasSwitch(switches::kEnableOriginChipAlways))
     return ORIGIN_CHIP_ALWAYS;
   if (cl->HasSwitch(switches::kEnableOriginChipOnSrp))
     return ORIGIN_CHIP_ON_SRP;
 
   FieldTrialFlags flags;
   if (!GetFieldTrialInfo(&flags))
     return ORIGIN_CHIP_DISABLED;
@@ skipping 102 matching lines @@
   return StringToInstantSupportState(value);
 }
 
 bool ShouldPrefetchSearchResultsOnSRP() {
   FieldTrialFlags flags;
   return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
       kPrefetchSearchResultsOnSRP, false, flags);
 }
 
 void EnableQueryExtractionForTesting() {
-  CommandLine* cl = CommandLine::ForCurrentProcess();
+  base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   cl->AppendSwitch(switches::kEnableQueryExtraction);
 }
 
 bool ShouldUseAltInstantURL() {
   FieldTrialFlags flags;
   return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
       kUseAltInstantURL, false, flags);
 }
 
 bool ShouldUseSearchPathForInstant() {
   FieldTrialFlags flags;
   return GetFieldTrialInfo(&flags) && GetBoolValueForFlagWithDefault(
       kUseSearchPathForInstant, false, flags);
 }
 
 }  // namespace chrome