diff options
Diffstat (limited to 'webkit/glue/dom_operations_unittest.cc')
-rw-r--r-- | webkit/glue/dom_operations_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/glue/dom_operations_unittest.cc b/webkit/glue/dom_operations_unittest.cc index 05aeb76..141a819 100644 --- a/webkit/glue/dom_operations_unittest.cc +++ b/webkit/glue/dom_operations_unittest.cc @@ -20,7 +20,7 @@ class DomOperationsTests : public TestShellTest { // Test function GetAllSavableResourceLinksForCurrentPage with a web page. // We expect result of GetAllSavableResourceLinksForCurrentPage exactly // matches expected_resources_set. - void GetSavableResourceLinksForPage(const FilePath& page_file_path, + void GetSavableResourceLinksForPage(const base::FilePath& page_file_path, const std::set<GURL>& expected_resources_set); protected: @@ -36,7 +36,7 @@ class DomOperationsTests : public TestShellTest { void DomOperationsTests::GetSavableResourceLinksForPage( - const FilePath& page_file_path, + const base::FilePath& page_file_path, const std::set<GURL>& expected_resources_set) { // Convert local file path to file URL. GURL file_url = net::FilePathToFileURL(page_file_path); @@ -82,7 +82,7 @@ void DomOperationsTests::GetSavableResourceLinksForPage( TEST_F(DomOperationsTests, GetSavableResourceLinksWithPageHasValidLinks) { std::set<GURL> expected_resources_set; // Set directory of test data. - FilePath page_file_path = data_dir_.AppendASCII("dom_serializer"); + base::FilePath page_file_path = data_dir_.AppendASCII("dom_serializer"); const char* expected_sub_resource_links[] = { "file:///c:/yt/css/base_all-vfl36460.css", @@ -98,7 +98,7 @@ TEST_F(DomOperationsTests, GetSavableResourceLinksWithPageHasValidLinks) { expected_resources_set.insert(GURL(expected_sub_resource_links[i])); // Add all expected links of frame to expected set. for (size_t i = 0; i < arraysize(expected_frame_links); ++i) { - const FilePath expected_frame_url = + const base::FilePath expected_frame_url = page_file_path.AppendASCII(expected_frame_links[i]); expected_resources_set.insert( net::FilePathToFileURL(expected_frame_url)); @@ -113,14 +113,14 @@ TEST_F(DomOperationsTests, GetSavableResourceLinksWithPageHasValidLinks) { TEST_F(DomOperationsTests, GetSavableResourceLinksWithPageHasInvalidLinks) { std::set<GURL> expected_resources_set; // Set directory of test data. - FilePath page_file_path = data_dir_.AppendASCII("dom_serializer"); + base::FilePath page_file_path = data_dir_.AppendASCII("dom_serializer"); const char* expected_frame_links[] = { "youtube_2.htm" }; // Add all expected links of frame to expected set. for (size_t i = 0; i < arraysize(expected_frame_links); ++i) { - FilePath expected_frame_url = + base::FilePath expected_frame_url = page_file_path.AppendASCII(expected_frame_links[i]); expected_resources_set.insert( net::FilePathToFileURL(expected_frame_url)); |