chrome_frame: Get rid of all occurrences of the deprecated ToWStringHack function.

BUG=24874
TEST=trybots

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

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

4 files changed, 9 insertions, 10 deletions

diff --git a/chrome_frame/test/automation_client_mock.cc b/chrome_frame/test/automation_client_mock.cc
index 17b8e65..048a0c3 100644
--- a/chrome_frame/test/automation_client_mock.cc
+++ b/chrome_frame/test/automation_client_mock.cc
@@ -46,7 +46,7 @@ void MockProxyFactory::GetServerImpl(ChromeFrameAutomationProxy* pxy,
 void CFACMockTest::SetAutomationServerOk(int times) {
   EXPECT_CALL(factory_, GetAutomationServer(testing::NotNull(),
               testing::Field(&ChromeFrameLaunchParams::profile_name,
-                  testing::StrEq(profile_path_.BaseName().ToWStringHack())),
+                  testing::StrEq(profile_path_.BaseName().value())),
               testing::NotNull()))
     .Times(times)
     .WillRepeatedly(testing::Invoke(CreateFunctor(&factory_,
diff --git a/chrome_frame/test/net/process_singleton_subclass.cc b/chrome_frame/test/net/process_singleton_subclass.cc
index 91a3bef..2046e0b 100644
--- a/chrome_frame/test/net/process_singleton_subclass.cc
+++ b/chrome_frame/test/net/process_singleton_subclass.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -31,7 +31,7 @@ bool ProcessSingletonSubclass::Subclass(const FilePath& user_data_dir) {
   DCHECK(stub_ == NULL);
   DCHECK(original_wndproc_ == NULL);
   HWND hwnd = FindWindowEx(HWND_MESSAGE, NULL, chrome::kMessageWindowClass,
-                           user_data_dir.ToWStringHack().c_str());
+                           user_data_dir.value().c_str());
   if (!::IsWindow(hwnd))
     return false;
 
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index c0fef40..efc3c30 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -414,14 +414,13 @@ class ChromeFrameBinariesLoadTest : public ChromeFrameStartupTestActiveX {
                                   TimeTicks* end_time) {
     *start_time = TimeTicks::Now();
 
-    HMODULE chrome_exe = LoadLibrary(chrome_exe_.ToWStringHack().c_str());
+    HMODULE chrome_exe = LoadLibrary(chrome_exe_.value().c_str());
     ASSERT_TRUE(chrome_exe != NULL);
 
-    HMODULE chrome_dll = LoadLibrary(chrome_dll_.ToWStringHack().c_str());
+    HMODULE chrome_dll = LoadLibrary(chrome_dll_.value().c_str());
     ASSERT_TRUE(chrome_dll != NULL);
 
-    HMODULE chrome_tab_dll =
-        LoadLibrary(chrome_frame_dll_.ToWStringHack().c_str());
+    HMODULE chrome_tab_dll = LoadLibrary(chrome_frame_dll_.value().c_str());
     ASSERT_TRUE(chrome_tab_dll != NULL);
 
     *end_time = TimeTicks::Now();
diff --git a/chrome_frame/test/run_all_unittests.cc b/chrome_frame/test/run_all_unittests.cc
index a943671..fccdd5e 100644
--- a/chrome_frame/test/run_all_unittests.cc
+++ b/chrome_frame/test/run_all_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -45,8 +45,8 @@ base::ProcessHandle LoadCrashService() {
 
   base::ProcessHandle crash_service = NULL;
 
-  FilePath crash_service_path = exe_dir.Append(L"crash_service.exe");
-  if (!base::LaunchApp(crash_service_path.ToWStringHack(), false, false,
+  FilePath crash_service_path = exe_dir.AppendASCII("crash_service.exe");
+  if (!base::LaunchApp(crash_service_path.value(), false, false,
                        &crash_service)) {
     printf("Couldn't start crash_service.exe, so this test run won't tell " \
            "you if any test crashes!\n");