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

Unified Diff: chrome/browser/printing/printing_layout_uitest.cc

Issue 13315: Move file enumeration to filepaths. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years 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
Index: chrome/browser/printing/printing_layout_uitest.cc
===================================================================
--- chrome/browser/printing/printing_layout_uitest.cc (revision 6739)
+++ chrome/browser/printing/printing_layout_uitest.cc (working copy)
@@ -332,14 +332,15 @@
bool found_emf = false;
bool found_prn = false;
for (int i = 0; i < 100; ++i) {
- file_util::FileEnumerator enumerator(emf_path(), false,
- file_util::FileEnumerator::FILES);
+ file_util::FileEnumerator enumerator(
+ FilePath::FromWStringHack(emf_path()), false,
+ file_util::FileEnumerator::FILES);
emf_file.clear();
prn_file.clear();
found_emf = false;
found_prn = false;
std::wstring file;
- while (!(file = enumerator.Next()).empty()) {
+ while (!(file = enumerator.Next().ToWStringHack()).empty()) {
std::wstring ext = file_util::GetFileExtensionFromPath(file);
if (!_wcsicmp(ext.c_str(), L"emf")) {
EXPECT_FALSE(found_emf) << "Found a leftover .EMF file: \"" <<
« no previous file with comments | « chrome/browser/importer/ie_importer.cc ('k') | chrome/browser/safe_browsing/safe_browsing_database_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698