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

chrome/browser/sync/startup_controller_unittest.cc

 // Copyright 2014 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/sync/startup_controller.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
@@ skipping 95 matching lines @@
 TEST_F(StartupControllerTest, Basic) {
   controller()->TryStart();
   EXPECT_FALSE(started());
   sync_prefs()->SetSyncSetupCompleted();
   controller()->TryStart();
   EXPECT_FALSE(started());
   signin()->set_account(kTestUser);
   controller()->TryStart();
   EXPECT_FALSE(started());
   token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
-  const bool deferred_start = !CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kSyncDisableDeferredStartup);
+  const bool deferred_start =
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kSyncDisableDeferredStartup);
   controller()->TryStart();
   EXPECT_EQ(!deferred_start, started());
   std::string state(controller()->GetBackendInitializationStateString());
   EXPECT_TRUE(deferred_start ? state == kStateStringDeferred :
                                state == kStateStringStarted);
 }
 
 // Test that sync doesn't when suppressed even if all other conditons are met.
 TEST_F(StartupControllerTest, Suppressed) {
   sync_prefs()->SetSyncSetupCompleted();
@@ skipping 93 matching lines @@
     controller()->TryStart();
     EXPECT_TRUE(started());
   }
 }
 
 TEST_F(StartupControllerTest, Reset) {
   sync_prefs()->SetSyncSetupCompleted();
   signin()->set_account(kTestUser);
   token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
   controller()->TryStart();
-  const bool deferred_start = !CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kSyncDisableDeferredStartup);
+  const bool deferred_start =
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kSyncDisableDeferredStartup);
   EXPECT_EQ(!deferred_start, started());
   controller()->OnDataTypeRequestsSyncStartup(syncer::SESSIONS);
   EXPECT_TRUE(started());
   clear_started();
   controller()->Reset(syncer::UserTypes());
   EXPECT_FALSE(started());
   controller()->TryStart();
   // Restart is not deferred.
   EXPECT_TRUE(started());
 }
 
 // Test that setup-in-progress tracking is persistent across a Reset.
 TEST_F(StartupControllerTest, ResetDuringSetup) {
   signin()->set_account(kTestUser);
   token_service()->IssueRefreshTokenForUser(kTestUser, kTestToken);
 
   // Simulate UI telling us setup is in progress.
   controller()->set_setup_in_progress(true);
 
   // This could happen if the UI triggers a stop-syncing permanently call.
   controller()->Reset(syncer::UserTypes());
 
   // From the UI's point of view, setup is still in progress.
   EXPECT_TRUE(controller()->setup_in_progress());
 }
 
 }  // namespace browser_sync