Safe browsing cleanup:...

chrome/browser/safe_browsing/safe_browsing_database_impl.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_impl.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 58 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(bloom_write_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(reset_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(resume_factory_(this)),
       disk_delay_(kMaxThreadHoldupMs) {
 }
 
 SafeBrowsingDatabaseImpl::~SafeBrowsingDatabaseImpl() {
   Close();
 }
 
-bool SafeBrowsingDatabaseImpl::Init(const std::wstring& filename,
+bool SafeBrowsingDatabaseImpl::Init(const FilePath& filename,
                                     Callback0::Type* chunk_inserted_callback) {
   DCHECK(!init_ && filename_.empty());
 
   filename_ = filename;
   if (!Open())
     return false;
 
   bool load_filter = false;
   if (!DoesSqliteTableExist(db_, "hosts")) {
     if (!CreateTables()) {
@@ skipping 17 matching lines @@
         new BloomFilter(kBloomFilterMinSize * kBloomFilterSizeRatio);
   }
 
   init_ = true;
   chunk_inserted_callback_.reset(chunk_inserted_callback);
 
   return true;
 }
 
 bool SafeBrowsingDatabaseImpl::Open() {
-  if (sqlite3_open(WideToUTF8(filename_).c_str(), &db_) != SQLITE_OK)
+  if (OpenSqliteDb(filename_, &db_) != SQLITE_OK)
     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_));
   bloom_filter_read_count_= 0;
   bloom_filter_fp_count_ = 0;
   bloom_filter_building_ = false;
@@ skipping 1088 matching lines @@
       kOnResumeHoldupMs);
 }
 
 void SafeBrowsingDatabaseImpl::OnResumeDone() {
   disk_delay_ = kMaxThreadHoldupMs;
 }
 
 void SafeBrowsingDatabaseImpl::SetSynchronous() {
   asynchronous_ = false;
 }