diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 20:18:09 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 20:18:09 +0000 |
| commit | dcd16611096dcc5e7651763ff888135e0fb305fc (patch) | |
| tree | fe1f69c236a92bd701bad04a6ccc1d30c08c6217 /chrome/browser/download/save_page_browsertest.cc | |
| parent | 6dd1c54f48283e9c61b097b59feecf8d221e123b (diff) | |
| download | chromium_src-dcd16611096dcc5e7651763ff888135e0fb305fc.zip chromium_src-dcd16611096dcc5e7651763ff888135e0fb305fc.tar.gz chromium_src-dcd16611096dcc5e7651763ff888135e0fb305fc.tar.bz2 | |
Move PathIsWritable, DirectoryExists, ContentsEqual, and TextContentsEqual to the base namespace.
TBR=sky
Review URL: https://codereview.chromium.org/19052005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/save_page_browsertest.cc')
| -rw-r--r-- | chrome/browser/download/save_page_browsertest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index 9378f06..afaef69 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -403,7 +403,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_SaveHTMLOnly) { EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible()); EXPECT_TRUE(base::PathExists(full_file_name)); EXPECT_FALSE(base::PathExists(dir)); - EXPECT_TRUE(file_util::ContentsEqual(test_dir_.Append(base::FilePath( + EXPECT_TRUE(base::ContentsEqual(test_dir_.Append(base::FilePath( kTestDir)).Append(FILE_PATH_LITERAL("a.htm")), full_file_name)); } @@ -527,7 +527,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_SaveViewSourceHTMLOnly) { EXPECT_TRUE(base::PathExists(full_file_name)); EXPECT_FALSE(base::PathExists(dir)); - EXPECT_TRUE(file_util::ContentsEqual( + EXPECT_TRUE(base::ContentsEqual( test_dir_.Append(base::FilePath(kTestDir)).Append(file_name), full_file_name)); } @@ -562,13 +562,13 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_SaveCompleteHTML) { EXPECT_TRUE(base::PathExists(full_file_name)); EXPECT_TRUE(base::PathExists(dir)); - EXPECT_TRUE(file_util::TextContentsEqual( + EXPECT_TRUE(base::TextContentsEqual( test_dir_.Append(base::FilePath(kTestDir)).AppendASCII("b.saved1.htm"), full_file_name)); - EXPECT_TRUE(file_util::ContentsEqual( + EXPECT_TRUE(base::ContentsEqual( test_dir_.Append(base::FilePath(kTestDir)).AppendASCII("1.png"), dir.AppendASCII("1.png"))); - EXPECT_TRUE(file_util::ContentsEqual( + EXPECT_TRUE(base::ContentsEqual( test_dir_.Append(base::FilePath(kTestDir)).AppendASCII("1.css"), dir.AppendASCII("1.css"))); } @@ -660,13 +660,13 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_FileNameFromPageTitle) { EXPECT_TRUE(base::PathExists(full_file_name)); EXPECT_TRUE(base::PathExists(dir)); - EXPECT_TRUE(file_util::TextContentsEqual( + EXPECT_TRUE(base::TextContentsEqual( test_dir_.Append(base::FilePath(kTestDir)).AppendASCII("b.saved2.htm"), full_file_name)); - EXPECT_TRUE(file_util::ContentsEqual( + EXPECT_TRUE(base::ContentsEqual( test_dir_.Append(base::FilePath(kTestDir)).AppendASCII("1.png"), dir.AppendASCII("1.png"))); - EXPECT_TRUE(file_util::ContentsEqual( + EXPECT_TRUE(base::ContentsEqual( test_dir_.Append(base::FilePath(kTestDir)).AppendASCII("1.css"), dir.AppendASCII("1.css"))); } @@ -712,7 +712,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, MAYBE_RemoveFromList) { EXPECT_TRUE(base::PathExists(full_file_name)); EXPECT_FALSE(base::PathExists(dir)); - EXPECT_TRUE(file_util::ContentsEqual(test_dir_.Append(base::FilePath( + EXPECT_TRUE(base::ContentsEqual(test_dir_.Append(base::FilePath( kTestDir)).Append(FILE_PATH_LITERAL("a.htm")), full_file_name)); } |