Monster FilePath patch!

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_path.h"
 #include "base/file_util.h"
 #include "base/platform_thread.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 
 namespace {
@@ skipping 54 matching lines @@
   ASSERT_EQ(1U, redirects.size());
   EXPECT_EQ(final_url.spec(), redirects[0].spec());
 }
 
 TEST_F(RedirectTest, ClientEmptyReferer) {
   scoped_refptr<HTTPTestServer> server =
     HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
   GURL final_url = server->TestServerPageW(std::wstring());
-  std::wstring test_file = test_data_directory_;
-  file_util::AppendToPath(&test_file, L"file_client_redirect.html");
+  FilePath test_file(FilePath::FromWStringHack(test_data_directory_));
+  test_file = test_file.AppendASCII("file_client_redirect.html");
   GURL first_url = net::FilePathToFileURL(test_file);
 
   NavigateToURL(first_url);
   std::vector<GURL> redirects;
   // We need the sleeps for the client redirects, because it appears as two
   // page visits in the browser. And note for this test the browser actually
   // loads the html file on disk, rather than just getting a response from
   // the TestServer.
   for (int i = 0; i < 10; ++i) {
     PlatformThread::Sleep(sleep_timeout_ms());
     scoped_ptr<TabProxy> tab_proxy(GetActiveTab());
     ASSERT_TRUE(tab_proxy.get());
     ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
     if (!redirects.empty())
       break;
   }
 
   EXPECT_EQ(1U, redirects.size());
   EXPECT_EQ(final_url.spec(), redirects[0].spec());
 }
 
 // Tests to make sure a location change when a pending redirect exists isn't
 // flagged as a redirect.
 TEST_F(RedirectTest, ClientCancelled) {
-  std::wstring first_path = test_data_directory_;
-  file_util::AppendToPath(&first_path, L"cancelled_redirect_test.html");
+  FilePath first_path(FilePath::FromWStringHack(test_data_directory_));
+  first_path = first_path.AppendASCII("cancelled_redirect_test.html");
   ASSERT_TRUE(file_util::AbsolutePath(&first_path));
   GURL first_url = net::FilePathToFileURL(first_path);
 
   NavigateToURL(first_url);
   PlatformThread::Sleep(action_timeout_ms());
 
   scoped_ptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
 
   std::vector<GURL> redirects;
   ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
 
   // There should be no redirects from first_url, because the anchor location
   // change that occurs should not be flagged as a redirect and the meta-refresh
   // won't have fired yet.
   ASSERT_EQ(0U, redirects.size());
   GURL current_url;
   ASSERT_TRUE(tab_proxy->GetCurrentURL(&current_url));
 
   // Need to test final path and ref separately since constructing a file url
   // containing an anchor using FilePathToFileURL will escape the anchor as
   // %23, but in current_url the anchor will be '#'.
   std::string final_ref = "myanchor";
-  std::wstring current_path;
+  FilePath current_path;
   ASSERT_TRUE(net::FileURLToFilePath(current_url, &current_path));
   ASSERT_TRUE(file_util::AbsolutePath(&current_path));
   // Path should remain unchanged.
-  EXPECT_EQ(StringToLowerASCII(first_path), StringToLowerASCII(current_path));
+  EXPECT_EQ(StringToLowerASCII(first_path.value()),
+            StringToLowerASCII(current_path.value()));
   EXPECT_EQ(final_ref, current_url.ref());
 }
 
 // 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());
@@ skipping 45 matching lines @@
   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());
-  std::wstring test_file = test_data_directory_;
-  file_util::AppendToPath(&test_file, L"http_to_file.html");
+  FilePath test_file(FilePath::FromWStringHack(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()));
 
   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_ptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
   std::wstring actual_title;
   tab_proxy->GetTabTitle(&actual_title);
   EXPECT_NE(L"File!", actual_title);
 }
 
 // Ensures that non-user initiated location changes (within page) are
 // flagged as client redirects. See bug 1139823.
 TEST_F(RedirectTest, ClientFragments) {
   scoped_refptr<HTTPTestServer> server =
     HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
-  std::wstring test_file = test_data_directory_;
-  file_util::AppendToPath(&test_file, L"ref_redirect.html");
+  FilePath test_file(FilePath::FromWStringHack(test_data_directory_));
+  test_file = test_file.AppendASCII("ref_redirect.html");
   GURL first_url = net::FilePathToFileURL(test_file);
   std::vector<GURL> redirects;
 
   NavigateToURL(first_url);
   for (int i = 0; i < 10; ++i) {
     PlatformThread::Sleep(sleep_timeout_ms());
     scoped_ptr<TabProxy> tab_proxy(GetActiveTab());
     ASSERT_TRUE(tab_proxy.get());
     ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
     if (!redirects.empty())
@@ skipping 59 matching lines @@
   // as a client redirect from the first (/client-redirect?) page.
   for (std::vector<GURL>::iterator it = redirects.begin();
        it != redirects.end(); ++it) {
     if (final_url.spec() == it->spec()) {
       final_navigation_not_redirect = false;
       break;
     }
   }
   EXPECT_TRUE(final_navigation_not_redirect);
 }