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

win8/test/test_registrar.cc

Index: win8/test/test_registrar.cc
diff --git a/win8/test/test_registrar.cc b/win8/test/test_registrar.cc
index b5cec1033326e29f9be1bd125904724eef598d5e..0387bb4f6d1a097af543b839df4d407971cc6b70 100644
--- a/win8/test/test_registrar.cc
+++ b/win8/test/test_registrar.cc
@@ -33,7 +33,7 @@ const wchar_t kDelegateExecuteCLSID[] =
     L"{FC0064A6-D1DE-4A83-92D2-5BB4EEBB70B5}";
 
 void InitializeCommandLineDefaultValues() {
-  CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
 
   if (!command_line.HasSwitch(win8::test::kTestAppUserModelId))
     command_line.AppendSwitchNative(win8::test::kTestAppUserModelId,
@@ -80,7 +80,7 @@ class TestDelegateExecuteModule
 
     registrar->AddReplacement(L"DELEGATE_EXECUTE_CLSID", kDelegateExecuteCLSID);
 
-    CommandLine& command_line = *CommandLine::ForCurrentProcess();
+    base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
 
     registrar->AddReplacement(L"APP_USER_MODEL_ID",
                               command_line.GetSwitchValueNative(
@@ -129,7 +129,7 @@ class ATL_NO_VTABLE DECLSPEC_UUID("FC0064A6-D1DE-4A83-92D2-5BB4EEBB70B5")
 
 extern "C" int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int nShowCmd) {
   base::AtExitManager exit_manager;
-  CommandLine::Init(0, NULL);
+  base::CommandLine::Init(0, NULL);
   InitializeCommandLineDefaultValues();
 
   HRESULT ret_code = _AtlModule.WinMain(nShowCmd);