summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/importer')
-rw-r--r--chrome/browser/importer/firefox2_importer.cc2
-rw-r--r--chrome/browser/importer/firefox3_importer.cc6
-rw-r--r--chrome/browser/importer/importer_unittest.cc6
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc
index 794d97e..c529e39 100644
--- a/chrome/browser/importer/firefox2_importer.cc
+++ b/chrome/browser/importer/firefox2_importer.cc
@@ -291,7 +291,7 @@ void Firefox2Importer::ImportPasswords() {
// exist, we try to find its older version.
std::wstring file = source_path_;
file_util::AppendToPath(&file, L"signons2.txt");
- if (!file_util::PathExists(FilePath::FromWStringHack(file))) {
+ if (!file_util::PathExists(file)) {
file = source_path_;
file_util::AppendToPath(&file, L"signons.txt");
}
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index c347b0c..10d2855 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -68,7 +68,7 @@ void Firefox3Importer::StartImport(ProfileInfo profile_info,
void Firefox3Importer::ImportHistory() {
std::wstring file = source_path_;
file_util::AppendToPath(&file, L"places.sqlite");
- if (!file_util::PathExists(FilePath::FromWStringHack(file)))
+ if (!file_util::PathExists(file))
return;
sqlite3* sqlite;
@@ -116,7 +116,7 @@ void Firefox3Importer::ImportHistory() {
void Firefox3Importer::ImportBookmarks() {
std::wstring file = source_path_;
file_util::AppendToPath(&file, L"places.sqlite");
- if (!file_util::PathExists(FilePath::FromWStringHack(file)))
+ if (!file_util::PathExists(file))
return;
sqlite3* sqlite;
@@ -314,7 +314,7 @@ void Firefox3Importer::GetSearchEnginesXMLFiles(
std::vector<std::wstring>* files) {
std::wstring file = source_path_;
file_util::AppendToPath(&file, L"search.sqlite");
- if (!file_util::PathExists(FilePath::FromWStringHack(file)))
+ if (!file_util::PathExists(file))
return;
sqlite3* sqlite;
diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc
index e6d09af6..b6ef1f6 100644
--- a/chrome/browser/importer/importer_unittest.cc
+++ b/chrome/browser/importer/importer_unittest.cc
@@ -49,7 +49,7 @@ class ImporterTest : public testing::Test {
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(FilePath::FromWStringHack(test_path_)));
+ ASSERT_FALSE(file_util::PathExists(test_path_));
}
void Firefox3xImporterTest(std::wstring profile_dir,
@@ -70,7 +70,7 @@ class ImporterTest : public testing::Test {
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(FilePath::FromWStringHack(data_path))) {
+ if (!file_util::PathExists(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 @@ TEST_F(ImporterTest, Firefox2Importer) {
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(FilePath::FromWStringHack(data_path))) {
+ if (!file_util::PathExists(data_path)) {
// TODO(maruel): Create test data that we can open source!
LOG(ERROR) << L"Missing internal test data";
return;