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

chrome/browser/bookmarks/enhanced_bookmarks_features.cc

 // Copyright 2013 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/bookmarks/enhanced_bookmarks_features.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 69 matching lines @@
           sync_driver::prefs::kEnhancedBookmarksExperimentEnabled));
   // If user signed out, clear possible previous state.
   if (!user_signed_in) {
     bookmarks_experiment_state_before = BOOKMARKS_EXPERIMENT_NONE;
     ForceFinchBookmarkExperimentIfNeeded(flags_storage,
         BOOKMARKS_EXPERIMENT_NONE);
   }
 
   // kEnhancedBookmarksExperiment flag could have values "", "1" and "0".
   // "0" - user opted out.
-  bool opt_out = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+  bool opt_out = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
                      switches::kEnhancedBookmarksExperiment) == "0";
 
   BookmarksExperimentState bookmarks_experiment_new_state =
       BOOKMARKS_EXPERIMENT_NONE;
 
   if (IsEnhancedBookmarksExperimentEnabledFromFinch() && !user_signed_in) {
     if (opt_out) {
       // Experiment enabled but user opted out.
       bookmarks_experiment_new_state = BOOKMARKS_EXPERIMENT_OPT_OUT_FROM_FINCH;
     } else {
@@ skipping 27 matching lines @@
     if (opt_out) {
       bookmarks_experiment_new_state =
           BOOKMARKS_EXPERIMENT_ENABLED_USER_OPT_OUT;
     } else {
       // User opted in again.
       bookmarks_experiment_new_state = BOOKMARKS_EXPERIMENT_ENABLED;
     }
   }
 
 #if defined(OS_ANDROID)
-  bool opt_in = !opt_out
-      && CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kEnhancedBookmarksExperiment) == "1";
+  bool opt_in = !opt_out &&
+                base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+                    switches::kEnhancedBookmarksExperiment) == "1";
   if (opt_in && bookmarks_experiment_new_state == BOOKMARKS_EXPERIMENT_NONE)
     bookmarks_experiment_new_state = BOOKMARKS_EXPERIMENT_ENABLED;
 #endif
 
   UMA_HISTOGRAM_ENUMERATION("EnhancedBookmarks.SyncExperimentState",
                             bookmarks_experiment_new_state,
                             BOOKMARKS_EXPERIMENT_ENUM_SIZE);
   user_prefs->SetInteger(
       sync_driver::prefs::kEnhancedBookmarksExperimentEnabled,
       bookmarks_experiment_new_state);
@@ skipping 44 matching lines @@
     about_flags::FlagsStorage* flags_storage) {
 #if defined(OS_CHROMEOS)
   // We are not setting command line flags on Chrome OS to avoid browser restart
   // but still have flags in flags_storage. So check flags_storage instead.
   const std::set<std::string> flags = flags_storage->GetFlags();
   if (flags.find(switches::kManualEnhancedBookmarks) != flags.end())
     return true;
   if (flags.find(switches::kManualEnhancedBookmarksOptout) != flags.end())
     return true;
 #else
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kManualEnhancedBookmarks) ||
       command_line->HasSwitch(switches::kManualEnhancedBookmarksOptout)) {
     return true;
   }
 #endif
 
   return IsEnhancedBookmarksExperimentEnabledFromFinch();
 }
 
 #if defined(OS_ANDROID)
@@ skipping 14 matching lines @@
 bool IsEnhancedBookmarksEnabled(const PrefService* user_prefs) {
   BookmarksExperimentState bookmarks_experiment_state =
       static_cast<BookmarksExperimentState>(user_prefs->GetInteger(
           sync_driver::prefs::kEnhancedBookmarksExperimentEnabled));
   return bookmarks_experiment_state == BOOKMARKS_EXPERIMENT_ENABLED ||
       bookmarks_experiment_state == BOOKMARKS_EXPERIMENT_ENABLED_FROM_FINCH;
 }
 #endif
 
 bool IsEnableDomDistillerSet() {
-  if (CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kEnableDomDistiller)) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableDomDistiller)) {
     return true;
   }
   if (variations::GetVariationParamValue(
           kFieldTrialName, "enable-dom-distiller") == "1")
     return true;
 
   return false;
 }
 
 bool IsEnableSyncArticlesSet() {
-  if (CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kEnableSyncArticles)) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableSyncArticles)) {
     return true;
   }
   if (variations::GetVariationParamValue(
           kFieldTrialName, "enable-sync-articles") == "1")
     return true;
 
   return false;
 }