Safe browsing cleanup:...

chrome/browser/safe_browsing/safe_browsing_service.cc

Index: chrome/browser/safe_browsing/safe_browsing_service.cc
===================================================================
--- chrome/browser/safe_browsing/safe_browsing_service.cc	(revision 8772)
+++ chrome/browser/safe_browsing/safe_browsing_service.cc	(working copy)
@@ -55,10 +55,11 @@
   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();
@@ -394,13 +395,11 @@
   if (database_)
     return database_;
 
-  std::wstring path;
+  FilePath path;
   bool result = PathService::Get(chrome::DIR_USER_DATA, &path);
   DCHECK(result);
+  path = path.Append(chrome::kSafeBrowsingFilename);
 
-  path.append(L"\\");
-  path.append(chrome::kSafeBrowsingFilename);
-
   Time before = Time::Now();
   SafeBrowsingDatabase* database = SafeBrowsingDatabase::Create();
   Callback0::Type* chunk_callback =