Safe browsing cleanup:...

chrome/browser/safe_browsing/safe_browsing_service.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_service.h"
 
 #include "base/command_line.h"
 #include "base/histogram.h"
 #include "base/logging.h"
@@ skipping 37 matching lines @@
   base::SystemMonitor* monitor = base::SystemMonitor::Get();
   if (monitor)
     monitor->RemoveObserver(this);
 }
 
 // Only called on the UI thread.
 void SafeBrowsingService::Initialize(MessageLoop* io_loop) {
   io_loop_ = io_loop;
 
   // Get the profile's preference for SafeBrowsing.
-  std::wstring user_data_dir;
+  FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   ProfileManager* profile_manager = g_browser_process->profile_manager();
-  Profile* profile = profile_manager->GetDefaultProfile(user_data_dir);
+  Profile* profile = profile_manager->GetDefaultProfile(
+      user_data_dir.ToWStringHack());
   PrefService* pref_service = profile->GetPrefs();
   if (pref_service->GetBoolean(prefs::kSafeBrowsingEnabled))
     Start();
 }
 
 // Start up SafeBrowsing objects. This can be called at browser start, or when
 // the user checks the "Enable SafeBrowsing" option in the Advanced options UI.
 void SafeBrowsingService::Start() {
   DCHECK(!db_thread_.get());
   db_thread_.reset(new base::Thread("Chrome_SafeBrowsingThread"));
@@ skipping 315 matching lines @@
     // We may have cached results for previous GetHash queries.
     HandleOneCheck(check, check->full_hits);
   }
 }
 
 SafeBrowsingDatabase* SafeBrowsingService::GetDatabase() {
   DCHECK(MessageLoop::current() == db_thread_->message_loop());
   if (database_)
     return database_;
 
-  std::wstring path;
+  FilePath path;
   bool result = PathService::Get(chrome::DIR_USER_DATA, &path);
   DCHECK(result);
-
-  path.append(L"\\");
-  path.append(chrome::kSafeBrowsingFilename);
+  path = path.Append(chrome::kSafeBrowsingFilename);
 
   Time before = Time::Now();
   SafeBrowsingDatabase* database = SafeBrowsingDatabase::Create();
   Callback0::Type* chunk_callback =
       NewCallback(this, &SafeBrowsingService::ChunkInserted);
   bool init_success = database->Init(path, chunk_callback);
 
   io_loop_->PostTask(FROM_HERE, NewRunnableMethod(
       this, &SafeBrowsingService::DatabaseLoadComplete, !init_success));
 
@@ skipping 310 matching lines @@
   DCHECK(MessageLoop::current() == io_loop_);
   HISTOGRAM_COUNTS(L"SB.QueueDepth", queued_checks_.size());
   while (!queued_checks_.empty()) {
     QueuedCheck check = queued_checks_.front();
     HISTOGRAM_TIMES(L"SB.QueueDelay", Time::Now() - check.start);
     CheckUrl(check.url, check.client);
     queued_checks_.pop_front();
   }
 }