3 files changed, 8 insertions, 9 deletions
diff --git a/chrome/browser/dom_ui/new_tab_ui_uitest.cc b/chrome/browser/dom_ui/new_tab_ui_uitest.cc
index e82a1cda..5635811 100644
--- a/chrome/browser/dom_ui/new_tab_ui_uitest.cc
+++ b/chrome/browser/dom_ui/new_tab_ui_uitest.cc
@@ -22,7 +22,7 @@ class NewTabUITest : public UITest {
     dom_automation_enabled_ = true;
     // Set home page to the empty string so that we can set the home page using
     // preferences.
-    homepage_ = L"";
+    homepage_ = "";
 
     // Setup the DEFAULT_THEME profile (has fake history entries).
     set_template_user_data(UITest::ComputeTypicalUserDataSource(
diff --git a/chrome/browser/sanity_uitest.cc b/chrome/browser/sanity_uitest.cc
index 29fde79..83f978a 100644
--- a/chrome/browser/sanity_uitest.cc
+++ b/chrome/browser/sanity_uitest.cc
@@ -11,14 +11,14 @@
 #include "base/file_path.h"
 #include "base/platform_thread.h"
 #include "chrome/common/chrome_switches.h"
+#include "net/base/net_util.h"
 
 class GoogleTest : public UITest {
  protected:
   GoogleTest() : UITest() {
-    FilePath test_file(test_data_directory_);
-    test_file = test_file.AppendASCII("google");
-    test_file = test_file.AppendASCII("google.html");
-    homepage_ = test_file.ToWStringHack();
+    FilePath test_file =
+        test_data_directory_.AppendASCII("google").AppendASCII("google.html");
+    homepage_ = GURL(net::FilePathToFileURL(test_file)).spec();
   }
 };
 
@@ -34,9 +34,8 @@ TEST_F(GoogleTest, Crash) {
 class ColumnLayout : public UITest {
  protected:
   ColumnLayout() : UITest() {
-    FilePath test_file(test_data_directory_);
-    test_file = test_file.AppendASCII("columns.html");
-    homepage_ = test_file.ToWStringHack();
+    FilePath test_file = test_data_directory_.AppendASCII("columns.html");
+    homepage_ = GURL(net::FilePathToFileURL(test_file)).spec();
   }
 };
 
diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc
index 602e9c4..c2b38bf 100644
--- a/chrome/browser/session_history_uitest.cc
+++ b/chrome/browser/session_history_uitest.cc
@@ -152,7 +152,7 @@ TEST_F(SessionHistoryTest, MAYBE_FrameBackForward) {
   ASSERT_TRUE(NULL != server.get());
 
   // about:blank should be loaded first.
-  GURL home(WideToUTF8(homepage_));
+  GURL home(homepage_);
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"", GetTabTitle());
   EXPECT_EQ(home, GetTabURL());