Fix to use FilePath in more unittests.

chrome/browser/browser_focus_uitest.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.
 
 #include "base/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 30 matching lines @@
 
 namespace {
 
 // The delay waited in some cases where we don't have a notifications for an
 // action we take.
 const int kActionDelayMs = 500;
 
 const wchar_t kSimplePage[] = L"files/focus/page_with_focus.html";
 const wchar_t kStealFocusPage[] = L"files/focus/page_steals_focus.html";
 const wchar_t kTypicalPage[] = L"files/focus/typical_page.html";
-const wchar_t kTypicalPageName[] = L"typical_page.html";
+const char kTypicalPageName[] = "typical_page.html";
 
 class BrowserFocusTest : public InProcessBrowserTest {
  public:
   BrowserFocusTest() {
     set_show_window(true);
     EnableDOMAutomation();
   }
 
   void CheckViewHasFocus(ViewID vid) {
     BrowserWindow* browser_window = browser()->window();
@@ skipping 79 matching lines @@
     return false;
   }
 #endif
 };
 
 class TestInterstitialPage : public InterstitialPage {
  public:
   TestInterstitialPage(TabContents* tab, bool new_navigation, const GURL& url)
       : InterstitialPage(tab, new_navigation, url),
         waiting_for_dom_response_(false) {
-    std::wstring file_path;
+    FilePath file_path;
     bool r = PathService::Get(chrome::DIR_TEST_DATA, &file_path);
     EXPECT_TRUE(r);
-    file_util::AppendToPath(&file_path, L"focus");
-    file_util::AppendToPath(&file_path, kTypicalPageName);
+    file_path = file_path.AppendASCII("focus");
+    file_path = file_path.AppendASCII(kTypicalPageName);
     r = file_util::ReadFileToString(file_path, &html_contents_);
     EXPECT_TRUE(r);
   }
 
   virtual std::string GetHTMLContents() {
     return html_contents_;
   }
 
   virtual void DomOperationResponse(const std::string& json_string,
                                     int automation_id) {
@@ skipping 536 matching lines @@
 
   // Open a regular page, crash, reload.
   ui_test_utils::NavigateToURL(browser(), server->TestServerPageW(kSimplePage));
   ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
   browser()->Reload();
   ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
   // Focus should now be on the tab contents.
   browser()->ShowDownloadsTab();
   CheckViewHasFocus(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW);
 }