Merge from Chromium at DEPS revision db3f05efe0f9

This commit was generated by merge_to_master.py.

Change-Id: Ia8ad0e588aab2864147fdf2270c1da6ed65a52f9

1 files changed, 5 insertions, 5 deletions

diff --git a/apps/load_and_launch_browsertest.cc b/apps/load_and_launch_browsertest.cc
index f3573b8122..92e95763b5 100644
--- a/apps/load_and_launch_browsertest.cc
+++ b/apps/load_and_launch_browsertest.cc
@@ -34,8 +34,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
                        MAYBE_LoadAndLaunchAppChromeRunning) {
   ExtensionTestMessageListener launched_listener("Launched", false);
 
-  const CommandLine& cmdline = *CommandLine::ForCurrentProcess();
-  CommandLine new_cmdline(cmdline.GetProgram());
+  const base::CommandLine& cmdline = *base::CommandLine::ForCurrentProcess();
+  base::CommandLine new_cmdline(cmdline.GetProgram());
 
   const char* kSwitchNames[] = {
     switches::kUserDataDir,
@@ -71,8 +71,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
                        MAYBE_LoadAndLaunchAppWithFile) {
   ExtensionTestMessageListener launched_listener("Launched", false);
 
-  const CommandLine& cmdline = *CommandLine::ForCurrentProcess();
-  CommandLine new_cmdline(cmdline.GetProgram());
+  const base::CommandLine& cmdline = *base::CommandLine::ForCurrentProcess();
+  base::CommandLine new_cmdline(cmdline.GetProgram());
 
   const char* kSwitchNames[] = {
     switches::kUserDataDir,
@@ -109,7 +109,7 @@ class PlatformAppLoadAndLaunchBrowserTest : public PlatformAppBrowserTest {
  protected:
   PlatformAppLoadAndLaunchBrowserTest() {}
 
-  void SetUpCommandLine(CommandLine* command_line) override {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     PlatformAppBrowserTest::SetUpCommandLine(command_line);
     app_path_ = test_data_dir_
         .AppendASCII("platform_apps")