Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(856)

Unified Diff: chrome/browser/download/download_uitest.cc

Issue 8825: Begin the first small step towards using FilePath everywhere: (Closed)
Patch Set: works on windows Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/trace_event.cc ('k') | chrome/browser/download/save_page_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_uitest.cc
diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc
index e6c071e0b6aa3dc280b034aa543d083e189cff58..c9618416a67163cedc9e94c911198f96ae21c92e 100644
--- a/chrome/browser/download/download_uitest.cc
+++ b/chrome/browser/download/download_uitest.cc
@@ -73,7 +73,7 @@ class DownloadTest : public UITest {
// Find the path on the client.
std::wstring file_on_client(download_prefix_);
file_on_client.append(client_filename);
- EXPECT_PRED1(file_util::PathExists, file_on_client);
+ EXPECT_TRUE(file_util::PathExists(file_on_client));
// Find the path on the server.
std::wstring file_on_server;
@@ -84,14 +84,15 @@ class DownloadTest : public UITest {
ASSERT_TRUE(file_util::PathExists(file_on_server));
// Check that we downloaded the file correctly.
- EXPECT_PRED2(file_util::ContentsEqual, file_on_server, file_on_client);
+ EXPECT_TRUE(file_util::ContentsEqual(file_on_server,
+ file_on_client));
// Check if the Zone Identifier is correclty set.
if (VolumeSupportsADS(file_on_client))
CheckZoneIdentifier(file_on_client);
// Delete the client copy of the file.
- EXPECT_PRED2(file_util::Delete, file_on_client, false);
+ EXPECT_TRUE(file_util::Delete(file_on_client, false));
}
void CleanUpDownload(const std::wstring& file) {
@@ -131,7 +132,7 @@ class DownloadTest : public UITest {
}
std::wstring filename = file_util::GetFilenameFromPath(url);
- EXPECT_PRED1(file_util::PathExists, download_prefix_ + filename);
+ EXPECT_TRUE(file_util::PathExists(download_prefix_ + filename));
// Delete the file we just downloaded.
for (int i = 0; i < 10; ++i) {
« no previous file with comments | « base/trace_event.cc ('k') | chrome/browser/download/save_page_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698