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

Unified Diff: chrome/browser/importer/importer_unittest.cc

Issue 271099: Re-try r29078: Remove some deprecated file_util wstring functions. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 | « chrome/browser/importer/firefox3_importer.cc ('k') | chrome/browser/jumplist.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/importer_unittest.cc
===================================================================
--- chrome/browser/importer/importer_unittest.cc (revision 29088)
+++ chrome/browser/importer/importer_unittest.cc (working copy)
@@ -49,7 +49,7 @@
virtual void TearDown() {
// Deletes the profile and cleans up the profile directory.
ASSERT_TRUE(file_util::Delete(test_path_, true));
- ASSERT_FALSE(file_util::PathExists(test_path_));
+ ASSERT_FALSE(file_util::PathExists(FilePath::FromWStringHack(test_path_)));
}
void Firefox3xImporterTest(std::wstring profile_dir,
@@ -70,7 +70,7 @@
if (import_search_plugins) {
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
file_util::AppendToPath(&data_path, L"firefox3_searchplugins");
- if (!file_util::PathExists(data_path)) {
+ if (!file_util::PathExists(FilePath::FromWStringHack(data_path))) {
// TODO(maruel): Create search test data that we can open source!
LOG(ERROR) << L"Missing internal test data";
return;
@@ -646,7 +646,7 @@
CreateDirectory(search_engine_path.c_str(), NULL);
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
file_util::AppendToPath(&data_path, L"firefox2_searchplugins");
- if (!file_util::PathExists(data_path)) {
+ if (!file_util::PathExists(FilePath::FromWStringHack(data_path))) {
// TODO(maruel): Create test data that we can open source!
LOG(ERROR) << L"Missing internal test data";
return;
« no previous file with comments | « chrome/browser/importer/firefox3_importer.cc ('k') | chrome/browser/jumplist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698