Remove some wstrings used in ui_test.cc.

This removes all switch-related wstring APIs from ui_test.cc, and
fixes all the callers.

Review URL: http://codereview.chromium.org/3066026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54392 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 7 deletions

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();
   }
 };