summaryrefslogtreecommitdiffstats
path: root/webkit/database
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 22:22:07 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 22:22:07 +0000
commit967d18bad65a0dc0cf8d0207cbd2cf82651752b8 (patch)
tree2d06825366c1d876dd432b60db417565dc3d4e7e /webkit/database
parent849991d6cebb241a26db85ba50b4e0c2a6b6a80c (diff)
downloadchromium_src-967d18bad65a0dc0cf8d0207cbd2cf82651752b8.zip
chromium_src-967d18bad65a0dc0cf8d0207cbd2cf82651752b8.tar.gz
chromium_src-967d18bad65a0dc0cf8d0207cbd2cf82651752b8.tar.bz2
wstring: remove some simple instances of ToWStringHack
BUG=69467 Review URL: http://codereview.chromium.org/6588131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/database')
-rw-r--r--webkit/database/database_tracker.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc
index 20f5971..5911ad2 100644
--- a/webkit/database/database_tracker.cc
+++ b/webkit/database/database_tracker.cc
@@ -715,9 +715,11 @@ void DatabaseTracker::ClearLocalState(const FilePath& profile_path) {
for (FilePath file_path = file_enumerator.Next(); !file_path.empty();
file_path = file_enumerator.Next()) {
if (file_path.BaseName() != FilePath(kTrackerDatabaseFileName)) {
- if (!StartsWith(file_path.BaseName().ToWStringHack(),
- ASCIIToWide(kExtensionOriginIdentifierPrefix), true))
+ std::string basename = file_path.BaseName().MaybeAsASCII();
+ if (!basename.empty() &&
+ !StartsWithASCII(basename, kExtensionOriginIdentifierPrefix, true)) {
file_util::Delete(file_path, true);
+ }
}
}
}