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

extensions/shell/browser/default_shell_browser_main_delegate.cc

Index: extensions/shell/browser/default_shell_browser_main_delegate.cc
diff --git a/extensions/shell/browser/default_shell_browser_main_delegate.cc b/extensions/shell/browser/default_shell_browser_main_delegate.cc
index eb86cc47ebdc5b961697118f7f5fa5a447cdf252..bbd237f86e6649a011cbe827dbfb1fddff38abbb 100644
--- a/extensions/shell/browser/default_shell_browser_main_delegate.cc
+++ b/extensions/shell/browser/default_shell_browser_main_delegate.cc
@@ -35,14 +35,13 @@ void DefaultShellBrowserMainDelegate::Start(
         ExtensionSystem::Get(browser_context));
     extension_system->Init();
 
-    CommandLine::StringType path_list =
+    base::CommandLine::StringType path_list =
         command_line->GetSwitchValueNative(switches::kLoadApps);
 
-    base::StringTokenizerT<CommandLine::StringType,
-                           CommandLine::StringType::const_iterator>
+    base::StringTokenizerT<base::CommandLine::StringType,
+                           base::CommandLine::StringType::const_iterator>
         tokenizer(path_list, FILE_PATH_LITERAL(","));
 
-
     std::string launch_id;
     while (tokenizer.GetNext()) {
       base::FilePath app_absolute_dir =