* Revert "Por rt flush_cache tool."

This reverts commit 3bd600b37c5ee613c004c84736ee3cb69434562a.

Review URL: http://codereview.chromium.org/9774


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5184 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 17 insertions, 24 deletions

diff --git a/chrome/tools/perf/flush_cache/SConscript b/chrome/tools/perf/flush_cache/SConscript
index cd1cacf..a33cb3c 100644
--- a/chrome/tools/perf/flush_cache/SConscript
+++ b/chrome/tools/perf/flush_cache/SConscript
@@ -16,26 +16,26 @@ env_test.Prepend(
     ],
 )
 
-if env_test['PLATFORM'] == 'win32':
-  env_test.Prepend(
-      LINKFLAGS = [
-          '/INCREMENTAL',
-          '/DEBUG',
+env_test.Prepend(
+    LINKFLAGS = [
+        '/INCREMENTAL',
+        '/DEBUG',
 
-          '/DELAYLOAD:"dwmapi.dll"',
-          '/DELAYLOAD:"uxtheme.dll"',
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
 
-          '/MACHINE:X86',
-          '/FIXED:No',
+        '/MACHINE:X86',
+        '/FIXED:No',
 
-          '/safeseh',
-          '/dynamicbase',
-          '/ignore:4199',
-          '/nxcompat',
-      ],
-  )
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+)
 
 input_files = [
+    '$CHROME_DIR/test/test_file_util$OBJSUFFIX',
     'flush_cache.cc',
 ]
 
diff --git a/chrome/tools/perf/flush_cache/flush_cache.cc b/chrome/tools/perf/flush_cache/flush_cache.cc
index f029028..f10b69b 100644
--- a/chrome/tools/perf/flush_cache/flush_cache.cc
+++ b/chrome/tools/perf/flush_cache/flush_cache.cc
@@ -5,13 +5,10 @@
 // This little program attempts to flush the disk cache for some files.
 // It's useful for testing Chrome with a cold database.
 
-#include "build/build_config.h"
-
-#include "base/file_path.h"
-#include "base/file_util.h"
 #include "base/string_piece.h"
 #include "base/process_util.h"
 #include "base/sys_string_conversions.h"
+#include "chrome/test/test_file_util.h"
 
 int main(int argc, const char* argv[]) {
   process_util::EnableTerminationOnHeapCorruption();
@@ -22,12 +19,8 @@ int main(int argc, const char* argv[]) {
   }
 
   for (int i = 1; i < argc; ++i) {
-#if defined(OS_POSIX)
-    std::string filename(argv[i]);
-#elif defined(OS_WIN)
     std::wstring filename = base::SysNativeMBToWide(argv[i]);
-#endif
-    if (!file_util::EvictFileFromSystemCache(FilePath(filename))) {
+    if (!file_util::EvictFileFromSystemCache(filename.c_str())) {
       fprintf(stderr, "Failed to evict %s from cache -- is it a directory?\n",
               argv[i]);
     }