Safe browsing cleanup:...

chrome/browser/safe_browsing/database_perftest.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 <stdio.h>
 #include <stdlib.h>
 
 #include <limits>
 #include <set>
 
@@ skipping 371 matching lines @@
 
 
 class SafeBrowsingDatabaseTest {
  public:
   SafeBrowsingDatabaseTest(const FilePath& filename) {
     logging::InitLogging(
         NULL, logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
         logging::LOCK_LOG_FILE,
         logging::DELETE_OLD_LOG_FILE);
 
-    std::wstring tmp_path;
+    FilePath tmp_path;
     PathService::Get(base::DIR_TEMP, &tmp_path);
-    path_ = FilePath::FromWStringHack(tmp_path);
-    path_ = path_.Append(filename);
+    path_ = tmp_path.Append(filename);
   }
 
   void Create(int size) {
     file_util::Delete(path_, false);
 
     scoped_ptr<SafeBrowsingDatabase> database(SafeBrowsingDatabase::Create());
     database->SetSynchronous();
-    EXPECT_TRUE(database->Init(path_.ToWStringHack(), NULL));
+    EXPECT_TRUE(database->Init(path_, NULL));
 
     int chunk_id = 0;
     int total_host_keys = size;
     int host_keys_per_chunk = 100;
 
     std::deque<SBChunk>* chunks = new std::deque<SBChunk>;
 
     for (int i = 0; i < total_host_keys / host_keys_per_chunk; ++i) {
       chunks->push_back(SBChunk());
       chunks->back().chunk_number = ++chunk_id;
@@ skipping 12 matching lines @@
 
     database->InsertChunks("goog-malware", chunks);
   }
 
   void Read(bool use_bloom_filter) {
     int keys_to_read = 500;
     file_util::EvictFileFromSystemCache(path_);
 
     scoped_ptr<SafeBrowsingDatabase> database(SafeBrowsingDatabase::Create());
     database->SetSynchronous();
-    EXPECT_TRUE(database->Init(path_.ToWStringHack(), NULL));
+    EXPECT_TRUE(database->Init(path_, NULL));
 
     PerfTimer total_timer;
     int64 db_ms = 0;
     int keys_from_db = 0;
     for (int i = 0; i < keys_to_read; ++i) {
       int key = base::RandInt(std::numeric_limits<int>::min(),
                               std::numeric_limits<int>::max());
 
       std::string url = StringPrintf("http://www.%d.com/blah.html", key);
 
@@ skipping 21 matching lines @@
     int64 total_ms = total_timer.Elapsed().InMilliseconds();
 
     DLOG(INFO) << path_.BaseName().value() << " read " << keys_to_read <<
         " entries in " << total_ms << " ms.  "  << keys_from_db <<
         " keys were read from the db, with average read taking " <<
         db_ms / keys_from_db << " ms";
   }
 
   void BuildBloomFilter() {
     file_util::EvictFileFromSystemCache(path_);
-    file_util::Delete(SafeBrowsingDatabase::BloomFilterFilename(
-          path_.ToWStringHack()), false);
+    file_util::Delete(SafeBrowsingDatabase::BloomFilterFilename(path_), false);
 
     PerfTimer total_timer;
 
     scoped_ptr<SafeBrowsingDatabase> database(SafeBrowsingDatabase::Create());
     database->SetSynchronous();
-    EXPECT_TRUE(database->Init(path_.ToWStringHack(), NULL));
+    EXPECT_TRUE(database->Init(path_, NULL));
 
     int64 total_ms = total_timer.Elapsed().InMilliseconds();
 
     DLOG(INFO) << path_.BaseName().value() <<
         " built bloom filter in " << total_ms << " ms.";
   }
 
  private:
   FilePath path_;
 };
@@ skipping 41 matching lines @@
 // Test how long bloom filter creation takes.
 TEST(SafeBrowsingDatabase, DISABLED_BuildBloomFilter250K) {
   SafeBrowsingDatabaseTest db(FilePath(FILE_PATH_LITERAL("SafeBrowsing250K")));
   db.BuildBloomFilter();
 }
 
 TEST(SafeBrowsingDatabase, DISABLED_BuildBloomFilter500K) {
   SafeBrowsingDatabaseTest db(FilePath(FILE_PATH_LITERAL("SafeBrowsing500K")));
   db.BuildBloomFilter();
 }