Remove deprecated things from net test suite:

chrome/browser/history/redirect_uitest.cc

 // Copyright (c) 2006-2008 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.
 
 // Navigates the browser to server and client redirect pages and makes sure
 // that the correct redirects are reflected in the history database. Errors
 // 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_util.h"
@@ skipping 10 matching lines @@
 const wchar_t kDocRoot[] = L"chrome/test/data";
 
 typedef UITest RedirectTest;
 
 // Tests a single server redirect
 TEST_F(RedirectTest, Server) {
   scoped_refptr<HTTPTestServer> server =
     HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
-  GURL final_url = server->TestServerPageW(std::wstring());
-  GURL first_url = server->TestServerPageW(
-      std::wstring(L"server-redirect?") + UTF8ToWide(final_url.spec()));
+  GURL final_url = server->TestServerPage(std::string());
+  GURL first_url = server->TestServerPage(
+      std::string("server-redirect?") + final_url.spec());
 
   NavigateToURL(first_url);
 
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
 
   std::vector<GURL> redirects;
   ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
 
   ASSERT_EQ(1U, redirects.size());
   EXPECT_EQ(final_url.spec(), redirects[0].spec());
 }
 
 // Tests a single client redirect.
 TEST_F(RedirectTest, Client) {
   scoped_refptr<HTTPTestServer> server =
     HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
-  GURL final_url = server->TestServerPageW(std::wstring());
-  GURL first_url = server->TestServerPageW(
-      std::wstring(L"client-redirect?") + UTF8ToWide(final_url.spec()));
+  GURL final_url = server->TestServerPage(std::string());
+  GURL first_url = server->TestServerPage(
+      std::string("client-redirect?") + final_url.spec());

[eroman, 2010/04/29 18:10:47]

nit: Can probably omit the std::string() (applies elsewhere in this file if you
choose to change it).

 
   // The client redirect appears as two page visits in the browser.
   NavigateToURLBlockUntilNavigationsComplete(first_url, 2);
 
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
 
   std::vector<GURL> redirects;
   ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
 
@@ skipping 11 matching lines @@
   // The address bar should still display the final URL.
   EXPECT_TRUE(tab_proxy->GetCurrentURL(&tab_url));
   EXPECT_TRUE(final_url == tab_url);
 }
 
 TEST_F(RedirectTest, ClientEmptyReferer) {
   scoped_refptr<HTTPTestServer> server =
     HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
-  GURL final_url = server->TestServerPageW(std::wstring());
+  GURL final_url = server->TestServerPage(std::string());
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("file_client_redirect.html");
   GURL first_url = net::FilePathToFileURL(test_file);
 
   // The client redirect appears as two page visits in the browser.
   NavigateToURLBlockUntilNavigationsComplete(first_url, 2);
 
   std::vector<GURL> redirects;
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
@@ skipping 40 matching lines @@
 }
 
 // Tests a client->server->server redirect
 // TODO(creis): This is disabled temporarily while I figure out why it is
 // failing.
 TEST_F(RedirectTest, DISABLED_ClientServerServer) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
-  GURL final_url = server->TestServerPageW(std::wstring());
-  GURL next_to_last = server->TestServerPageW(
-      std::wstring(L"server-redirect?") + UTF8ToWide(final_url.spec()));
-  GURL second_url = server->TestServerPageW(
-      std::wstring(L"server-redirect?") + UTF8ToWide(next_to_last.spec()));
-  GURL first_url = server->TestServerPageW(
-      std::wstring(L"client-redirect?") + UTF8ToWide(second_url.spec()));
+  GURL final_url = server->TestServerPage(std::string());
+  GURL next_to_last = server->TestServerPage(
+      std::string("server-redirect?") + final_url.spec());
+  GURL second_url = server->TestServerPage(
+      std::string("server-redirect?") + next_to_last.spec());
+  GURL first_url = server->TestServerPage(
+      std::string("client-redirect?") + second_url.spec());
   std::vector<GURL> redirects;
 
   // We need the sleep for the client redirects, because it appears as two
   // page visits in the browser.
   NavigateToURL(first_url);
 
   for (int i = 0; i < 10; ++i) {
     PlatformThread::Sleep(sleep_timeout_ms());
     scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
     ASSERT_TRUE(tab_proxy.get());
     ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
     if (!redirects.empty())
       break;
   }
 
   ASSERT_EQ(3U, redirects.size());
   EXPECT_EQ(second_url.spec(), redirects[0].spec());
   EXPECT_EQ(next_to_last.spec(), redirects[1].spec());
   EXPECT_EQ(final_url.spec(), redirects[2].spec());
 }
 
 // Tests that the "#reference" gets preserved across server redirects.
 TEST_F(RedirectTest, ServerReference) {
   scoped_refptr<HTTPTestServer> server =
     HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
   const std::string ref("reference");
 
-  GURL final_url = server->TestServerPageW(std::wstring());
-  GURL initial_url = server->TestServerPageW(
-      std::wstring(L"server-redirect?") + UTF8ToWide(final_url.spec()) +
-      L"#" + UTF8ToWide(ref));
+  GURL final_url = server->TestServerPage(std::string());
+  GURL initial_url = server->TestServerPage(
+      std::string("server-redirect?") + final_url.spec() + "#" + ref);
 
   NavigateToURL(initial_url);
 
   GURL url = GetActiveTabURL();
   EXPECT_EQ(ref, url.ref());
 }
 
 // Test that redirect from http:// to file:// :
 // A) does not crash the browser or confuse the redirect chain, see bug 1080873
 // B) does not take place.
 TEST_F(RedirectTest, NoHttpToFile) {
   scoped_refptr<HTTPTestServer> server =
     HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("http_to_file.html");
   GURL file_url = net::FilePathToFileURL(test_file);
 
-  GURL initial_url = server->TestServerPageW(
-    std::wstring(L"client-redirect?") + UTF8ToWide(file_url.spec()));
+  GURL initial_url = server->TestServerPage(
+    std::string("client-redirect?") + file_url.spec());
 
   NavigateToURL(initial_url);
   // UITest will check for crashes. We make sure the title doesn't match the
   // title from the file, because the nav should not have taken place.
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
   std::wstring actual_title;
   ASSERT_TRUE(tab_proxy->GetTabTitle(&actual_title));
   EXPECT_NE(L"File!", actual_title);
 }
@@ skipping 31 matching lines @@
   // We want to initiate a second navigation after the provisional load for
   // the client redirect destination has started, but before this load is
   // committed. To achieve this, we tell the browser to load a slow page,
   // which causes it to start a provisional load, and while it is waiting
   // for the response (which means it hasn't committed the load for the client
   // redirect destination page yet), we issue a new navigation request.
   scoped_refptr<HTTPTestServer> server =
     HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
-  GURL final_url = server->TestServerPageW(std::wstring(L"files/title2.html"));
-  GURL slow = server->TestServerPageW(std::wstring(L"slow?60"));
-  GURL first_url = server->TestServerPageW(
-      std::wstring(L"client-redirect?") + UTF8ToWide(slow.spec()));
+  GURL final_url = server->TestServerPage(std::string("files/title2.html"));

[eroman, 2010/04/29 18:10:47]

nit: you can omit the std::string

+  GURL slow = server->TestServerPage(std::string("slow?60"));

[eroman, 2010/04/29 18:10:47]

ditto.

+  GURL first_url = server->TestServerPage(
+      std::string("client-redirect?") + slow.spec());
   std::vector<GURL> redirects;
 
   NavigateToURL(first_url);
   // We don't sleep here - the first navigation won't have been committed yet
   // because we told the server to wait a minute. This means the browser has
   // started it's provisional load for the client redirect destination page but
   // hasn't completed. Our time is now!
   NavigateToURL(final_url);
 
   std::wstring tab_title;
@@ skipping 21 matching lines @@
        it != redirects.end(); ++it) {
     if (final_url.spec() == it->spec()) {
       final_navigation_not_redirect = false;
       break;
     }
   }
   EXPECT_TRUE(final_navigation_not_redirect);
 }
 
 }  // namespace