Safe browsing cleanup:...

chrome/browser/safe_browsing/safe_browsing_database_bloom.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/safe_browsing_database_bloom.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 24 matching lines @@
 
 // When we awake from a low power state, we try to avoid doing expensive disk
 // operations for a few minutes to let the system page itself in and settle
 // down.
 static const int kOnResumeHoldupMs = 5 * 60 * 1000;  // 5 minutes.
 
 // The maximum staleness for a cached entry.
 static const int kMaxStalenessMinutes = 45;
 
 // The bloom filter based file name suffix.
-static const wchar_t kBloomFilterFileSuffix[] = L" Bloom";
+static const FilePath::CharType kBloomFilterFileSuffix[] =
+    FILE_PATH_LITERAL(" Bloom");
 
 
 // Implementation --------------------------------------------------------------
 
 SafeBrowsingDatabaseBloom::SafeBrowsingDatabaseBloom()
     : db_(NULL),
       init_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(reset_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(resume_factory_(this)),
       add_count_(0),
       did_resume_(false) {
 }
 
 SafeBrowsingDatabaseBloom::~SafeBrowsingDatabaseBloom() {
   Close();
 }
 
-bool SafeBrowsingDatabaseBloom::Init(const std::wstring& filename,
+bool SafeBrowsingDatabaseBloom::Init(const FilePath& filename,
                                      Callback0::Type* chunk_inserted_callback) {
   DCHECK(!init_ && filename_.empty());
 
-  filename_ = filename + kBloomFilterFileSuffix;
+  filename_ = FilePath(filename.value() + kBloomFilterFileSuffix);
   bloom_filter_filename_ = BloomFilterFilename(filename_);
 
   hash_cache_.reset(new HashCache);
 
   LoadBloomFilter();
 
   init_ = true;
   chunk_inserted_callback_.reset(chunk_inserted_callback);
 
   return true;
@@ skipping 26 matching lines @@
   SB_DLOG(INFO) << "SafeBrowsingDatabase read bloom filter in "
                 << (Time::Now() - before).InMilliseconds() << " ms";
 
   bloom_filter_ = new BloomFilter(data, size);
 }
 
 bool SafeBrowsingDatabaseBloom::Open() {
   if (db_)
     return true;
 
-  if (sqlite3_open(WideToUTF8(filename_).c_str(), &db_) != SQLITE_OK) {
+  if (OpenSqliteDb(filename_, &db_) != SQLITE_OK) {
     sqlite3_close(db_);
     db_ = NULL;
     return false;
   }
 
   // Run the database in exclusive mode. Nobody else should be accessing the
   // database while we're running, and this will give somewhat improved perf.
   sqlite3_exec(db_, "PRAGMA locking_mode=EXCLUSIVE", NULL, NULL, NULL);
 
   statement_cache_.reset(new SqliteStatementCache(db_));
@@ skipping 1361 matching lines @@
   if (did_resume_) {
     PlatformThread::Sleep(kOnResumeHoldupMs);
     did_resume_ = false;
   }
 }
 
 // This database is always synchronous since we don't need to worry about
 // blocking any incoming reads.
 void SafeBrowsingDatabaseBloom::SetSynchronous() {
 }