linux: pass a bunch more ui tests.

chrome/test/ui/ui_test.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/test/ui/ui_test.h"
 
 #include <set>
 #include <vector>
 
 #include "base/base_switches.h"
@@ skipping 64 matching lines @@
 const wchar_t kExtraChromeFlagsSwitch[] = L"extra-chrome-flags";
 
 // By default error dialogs are hidden, which makes debugging failures in the
 // slave process frustrating. By passing this in error dialogs are enabled.
 const wchar_t kEnableErrorDialogs[] = L"enable-errdialogs";
 
 // Uncomment this line to have the spawned process wait for the debugger to
 // attach.
 // #define WAIT_FOR_DEBUGGER_ON_OPEN 1
 
-// static
-bool UITest::DieFileDie(const std::wstring& file, bool recurse) {
+bool UITest::DieFileDie(const FilePath& file, bool recurse) {
   if (!file_util::PathExists(file))
     return true;
 
   // Sometimes Delete fails, so try a few more times.
   for (int i = 0; i < 10; ++i) {
     if (file_util::Delete(file, recurse))
       return true;
     PlatformThread::Sleep(action_max_timeout_ms() / 10);
   }
   return false;
 }
+bool UITest::DieFileDie(const std::wstring& file, bool recurse) {
+  return DieFileDie(FilePath::FromWStringHack(file), recurse);
+}
 
 UITest::UITest()
     : testing::Test(),
       launch_arguments_(L""),
       expected_errors_(0),
       expected_crashes_(0),
       homepage_(L"about:blank"),
       wait_for_initial_loads_(true),
       dom_automation_enabled_(false),
       process_(0),  // NULL on Windows, 0 PID on POSIX.
@@ skipping 755 matching lines @@
 }
 
 bool UITest::EvictFileFromSystemCacheWrapper(const FilePath& path) {
   for (int i = 0; i < 10; i++) {
     if (file_util::EvictFileFromSystemCache(path))
       return true;
     PlatformThread::Sleep(1000);
   }
   return false;
 }