diff options
author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 17:35:56 +0000 |
---|---|---|
committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 17:35:56 +0000 |
commit | 4dcc2ec6b1a9417aab85183acbca64761ccdd32d (patch) | |
tree | ec1ac02e939a76a038f3c47824a34c36fb2de90e /win8/delegate_execute/delegate_execute_util_unittest.cc | |
parent | fdd91ad2e68f187bc301c30ecda7e503dae32126 (diff) | |
download | chromium_src-4dcc2ec6b1a9417aab85183acbca64761ccdd32d.zip chromium_src-4dcc2ec6b1a9417aab85183acbca64761ccdd32d.tar.gz chromium_src-4dcc2ec6b1a9417aab85183acbca64761ccdd32d.tar.bz2 |
Add base:: to string16s in win8/.
R=grt@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/119733002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/delegate_execute/delegate_execute_util_unittest.cc')
-rw-r--r-- | win8/delegate_execute/delegate_execute_util_unittest.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/win8/delegate_execute/delegate_execute_util_unittest.cc b/win8/delegate_execute/delegate_execute_util_unittest.cc index f01b157..ca444b8 100644 --- a/win8/delegate_execute/delegate_execute_util_unittest.cc +++ b/win8/delegate_execute/delegate_execute_util_unittest.cc @@ -42,38 +42,41 @@ TEST(DelegateExecuteUtil, MakeChromeCommandLineTest) { // Empty params and argument contains only the exe. cl = delegate_execute::MakeChromeCommandLine( - this_exe, delegate_execute::CommandLineFromParameters(NULL), string16()); + this_exe, + delegate_execute::CommandLineFromParameters(NULL), + base::string16()); EXPECT_EQ(1, cl.argv().size()); EXPECT_EQ(this_exe.value(), cl.GetProgram().value()); // Empty params with arg contains the arg. cl = delegate_execute::MakeChromeCommandLine( this_exe, delegate_execute::CommandLineFromParameters(NULL), - string16(kSomeArgument)); + base::string16(kSomeArgument)); EXPECT_EQ(2, cl.argv().size()); EXPECT_EQ(this_exe.value(), cl.GetProgram().value()); EXPECT_EQ(1, cl.GetArgs().size()); - EXPECT_EQ(string16(kSomeArgument), cl.GetArgs()[0]); + EXPECT_EQ(base::string16(kSomeArgument), cl.GetArgs()[0]); // Params with switchs and args plus arg contains the arg. cl = delegate_execute::MakeChromeCommandLine( this_exe, delegate_execute::CommandLineFromParameters( base::StringPrintf(L"--%ls -- %ls", ASCIIToWide(kSomeSwitch).c_str(), kOtherArgument).c_str()), - string16(kSomeArgument)); + base::string16(kSomeArgument)); EXPECT_EQ(5, cl.argv().size()); EXPECT_EQ(this_exe.value(), cl.GetProgram().value()); EXPECT_TRUE(cl.HasSwitch(kSomeSwitch)); CommandLine::StringVector args(cl.GetArgs()); EXPECT_EQ(2, args.size()); + EXPECT_NE( + args.end(), + std::find(args.begin(), args.end(), base::string16(kOtherArgument))); EXPECT_NE(args.end(), - std::find(args.begin(), args.end(), string16(kOtherArgument))); - EXPECT_NE(args.end(), - std::find(args.begin(), args.end(), string16(kSomeArgument))); + std::find(args.begin(), args.end(), base::string16(kSomeArgument))); } TEST(DelegateExecuteUtil, ParametersFromSwitchTest) { - EXPECT_EQ(string16(), delegate_execute::ParametersFromSwitch(NULL)); - EXPECT_EQ(string16(L"--some-switch"), + EXPECT_EQ(base::string16(), delegate_execute::ParametersFromSwitch(NULL)); + EXPECT_EQ(base::string16(L"--some-switch"), delegate_execute::ParametersFromSwitch(kSomeSwitch)); } |