From 4b68e0d50c4a69b91a384b698a96f6a51ca7241f Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Sat, 2 May 2009 00:56:57 +0000 Subject: 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 --- chrome/browser/history/redirect_uitest.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'chrome/browser/history') diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc index 929a5e1..e51e992 100644 --- a/chrome/browser/history/redirect_uitest.cc +++ b/chrome/browser/history/redirect_uitest.cc @@ -7,7 +7,6 @@ // here might indicate that WebKit changed the calls our glue layer gets in // the case of redirects. It may also mean problems with the history system. -#include "base/file_path.h" #include "base/file_util.h" #include "base/platform_thread.h" #include "base/scoped_ptr.h" @@ -80,7 +79,7 @@ TEST_F(RedirectTest, ClientEmptyReferer) { ASSERT_TRUE(NULL != server.get()); GURL final_url = server->TestServerPageW(std::wstring()); - FilePath test_file(FilePath::FromWStringHack(test_data_directory_)); + FilePath test_file(test_data_directory_); test_file = test_file.AppendASCII("file_client_redirect.html"); GURL first_url = net::FilePathToFileURL(test_file); @@ -106,7 +105,7 @@ TEST_F(RedirectTest, ClientEmptyReferer) { // Tests to make sure a location change when a pending redirect exists isn't // flagged as a redirect. TEST_F(RedirectTest, ClientCancelled) { - FilePath first_path(FilePath::FromWStringHack(test_data_directory_)); + FilePath first_path(test_data_directory_); first_path = first_path.AppendASCII("cancelled_redirect_test.html"); ASSERT_TRUE(file_util::AbsolutePath(&first_path)); GURL first_url = net::FilePathToFileURL(first_path); @@ -202,7 +201,7 @@ TEST_F(RedirectTest, NoHttpToFile) { scoped_refptr server = HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); - FilePath test_file(FilePath::FromWStringHack(test_data_directory_)); + FilePath test_file(test_data_directory_); test_file = test_file.AppendASCII("http_to_file.html"); GURL file_url = net::FilePathToFileURL(test_file); @@ -226,7 +225,7 @@ TEST_F(RedirectTest, ClientFragments) { HTTPTestServer::CreateServer(kDocRoot, NULL); ASSERT_TRUE(NULL != server.get()); - FilePath test_file(FilePath::FromWStringHack(test_data_directory_)); + FilePath test_file(test_data_directory_); test_file = test_file.AppendASCII("ref_redirect.html"); GURL first_url = net::FilePathToFileURL(test_file); std::vector redirects; -- cgit v1.1