Fix to use FilePath version of PathService::Get....

chrome/browser/rlz/rlz.cc

 // Copyright (c) 2009 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.
 //
 // This code glues the RLZ library DLL with Chrome. It allows Chrome to work
 // with or without the DLL being present. If the DLL is not present the
 // functions do nothing and just return false.
 
 #include "chrome/browser/rlz/rlz.h"
 
@@ skipping 62 matching lines @@
 ClearAllProductEventsFn clear_all_events = NULL;
 SendFinancialPingFn send_ping = NULL;
 
 template <typename FuncT>
 FuncT WireExport(HMODULE module, const char* export_name) {
   void* entry_point = ::GetProcAddress(module, export_name);
   return (module)? reinterpret_cast<FuncT>(entry_point) : NULL;
 }
 
 HMODULE LoadRLZLibraryInternal(int directory_key) {
-  std::wstring rlz_path;
+  FilePath rlz_path;
   if (!PathService::Get(directory_key, &rlz_path))
     return NULL;
-  file_util::AppendToPath(&rlz_path, L"rlz.dll");
-  return ::LoadLibraryW(rlz_path.c_str());
+  rlz_path = rlz_path.AppendASCII("rlz.dll");
+  return ::LoadLibraryW(rlz_path.value().c_str());
 }
 
 bool LoadRLZLibrary(int directory_key) {
   rlz_dll = LoadRLZLibraryInternal(directory_key);
   if (!rlz_dll) {
     // As a last resort we can try the EXE directory.
     if (directory_key != base::DIR_EXE)
       rlz_dll = LoadRLZLibraryInternal(base::DIR_EXE);
   }
   if (rlz_dll) {
@@ skipping 156 matching lines @@
     // Schedule the daily RLZ ping.
     base::Thread* thread = g_browser_process->file_thread();
     if (thread)
       thread->message_loop()->PostTask(FROM_HERE, new DailyPingTask());
   }
 
  private:
   bool IsGoogleDefaultSearch() {
     if (!g_browser_process)
       return false;
-    std::wstring user_data_dir;
+    FilePath user_data_dir;
     if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
       return false;
     ProfileManager* profile_manager = g_browser_process->profile_manager();
-    Profile* profile = profile_manager->
-        GetDefaultProfile(FilePath::FromWStringHack(user_data_dir));
+    Profile* profile = profile_manager->GetDefaultProfile(user_data_dir);
     if (!profile)
       return false;
     const TemplateURL* url_template =
         profile->GetTemplateURLModel()->GetDefaultSearchProvider();
     if (!url_template)
       return false;
     return url_template->url()->HasGoogleBaseURLs();
   }
 
   int directory_key_;
@@ skipping 56 matching lines @@
     cached_ommibox_rlz.assign(str_rlz);
   }
   *rlz = str_rlz;
   return true;
 }
 
 // static
 void RLZTracker::CleanupRlz() {
   OmniBoxUsageObserver::DeleteInstance();
 }