Safe browsing cleanup:...

chrome/browser/safe_browsing/safe_browsing_database_unittest.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.
 //
 // Unit tests for the SafeBrowsing storage system.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/sha2.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/safe_browsing/protocol_parser.h"
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
 #include "chrome/common/chrome_switches.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 using base::Time;
 
-static const wchar_t kBloomSuffix[] = L" Bloom";
+static const FilePath::CharType kBloomSuffix[] =
+    FILE_PATH_LITERAL(" Bloom");
+static const FilePath::CharType kFilterSuffix[] =
+    FILE_PATH_LITERAL(" Filter");
 
 namespace {
   SBPrefix Sha256Prefix(const std::string& str) {
     SBPrefix hash;
     base::SHA256HashString(str, &hash, sizeof(hash));
     return hash;
   }
 
   // Helper function to do an AddDel or SubDel command.
   void DelChunk(SafeBrowsingDatabase* db,
@@ skipping 15 matching lines @@
     DelChunk(db, list, chunk_id, false);
   }
 
   void SubDelChunk(SafeBrowsingDatabase* db,
                    const std::string& list,
                    int chunk_id) {
     DelChunk(db, list, chunk_id, true);
   }
 
   // Common database test set up code.
-  std::wstring GetTestDatabaseName() {
+  FilePath GetTestDatabaseName() {
     FilePath filename;
     PathService::Get(base::DIR_TEMP, &filename);
     filename = filename.AppendASCII("SafeBrowsingTestDatabase");
-    return filename.ToWStringHack();
+    return filename;
   }
 
   SafeBrowsingDatabase* SetupTestDatabase() {
-    std::wstring filename = GetTestDatabaseName();
+    FilePath filename = GetTestDatabaseName();
 
     // In case it existed from a previous run.
-    file_util::Delete(filename + kBloomSuffix, false);
+    file_util::Delete(FilePath(filename.value() + kBloomSuffix), false);
     file_util::Delete(filename, false);
 
     SafeBrowsingDatabase* database = SafeBrowsingDatabase::Create();
     database->SetSynchronous();
     EXPECT_TRUE(database->Init(filename, NULL));
 
     return database;
   }
 
   void TearDownTestDatabase(SafeBrowsingDatabase* database) {
-    std::wstring filename = database->filename();
+    FilePath filename = database->filename();
     delete database;
     file_util::Delete(filename, false);
-    file_util::Delete(filename + L" Filter", false);
+    file_util::Delete(FilePath(filename.value() + kFilterSuffix),
+                      false);
   }
 
   void GetListsInfo(SafeBrowsingDatabase* database,
                     std::vector<SBListChunkRanges>* lists) {
     EXPECT_TRUE(database->UpdateStarted());
     database->GetListsInfo(lists);
     database->UpdateFinished(true);
   }
 
 }  // namespace
@@ skipping 944 matching lines @@
                   std::vector<SBChunkDelete>* deletes) {
 // TODO(pinkerton): I don't think posix has any concept of IO counters, but
 // we can uncomment this when we implement ProcessMetrics::GetIOCounters
 #if defined(OS_WIN) || defined(OS_LINUX)
   IoCounters before, after;
 #endif
 
   FilePath path;
   PathService::Get(base::DIR_TEMP, &path);
   path = path.AppendASCII("SafeBrowsingTestDatabase");
-  std::wstring filename = path.ToWStringHack();
 
   // In case it existed from a previous run.
-  file_util::Delete(filename, false);
+  file_util::Delete(path, false);
 
   if (!initial_db.empty()) {
     std::wstring full_initial_db = GetFullSBDataPath(initial_db);
-    ASSERT_TRUE(file_util::CopyFile(full_initial_db, filename));
+    ASSERT_TRUE(file_util::CopyFile(
+        FilePath::FromWStringHack(full_initial_db), path));
   }
 
   SafeBrowsingDatabase* database = SafeBrowsingDatabase::Create();
   database->SetSynchronous();
-  EXPECT_TRUE(database->Init(filename, NULL));
+  EXPECT_TRUE(database->Init(path, NULL));
 
   Time before_time = Time::Now();
   base::ProcessHandle handle = base::Process::Current().handle();
   scoped_ptr<base::ProcessMetrics> metric(
       base::ProcessMetrics::CreateProcessMetrics(handle));
 #if defined(OS_WIN) || defined(OS_LINUX)
   CHECK(metric->GetIOCounters(&before));
 #endif
 
   std::vector<SBListChunkRanges> lists;
@@ skipping 164 matching lines @@
 TEST(SafeBrowsingDatabase, DISABLED_DatabaseOldLotsofDeletesIO) {
   std::vector<ChunksInfo> chunks;
   std::vector<SBChunkDelete>* deletes = new std::vector<SBChunkDelete>;
   SBChunkDelete del;
   del.is_sub_del = false;
   del.list_name = safe_browsing_util::kMalwareList;
   del.chunk_del.push_back(ChunkRange(3539, 3579));
   deletes->push_back(del);
   PeformUpdate(GetOldSafeBrowsingPath(), chunks, deletes);
 }