Remove deprecated things from net test suite:

chrome/browser/find_bar_host_browsertest.cc

 // 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.
 
 #include "base/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/views/find_bar_host.h"
 #include "views/focus/focus_manager.h"
 #elif defined(TOOLKIT_GTK)
 #include "chrome/browser/gtk/slide_animator_gtk.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/cocoa/find_bar_bridge.h"
 #endif
 
-const std::wstring kSimplePage = L"404_is_enough_for_us.html";
-const std::wstring kFramePage = L"files/find_in_page/frames.html";
-const std::wstring kFrameData = L"files/find_in_page/framedata_general.html";
-const std::wstring kUserSelectPage = L"files/find_in_page/user-select.html";
-const std::wstring kCrashPage = L"files/find_in_page/crash_1341577.html";
-const std::wstring kTooFewMatchesPage = L"files/find_in_page/bug_1155639.html";
-const std::wstring kEndState = L"files/find_in_page/end_state.html";
-const std::wstring kPrematureEnd = L"files/find_in_page/premature_end.html";
-const std::wstring kMoveIfOver = L"files/find_in_page/move_if_obscuring.html";
-const std::wstring kBitstackCrash = L"files/find_in_page/crash_14491.html";
-const std::wstring kSelectChangesOrdinal =
-    L"files/find_in_page/select_changes_ordinal.html";
-const std::wstring kSimple = L"files/find_in_page/simple.html";
-const std::wstring kLinkPage = L"files/find_in_page/link.html";
+const std::string kSimplePage = "404_is_enough_for_us.html";
+const std::string kFramePage = "files/find_in_page/frames.html";
+const std::string kFrameData = "files/find_in_page/framedata_general.html";
+const std::string kUserSelectPage = "files/find_in_page/user-select.html";
+const std::string kCrashPage = "files/find_in_page/crash_1341577.html";
+const std::string kTooFewMatchesPage = "files/find_in_page/bug_1155639.html";
+const std::string kEndState = "files/find_in_page/end_state.html";
+const std::string kPrematureEnd = "files/find_in_page/premature_end.html";
+const std::string kMoveIfOver = "files/find_in_page/move_if_obscuring.html";
+const std::string kBitstackCrash = "files/find_in_page/crash_14491.html";
+const std::string kSelectChangesOrdinal =
+    "files/find_in_page/select_changes_ordinal.html";
+const std::string kSimple = "files/find_in_page/simple.html";
+const std::string kLinkPage = "files/find_in_page/link.html";
 
 const bool kBack = false;
 const bool kFwd = true;
 
 const bool kIgnoreCase = false;
 const bool kCaseSensitive = true;
 
 const int kMoveIterations = 30;
 
 class FindInPageControllerTest : public InProcessBrowserTest {
@@ skipping 57 matching lines @@
       tab, WideToUTF16(std::wstring(search_str)),
       forward, case_sensitive, ordinal);
 }
 
 // This test loads a page with frames and starts FindInPage requests.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageFrames) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our frames page.
-  GURL url = server->TestServerPageW(kFramePage);
+  GURL url = server->TestServerPage(kFramePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Try incremental search (mimicking user typing in).
   int ordinal = 0;
   TabContents* tab = browser()->GetSelectedTabContents();
   EXPECT_EQ(18, FindInPageWchar(tab, L"g",
                                 kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
   EXPECT_EQ(11, FindInPageWchar(tab, L"go",
                                 kFwd, kIgnoreCase, &ordinal));
@@ skipping 72 matching lines @@
 }
 
 // This tests the FindInPage end-state, in other words: what is focused when you
 // close the Find box (ie. if you find within a link the link should be
 // focused).
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageEndState) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our special focus tracking page.
-  GURL url = server->TestServerPageW(kEndState);
+  GURL url = server->TestServerPage(kEndState);
   ui_test_utils::NavigateToURL(browser(), url);
 
   TabContents* tab_contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(NULL != tab_contents);
 
   // Verify that nothing has focus.
   ASSERT_STREQ("{nothing focused}", FocusedOnPage(tab_contents).c_str());
 
   // Search for a text that exists within a link on the page.
   int ordinal = 0;
@@ skipping 27 matching lines @@
   EXPECT_STREQ("", FocusedOnPage(tab_contents).c_str());
 }
 
 // This test loads a single-frame page and makes sure the ordinal returned makes
 // sense as we FindNext over all the items.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageOrdinal) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our page.
-  GURL url = server->TestServerPageW(kFrameData);
+  GURL url = server->TestServerPage(kFrameData);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Search for 'o', which should make the first item active and return
   // '1 in 3' (1st ordinal of a total of 3 matches).
   TabContents* tab = browser()->GetSelectedTabContents();
   int ordinal = 0;
   EXPECT_EQ(3, FindInPageWchar(tab, L"o",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
   EXPECT_EQ(3, FindInPageWchar(tab, L"o",
@@ skipping 19 matching lines @@
   EXPECT_EQ(3, ordinal);
 }
 
 // This tests that the ordinal is correctly adjusted after a selection
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
                        SelectChangesOrdinal_Issue20883) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our test content.
-  GURL url = server->TestServerPageW(kSelectChangesOrdinal);
+  GURL url = server->TestServerPage(kSelectChangesOrdinal);
   ui_test_utils::NavigateToURL(browser(), url);
 
   TabContents* tab_contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(NULL != tab_contents);
 
   // Search for a text that exists within a link on the page.
   TabContents* tab = browser()->GetSelectedTabContents();
   int ordinal = 0;
   EXPECT_EQ(4, FindInPageWchar(tab_contents,
                                L"google",
@@ skipping 19 matching lines @@
   tab_contents->StopFinding(FindBarController::kKeepSelection);
 }
 
 // This test loads a page with frames and makes sure the ordinal returned makes
 // sense.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageMultiFramesOrdinal) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our page.
-  GURL url = server->TestServerPageW(kFramePage);
+  GURL url = server->TestServerPage(kFramePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Search for 'a', which should make the first item active and return
   // '1 in 7' (1st ordinal of a total of 7 matches).
   TabContents* tab = browser()->GetSelectedTabContents();
   int ordinal = 0;
   EXPECT_EQ(7,
             FindInPageWchar(tab, L"a", kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
   EXPECT_EQ(7,
@@ skipping 31 matching lines @@
   EXPECT_EQ(7, ordinal);
 }
 
 // We could get ordinals out of whack when restarting search in subframes.
 // See http://crbug.com/5132.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPage_Issue5132) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our page.
-  GURL url = server->TestServerPageW(kFramePage);
+  GURL url = server->TestServerPage(kFramePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Search for 'goa' three times (6 matches on page).
   int ordinal = 0;
   TabContents* tab = browser()->GetSelectedTabContents();
   EXPECT_EQ(6, FindInPageWchar(tab, L"goa",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
   EXPECT_EQ(6, FindInPageWchar(tab, L"goa",
                                kFwd, kIgnoreCase, &ordinal));
@@ skipping 10 matching lines @@
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(3, ordinal);
 }
 
 // Load a page with no selectable text and make sure we don't crash.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindUnSelectableText) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our page.
-  GURL url = server->TestServerPageW(kUserSelectPage);
+  GURL url = server->TestServerPage(kUserSelectPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   int ordinal = 0;
   TabContents* tab = browser()->GetSelectedTabContents();
   EXPECT_EQ(0, FindInPageWchar(tab, L"text",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(-1, ordinal);  // Nothing is selected.
   EXPECT_EQ(0, FindInPageWchar(tab, L"Non-existing string",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(0, ordinal);
 }
 
 // Try to reproduce the crash seen in issue 1341577.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindCrash_Issue1341577) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our page.
-  GURL url = server->TestServerPageW(kCrashPage);
+  GURL url = server->TestServerPage(kCrashPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // This would crash the tab. These must be the first two find requests issued
   // against the frame, otherwise an active frame pointer is set and it wont
   // produce the crash.
   // We used to check the return value and |ordinal|. With ICU 4.2, FiP does
   // not find a stand-alone dependent vowel sign of Indic scripts. So, the
   // exptected values are all 0. To make this test pass regardless of
   // ICU version, we just call FiP and see if there's any crash.
   // TODO(jungshik): According to a native Malayalam speaker, it's ok not
@@ skipping 12 matching lines @@
   EXPECT_EQ(0, ordinal);
 }
 
 // Try to reproduce the crash seen in http://crbug.com/14491, where an assert
 // hits in the BitStack size comparison in WebKit.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindCrash_Issue14491) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our page.
-  GURL url = server->TestServerPageW(kBitstackCrash);
+  GURL url = server->TestServerPage(kBitstackCrash);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // This used to crash the tab.
   int ordinal = 0;
   EXPECT_EQ(0, FindInPageWchar(browser()->GetSelectedTabContents(),
                                L"s", kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(0, ordinal);
 }
 
 // Test to make sure Find does the right thing when restarting from a timeout.
 // We used to have a problem where we'd stop finding matches when all of the
 // following conditions were true:
 // 1) The page has a lot of text to search.
 // 2) The page contains more than one match.
 // 3) It takes longer than the time-slice given to each Find operation (100
 //    ms) to find one or more of those matches (so Find times out and has to try
 //    again from where it left off).
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindRestarts_Issue1155639) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our page.
-  GURL url = server->TestServerPageW(kTooFewMatchesPage);
+  GURL url = server->TestServerPage(kTooFewMatchesPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // This string appears 5 times at the bottom of a long page. If Find restarts
   // properly after a timeout, it will find 5 matches, not just 1.
   int ordinal = 0;
   EXPECT_EQ(5, FindInPageWchar(browser()->GetSelectedTabContents(),
                                L"008.xml",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
 }
 
 // This tests bug 11761: FindInPage terminates search prematurely.
 // This test will be enabled once the bug is fixed.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
                        DISABLED_FindInPagePrematureEnd) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our special focus tracking page.
-  GURL url = server->TestServerPageW(kPrematureEnd);
+  GURL url = server->TestServerPage(kPrematureEnd);
   ui_test_utils::NavigateToURL(browser(), url);
 
   TabContents* tab_contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(NULL != tab_contents);
 
   // Search for a text that exists within a link on the page.
   int ordinal = 0;
   EXPECT_EQ(2, FindInPageWchar(tab_contents, L"html ",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
 }
 
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our special focus tracking page.
-  GURL url = server->TestServerPageW(kSimplePage);
-  GURL url2 = server->TestServerPageW(kFramePage);
+  GURL url = server->TestServerPage(kSimplePage);
+  GURL url2 = server->TestServerPage(kFramePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   browser()->ShowFindBar();
 
   gfx::Point position;
   bool fully_visible = false;
 
   // Make sure it is open.
   EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
   EXPECT_TRUE(fully_visible);
@@ skipping 13 matching lines @@
 }
 
 // Make sure Find box disappears when History/Downloads page is opened, and
 // when a New Tab is opened.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
                        FindDisappearOnNewTabAndHistory) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our special focus tracking page.
-  GURL url = server->TestServerPageW(kSimplePage);
+  GURL url = server->TestServerPage(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   browser()->ShowFindBar();
 
   gfx::Point position;
   bool fully_visible = false;
 
   // Make sure it is open.
   EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
   EXPECT_TRUE(fully_visible);
@@ skipping 29 matching lines @@
 #define MAYBE_FindMovesWhenObscuring FLAKY_FindMovesWhenObscuring
 #else
 #define MAYBE_FindMovesWhenObscuring FindMovesWhenObscuring
 #endif
 
 // Make sure Find box moves out of the way if it is obscuring the active match.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_FindMovesWhenObscuring) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
-  GURL url = server->TestServerPageW(kMoveIfOver);
+  GURL url = server->TestServerPage(kMoveIfOver);
   ui_test_utils::NavigateToURL(browser(), url);
 
   browser()->ShowFindBar();
 
   // This is needed on GTK because the reposition operation is asynchronous.
   MessageLoop::current()->RunAllPending();
 
   gfx::Point start_position;
   gfx::Point position;
   bool fully_visible = false;
@@ skipping 33 matching lines @@
   EXPECT_EQ(position.x(), start_position.x());
 }
 
 // Make sure F3 in a new tab works if Find has previous string to search for.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
                        FindNextInNewTabUsesPrepopulate) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to any page.
-  GURL url = server->TestServerPageW(kSimplePage);
+  GURL url = server->TestServerPage(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Search for 'no_match'. No matches should be found.
   int ordinal = 0;
   TabContents* tab = browser()->GetSelectedTabContents();
   EXPECT_EQ(0, FindInPageWchar(tab, L"no_match",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(0, ordinal);
 
   // Open another tab (tab B).
@@ skipping 26 matching lines @@
 // behavior. See http://crbug.com/26870.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
                        DISABLED_AcceleratorRestoring) {
 #else
   IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, AcceleratorRestoring) {
 #endif
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to any page.
-  GURL url = server->TestServerPageW(kSimplePage);
+  GURL url = server->TestServerPage(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
 #if defined(OS_WIN)
   // TODO(oshima): Windows code assumes that NativeView is
   // assignable from NativeWindow, which is not true on other platforms.
   // This has to be fixed, probably by having explicit
   // GetNativeView / GetNativewWindow methods on BrowserWindow.
   // See http://crbug.com/26873.
   gfx::NativeView browser_view = browser()->window()->GetNativeHandle();
 #elif defined(OS_LINUX)
@@ skipping 32 matching lines @@
 }
 #endif  // TOOLKIT_VIEWS
 
 // Make sure Find box does not become UI-inactive when no text is in the box as
 // we switch to a tab contents with an empty find string. See issue 13570.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, StayActive) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to any page.
-  GURL url = server->TestServerPageW(kSimplePage);
+  GURL url = server->TestServerPage(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   browser()->ShowFindBar();
 
   // Simulate a user clearing the search string. Ideally, we should be
   // simulating keypresses here for searching for something and pressing
   // backspace, but that's been proven flaky in the past, so we go straight to
   // tab_contents.
   TabContents* tab_contents = browser()->GetSelectedTabContents();
   // Stop the (non-existing) find operation, and clear the selection (which
   // signals the UI is still active).
   tab_contents->StopFinding(FindBarController::kClearSelection);
   // Make sure the Find UI flag hasn't been cleared, it must be so that the UI
   // still responds to browser window resizing.
   ASSERT_TRUE(tab_contents->find_ui_active());
 }
 
 // Make sure F3 works after you FindNext a couple of times and end the Find
 // session. See issue http://crbug.com/28306.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, RestartSearchFromF3) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to a simple page.
-  GURL url = server->TestServerPageW(kSimple);
+  GURL url = server->TestServerPage(kSimple);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Search for 'page'. Should have 1 match.
   int ordinal = 0;
   TabContents* tab = browser()->GetSelectedTabContents();
   EXPECT_EQ(1, FindInPageWchar(tab, L"page", kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
 
   // Simulate what happens when you press F3 for FindNext. Still should show
   // one match. This cleared the pre-populate string at one point (see bug).
@@ skipping 14 matching lines @@
 // with the last search from the same tab rather than the last overall search.
 // http://crbug.com/30006
 #if defined(OS_CHROMEOS)
 #define PreferPreviousSearch FLAKY_PreferPreviousSearch
 #endif
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PreferPreviousSearch) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to any page.
-  GURL url = server->TestServerPageW(kSimplePage);
+  GURL url = server->TestServerPage(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Find "Default".
   int ordinal = 0;
   TabContents* tab1 = browser()->GetSelectedTabContents();
   EXPECT_EQ(1, FindInPageWchar(tab1, L"Default", kFwd, kIgnoreCase, &ordinal));
 
   // Create a second tab.
   browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, -1,
                            Browser::ADD_SELECTED, NULL, std::string());
@@ skipping 18 matching lines @@
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulateSameTab) {
 #if defined(OS_MACOSX)
   // FindInPage on Mac doesn't use prepopulated values. Search there is global.
   return;
 #endif
 
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to any page.
-  GURL url = server->TestServerPageW(kSimple);
+  GURL url = server->TestServerPage(kSimple);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Search for the word "page".
   int ordinal = 0;
   TabContents* tab1 = browser()->GetSelectedTabContents();
   EXPECT_EQ(1, FindInPageWchar(tab1, L"page", kFwd, kIgnoreCase, &ordinal));
 
   // Open the Find box.
   EnsureFindBoxOpen();
 
@@ skipping 17 matching lines @@
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulateInNewTab) {
 #if defined(OS_MACOSX)
   // FindInPage on Mac doesn't use prepopulated values. Search there is global.
   return;
 #endif
 
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to any page.
-  GURL url = server->TestServerPageW(kSimple);
+  GURL url = server->TestServerPage(kSimple);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Search for the word "page".
   int ordinal = 0;
   TabContents* tab1 = browser()->GetSelectedTabContents();
   EXPECT_EQ(1, FindInPageWchar(tab1, L"page", kFwd, kIgnoreCase, &ordinal));
 
   // Now create a second tab and load the same page.
   browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, -1,
                            Browser::ADD_SELECTED, NULL, std::string());
@@ skipping 15 matching lines @@
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulatePreserveLast) {
 #if defined(OS_MACOSX)
   // FindInPage on Mac doesn't use prepopulated values. Search there is global.
   return;
 #endif
 
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to any page.
-  GURL url = server->TestServerPageW(kSimple);
+  GURL url = server->TestServerPage(kSimple);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Search for the word "page".
   int ordinal = 0;
   TabContents* tab1 = browser()->GetSelectedTabContents();
   EXPECT_EQ(1, FindInPageWchar(tab1, L"page", kFwd, kIgnoreCase, &ordinal));
 
   // Open the Find box.
   EnsureFindBoxOpen();
 
@@ skipping 52 matching lines @@
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_NoIncognitoPrepopulate) {
 #if defined(OS_MACOSX)
   // FindInPage on Mac doesn't use prepopulated values. Search there is global.
   return;
 #endif
 
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to the "simple" test page.
-  GURL url = server->TestServerPageW(kSimple);
+  GURL url = server->TestServerPage(kSimple);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Search for the word "page" in the normal browser tab.
   int ordinal = 0;
   TabContents* tab1 = browser()->GetSelectedTabContents();
   EXPECT_EQ(1, FindInPageWchar(tab1, L"page", kFwd, kIgnoreCase, &ordinal));
 
   // Open the Find box.
   EnsureFindBoxOpenForBrowser(browser());
   EXPECT_EQ(ASCIIToUTF16("page"), GetFindBarTextForBrowser(browser()));
@@ skipping 37 matching lines @@
   EnsureFindBoxOpenForBrowser(browser());
   EXPECT_EQ(ASCIIToUTF16("page"), GetFindBarTextForBrowser(browser()));
 }
 
 // This makes sure that dismissing the find bar with kActivateSelection works.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, ActivateLinkNavigatesPage) {
   HTTPTestServer* server = StartHTTPServer();
   ASSERT_TRUE(server);
 
   // First we navigate to our test content.
-  GURL url = server->TestServerPageW(kLinkPage);
+  GURL url = server->TestServerPage(kLinkPage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   TabContents* tab = browser()->GetSelectedTabContents();
   int ordinal = 0;
   FindInPageWchar(tab, L"link", kFwd, kIgnoreCase, &ordinal);
   EXPECT_EQ(ordinal, 1);
 
   // End the find session, click on the link.
   tab->StopFinding(FindBarController::kActivateSelection);
   EXPECT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
 }