| Index: win8/delegate_execute/delegate_execute_util_unittest.cc
|
| diff --git a/win8/delegate_execute/delegate_execute_util_unittest.cc b/win8/delegate_execute/delegate_execute_util_unittest.cc
|
| index 49c1776b7e68a3b7ebf2c2098e69615768de7627..63a5075bf6af8f0e03bb011a367f00459a7a4b7f 100644
|
| --- a/win8/delegate_execute/delegate_execute_util_unittest.cc
|
| +++ b/win8/delegate_execute/delegate_execute_util_unittest.cc
|
| @@ -19,12 +19,12 @@ static const char kSomeSwitch[] = "some-switch";
|
| } // namespace
|
|
|
| TEST(DelegateExecuteUtil, CommandLineFromParametersTest) {
|
| - CommandLine cl(CommandLine::NO_PROGRAM);
|
| + base::CommandLine cl(base::CommandLine::NO_PROGRAM);
|
|
|
| // Empty parameters means empty command-line string.
|
| cl = delegate_execute::CommandLineFromParameters(NULL);
|
| EXPECT_EQ(std::wstring(), cl.GetProgram().value());
|
| - EXPECT_EQ(CommandLine::StringType(), cl.GetCommandLineString());
|
| + EXPECT_EQ(base::CommandLine::StringType(), cl.GetCommandLineString());
|
|
|
| // Parameters with a switch are parsed properly.
|
| cl = delegate_execute::CommandLineFromParameters(
|
| @@ -37,9 +37,10 @@ TEST(DelegateExecuteUtil, CommandLineFromParametersTest) {
|
| TEST(DelegateExecuteUtil, MakeChromeCommandLineTest) {
|
| static const wchar_t kSomeArgument[] = L"http://some.url/";
|
| static const wchar_t kOtherArgument[] = L"http://some.other.url/";
|
| - const base::FilePath this_exe(CommandLine::ForCurrentProcess()->GetProgram());
|
| + const base::FilePath this_exe(
|
| + base::CommandLine::ForCurrentProcess()->GetProgram());
|
|
|
| - CommandLine cl(CommandLine::NO_PROGRAM);
|
| + base::CommandLine cl(base::CommandLine::NO_PROGRAM);
|
|
|
| // Empty params and argument contains only the exe.
|
| cl = delegate_execute::MakeChromeCommandLine(
|
| @@ -68,7 +69,7 @@ TEST(DelegateExecuteUtil, MakeChromeCommandLineTest) {
|
| EXPECT_EQ(5, cl.argv().size());
|
| EXPECT_EQ(this_exe.value(), cl.GetProgram().value());
|
| EXPECT_TRUE(cl.HasSwitch(kSomeSwitch));
|
| - CommandLine::StringVector args(cl.GetArgs());
|
| + base::CommandLine::StringVector args(cl.GetArgs());
|
| EXPECT_EQ(2, args.size());
|
| EXPECT_NE(
|
| args.end(),
|
|
|