summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_main_uitest.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-26 22:39:33 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-26 22:39:33 +0000
commit51343d5ae5d463fc4f84f4af79b44962a580cd4f (patch)
tree8d53ff6a0097950f2732ee5376bf0c83297c9c87 /chrome/app/chrome_main_uitest.cc
parent7b9db43fbc1731cabc985f6e026a07a2ceaafc28 (diff)
downloadchromium_src-51343d5ae5d463fc4f84f4af79b44962a580cd4f.zip
chromium_src-51343d5ae5d463fc4f84f4af79b44962a580cd4f.tar.gz
chromium_src-51343d5ae5d463fc4f84f4af79b44962a580cd4f.tar.bz2
Remove deprecated CommandLine(std::wstring) ctor.
Add a ctor for creating a CommandLine for carrying arguments; convert all the users to either that or the FilePath version. BUG=24672 Review URL: http://codereview.chromium.org/329017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30117 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main_uitest.cc')
-rw-r--r--chrome/app/chrome_main_uitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc
index 48ef39e..ab79407f 100644
--- a/chrome/app/chrome_main_uitest.cc
+++ b/chrome/app/chrome_main_uitest.cc
@@ -44,7 +44,8 @@ TEST_F(ChromeMainTest, SecondLaunch) {
include_testing_id_ = false;
use_existing_browser_ = true;
- ASSERT_TRUE(LaunchAnotherBrowserBlockUntilClosed(CommandLine(L"")));
+ ASSERT_TRUE(LaunchAnotherBrowserBlockUntilClosed(
+ CommandLine(CommandLine::ARGUMENTS_ONLY)));
ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, action_timeout_ms()));
}
@@ -55,9 +56,8 @@ TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) {
FilePath test_file = test_data_directory_.AppendASCII("empty.html");
- CommandLine command_line(L"");
+ CommandLine command_line(CommandLine::ARGUMENTS_ONLY);
command_line.AppendLooseValue(test_file.ToWStringHack());
-
ASSERT_TRUE(LaunchAnotherBrowserBlockUntilClosed(command_line));
ASSERT_TRUE(automation()->IsURLDisplayed(net::FilePathToFileURL(test_file)));