Monster FilePath patch!

webkit/glue/dom_serializer_unittest.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.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "Document.h"
@@ skipping 220 matching lines @@
           static_cast<unsigned>(end_pos - start_pos));
       return true;
     }
   }
   return true;
 }
 
 // If original contents have document type, the serialized contents also have
 // document type.
 TEST_F(DomSerializerTests, SerialzeHTMLDOMWithDocType) {
-  std::wstring page_file_path = data_dir_;
-  file_util::AppendToPath(&page_file_path, L"dom_serializer/youtube_1.htm");
+  FilePath page_file_path = data_dir_;
+  page_file_path = page_file_path.AppendASCII("dom_serializer");
+  page_file_path = page_file_path.AppendASCII("youtube_1.htm");
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
   // Make sure original contents have document type.
   WebFrameImpl* web_frame =
       webkit_glue::GetWebFrameImplFromWebViewForSpecificURL(
           test_shell_->webView(), file_url);
   ASSERT_TRUE(web_frame != NULL);
   WebCore::Document* doc = web_frame->frame()->document();
   ASSERT_TRUE(doc->doctype() != NULL);
   // Do serialization.
   SerializeDomForURL(file_url, false);
   // Load the serialized contents.
   ASSERT_TRUE(HasSerializedFrame(file_url));
   const std::string& serialized_contents =
       GetSerializedContentForFrame(file_url);
   LoadContents(serialized_contents, file_url,
                web_frame->frame()->loader()->encoding());
   // Make sure serialized contents still have document type.
   web_frame =
       static_cast<WebFrameImpl*>(test_shell_->webView()->GetMainFrame());
   doc = web_frame->frame()->document();
   ASSERT_TRUE(doc->doctype() != NULL);
 }
 
 // If original contents do not have document type, the serialized contents
 // also do not have document type.
 TEST_F(DomSerializerTests, SerialzeHTMLDOMWithoutDocType) {
-  std::wstring page_file_path = data_dir_;
-  file_util::AppendToPath(&page_file_path, L"dom_serializer/youtube_2.htm");
+  FilePath page_file_path = data_dir_;
+  page_file_path = page_file_path.AppendASCII("dom_serializer");
+  page_file_path = page_file_path.AppendASCII("youtube_2.htm");
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
   // Make sure original contents do not have document type.
   WebFrameImpl* web_frame =
       webkit_glue::GetWebFrameImplFromWebViewForSpecificURL(
           test_shell_->webView(), file_url);
   ASSERT_TRUE(web_frame != NULL);
   WebCore::Document* doc = web_frame->frame()->document();
@@ skipping 10 matching lines @@
   web_frame =
       static_cast<WebFrameImpl*>(test_shell_->webView()->GetMainFrame());
   doc = web_frame->frame()->document();
   ASSERT_TRUE(doc->doctype() == NULL);
 }
 
 // Serialize XML document which has all 5 built-in entities. After
 // finishing serialization, the serialized contents should be same
 // with original XML document.
 TEST_F(DomSerializerTests, SerialzeXMLDocWithBuiltInEntities) {
-  std::wstring page_file_path = data_dir_;
-  file_util::AppendToPath(&page_file_path, L"dom_serializer/note.xml");
+  FilePath page_file_path = data_dir_;
+  page_file_path = page_file_path.AppendASCII("dom_serializer");
+  page_file_path = page_file_path.AppendASCII("note.xml");
   // Read original contents for later comparison.
   std::string orginal_contents;
   ASSERT_TRUE(file_util::ReadFileToString(page_file_path, &orginal_contents));
   // Get file URL.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
   // Do serialization.
   SerializeDomForURL(file_url, false);
   // Compare the serialized contents with original contents.
   ASSERT_TRUE(HasSerializedFrame(file_url));
   const std::string& serialized_contents =
       GetSerializedContentForFrame(file_url);
   ASSERT_EQ(orginal_contents, serialized_contents);
 }
 
 // When serializing DOM, we add MOTW declaration before html tag.
 TEST_F(DomSerializerTests, SerialzeHTMLDOMWithAddingMOTW) {
-  std::wstring page_file_path = data_dir_;
-  file_util::AppendToPath(&page_file_path, L"dom_serializer/youtube_2.htm");
+  FilePath page_file_path = data_dir_;
+  page_file_path = page_file_path.AppendASCII("dom_serializer");
+  page_file_path = page_file_path.AppendASCII("youtube_2.htm");
   // Read original contents for later comparison .
   std::string orginal_contents;
   ASSERT_TRUE(file_util::ReadFileToString(page_file_path, &orginal_contents));
   // Get file URL.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Make sure original contents does not have MOTW;
   std::string motw_declaration =
       webkit_glue::DomSerializer::GenerateMarkOfTheWebDeclaration(file_url);
   ASSERT_FALSE(motw_declaration.empty());
@@ skipping 11 matching lines @@
       GetSerializedContentForFrame(file_url);
   ASSERT_FALSE(std::string::npos ==
       serialized_contents.find(motw_declaration));
 }
 
 // When serializing DOM, we will add the META which have correct charset
 // declaration as first child of HEAD element for resolving WebKit bug:
 // http://bugs.webkit.org/show_bug.cgi?id=16621 even the original document
 // does not have META charset declaration.
 TEST_F(DomSerializerTests, SerialzeHTMLDOMWithNoMetaCharsetInOriginalDoc) {
-  std::wstring page_file_path = data_dir_;
-  file_util::AppendToPath(&page_file_path, L"dom_serializer/youtube_1.htm");
+  FilePath page_file_path = data_dir_;
+  page_file_path = page_file_path.AppendASCII("dom_serializer");
+  page_file_path = page_file_path.AppendASCII("youtube_1.htm");
   // Get file URL.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
 
   // Make sure there is no META charset declaration in original document.
   WebFrameImpl* web_frame =
       webkit_glue::GetWebFrameImplFromWebViewForSpecificURL(
           test_shell_->webView(), file_url);
@@ skipping 40 matching lines @@
     if (IsMetaElement(child, &charset_info))
       ASSERT_TRUE(charset_info.isEmpty());
 }
 
 // When serializing DOM, if the original document has multiple META charset
 // declaration, we will add the META which have correct charset declaration
 // as first child of HEAD element and remove all original META charset
 // declarations.
 TEST_F(DomSerializerTests,
        SerialzeHTMLDOMWithMultipleMetaCharsetInOriginalDoc) {
-  std::wstring page_file_path = data_dir_;
-  file_util::AppendToPath(&page_file_path, L"dom_serializer/youtube_2.htm");
+  FilePath page_file_path = data_dir_;
+  page_file_path = page_file_path.AppendASCII("dom_serializer");
+  page_file_path = page_file_path.AppendASCII("youtube_2.htm");
   // Get file URL.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
 
   // Make sure there are multiple META charset declarations in original
   // document.
   WebFrameImpl* web_frame =
       webkit_glue::GetWebFrameImplFromWebViewForSpecificURL(
@@ skipping 41 matching lines @@
 
   // Make sure no more additional META tags which have charset declaration.
   for (const WebCore::Node *child = meta_node->nextSibling(); child != NULL;
        child = child->nextSibling())
     if (IsMetaElement(child, &charset_info))
       ASSERT_TRUE(charset_info.isEmpty());
 }
 
 // Test situation of html entities in text when serializing HTML DOM.
 TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEntitiesInText) {
-  std::wstring page_file_path = data_dir_;
-  file_util::AppendToPath(&page_file_path,
-                          L"dom_serializer/htmlentities_in_text.htm");
+  FilePath page_file_path = data_dir_;
+  page_file_path = page_file_path.AppendASCII("dom_serializer");
+  page_file_path = page_file_path.AppendASCII("htmlentities_in_text.htm");
   // Read original contents for later comparison .
   std::string orginal_contents;
   ASSERT_TRUE(file_util::ReadFileToString(page_file_path, &orginal_contents));
   // Get file URL.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
   // Get BODY's text content in DOM.
   WebFrameImpl* web_frame =
@@ skipping 17 matching lines @@
   // need to add MOTW to original_contents.
   std::string motw_declaration =
     webkit_glue::DomSerializer::GenerateMarkOfTheWebDeclaration(file_url);
   orginal_contents = motw_declaration + orginal_contents;
   ASSERT_EQ(orginal_contents, serialized_contents);
 }
 
 // Test situation of html entities in attribute value when serializing
 // HTML DOM.
 TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEntitiesInAttributeValue) {
-  std::wstring page_file_path = data_dir_;
-  file_util::AppendToPath(&page_file_path,
-      L"dom_serializer/htmlentities_in_attribute_value.htm");
+  FilePath page_file_path = data_dir_;
+  page_file_path = page_file_path.AppendASCII("dom_serializer");
+  page_file_path =
+      page_file_path.AppendASCII("htmlentities_in_attribute_value.htm");
   // Read original contents for later comparison.
   std::string orginal_contents;
   ASSERT_TRUE(file_util::ReadFileToString(page_file_path, &orginal_contents));
   // Get file URL.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
   // Get value of BODY's title attribute in DOM.
   WebFrameImpl* web_frame =
@@ skipping 22 matching lines @@
 }
 
 // Test situation of BASE tag in original document when serializing HTML DOM.
 // When serializing, we should comment the BASE tag, append a new BASE tag.
 // rewrite all the savable URLs to relative local path, and change other URLs
 // to absolute URLs.
 TEST_F(DomSerializerTests, SerialzeHTMLDOMWithBaseTag) {
   // There are total 2 available base tags in this test file.
   const int kTotalBaseTagCountInTestFile = 2;
 
-  FilePath page_file_path = FilePath::FromWStringHack(data_dir_).AppendASCII(
-      "dom_serializer");
+  FilePath page_file_path = data_dir_.AppendASCII("dom_serializer");
   file_util::EnsureEndsWithSeparator(&page_file_path);
 
   // Get page dir URL which is base URL of this file.
-  GURL path_dir_url = net::FilePathToFileURL(page_file_path.ToWStringHack());
+  GURL path_dir_url = net::FilePathToFileURL(page_file_path);
   // Get file path.
   page_file_path =
       page_file_path.AppendASCII("html_doc_has_base_tag.htm");
   // Get file URL.
-  GURL file_url = net::FilePathToFileURL(page_file_path.ToWStringHack());
+  GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
   // Since for this test, we assume there is no savable sub-resource links for
   // this test file, also all links are relative URLs in this test file, so we
   // need to check those relative URLs and make sure document has BASE tag.
   WebFrameImpl* web_frame =
       webkit_glue::GetWebFrameImplFromWebViewForSpecificURL(
           test_shell_->webView(), file_url);
   ASSERT_TRUE(web_frame != NULL);
@@ skipping 78 matching lines @@
   }
   // We have one more added BASE tag which is generated by JavaScript.
   ASSERT_EQ(new_base_tag_count, original_base_tag_count + 1);
   // Make sure in new document, the base URL is equal with the |path_dir_url|.
   GURL new_base_url(
       webkit_glue::StringToStdString(doc->baseURL()));
   ASSERT_EQ(new_base_url, path_dir_url);
 }
 
 }  // namespace