summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-02 00:56:57 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-02 00:56:57 +0000
commit4b68e0d50c4a69b91a384b698a96f6a51ca7241f (patch)
treea11dc1b6baf8d2e1d1c3d8b7930fb9ca0cec46eb /chrome/app
parent82d10b14f9b4150ce1e154629dec9dcddadcf272 (diff)
downloadchromium_src-4b68e0d50c4a69b91a384b698a96f6a51ca7241f.zip
chromium_src-4b68e0d50c4a69b91a384b698a96f6a51ca7241f.tar.gz
chromium_src-4b68e0d50c4a69b91a384b698a96f6a51ca7241f.tar.bz2
Yet more deprecation of the wstring version of PathService::Get() for UI tests.
Review URL: http://codereview.chromium.org/99298 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_main_uitest.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/app/chrome_main_uitest.cc b/chrome/app/chrome_main_uitest.cc
index b70e58c..5ce05c2 100644
--- a/chrome/app/chrome_main_uitest.cc
+++ b/chrome/app/chrome_main_uitest.cc
@@ -5,7 +5,6 @@
#include "chrome/test/ui/ui_test.h"
#include "base/command_line.h"
-#include "base/file_path.h"
#include "base/file_util.h"
#include "net/base/net_util.h"
@@ -48,16 +47,13 @@ TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) {
include_testing_id_ = false;
use_existing_browser_ = true;
- std::wstring test_file = test_data_directory_;
- file_util::AppendToPath(&test_file, L"empty.html");
+ FilePath test_file = test_data_directory_.AppendASCII("empty.html");
CommandLine command_line(L"");
- command_line.AppendLooseValue(test_file);
+ command_line.AppendLooseValue(test_file.ToWStringHack());
LaunchBrowser(command_line, false);
- FilePath test_file_path(FilePath::FromWStringHack(test_file));
-
ASSERT_TRUE(automation()->WaitForURLDisplayed(
- net::FilePathToFileURL(test_file_path), action_timeout_ms()));
+ net::FilePathToFileURL(test_file), action_timeout_ms()));
}