Remove duplication of DieFileDie, and move it to proper location.

chrome/browser/download/save_page_uitest.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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/string_util.h"
+#include "base/test_file_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/url_request/url_request_unittest.h"
 
 const char* const kTestDir = "save_page";
@@ skipping 37 matching lines @@
       ASSERT_TRUE(file_util::PathExists(server_file_name));
 
       int64 client_file_size = 0;
       int64 server_file_size = 0;
       EXPECT_TRUE(file_util::GetFileSize(client_file, &client_file_size));
       EXPECT_TRUE(file_util::GetFileSize(server_file_name, &server_file_size));
       EXPECT_EQ(client_file_size, server_file_size);
       EXPECT_TRUE(file_util::ContentsEqual(client_file, server_file_name));
     }
 
-    EXPECT_TRUE(DieFileDie(client_file, false));
+    EXPECT_TRUE(file_util::DieFileDie(client_file, false));
   }
 
   virtual void SetUp() {
     UITest::SetUp();
     EXPECT_TRUE(file_util::CreateNewTempDirectory(FILE_PATH_LITERAL(""),
                                                   &save_dir_));
 
     download_dir_ = FilePath::FromWStringHack(GetDownloadDirectory());
   }
 
   virtual void TearDown() {
     UITest::TearDown();
-    DieFileDie(save_dir_, true);
+    file_util::DieFileDie(save_dir_, true);
   }
 
   FilePath save_dir_;
   FilePath download_dir_;
 };
 
 // Flaky on Linux: http://code.google.com/p/chromium/issues/detail?id=14746
 TEST_F(SavePageTest, SaveHTMLOnly) {
   std::string file_name("a.htm");
   FilePath full_file_name = save_dir_.AppendASCII(file_name);
@@ skipping 33 matching lines @@
                             SavePackage::SAVE_AS_COMPLETE_HTML));
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
 
   CheckFile(dir.AppendASCII("1.png"), FilePath(FILE_PATH_LITERAL("1.png")),
                             true);
   CheckFile(dir.AppendASCII("1.css"), FilePath(FILE_PATH_LITERAL("1.css")),
                             true);
   CheckFile(full_file_name, FilePath::FromWStringHack(UTF8ToWide(file_name)),
             false);
-  EXPECT_TRUE(DieFileDie(dir, true));
+  EXPECT_TRUE(file_util::DieFileDie(dir, true));
 }
 
 TEST_F(SavePageTest, NoSave) {
   std::string file_name = "c.htm";
   FilePath full_file_name = save_dir_.AppendASCII(file_name);
   FilePath dir = save_dir_.AppendASCII("c_files");
 
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->NavigateToURL(GURL("about:blank")));
@@ skipping 26 matching lines @@
   EXPECT_TRUE(browser->RunCommandAsync(IDC_SAVE_PAGE));
   EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
   automation()->SavePackageShouldPromptUser(true);
 
   CheckFile(dir.AppendASCII("1.png"), FilePath(FILE_PATH_LITERAL("1.png")),
                             true);
   CheckFile(dir.AppendASCII("1.css"), FilePath(FILE_PATH_LITERAL("1.css")),
                             true);
   CheckFile(full_file_name, FilePath::FromWStringHack(UTF8ToWide(file_name)),
             false);
-  EXPECT_TRUE(DieFileDie(full_file_name, false));
-  EXPECT_TRUE(DieFileDie(dir, true));
+  EXPECT_TRUE(file_util::DieFileDie(full_file_name, false));
+  EXPECT_TRUE(file_util::DieFileDie(dir, true));
 }
 
 // This tests that a webpage with the title "test.exe" is saved as
 // "test.exe.htm".
 // We probably don't care to handle this on Linux or Mac.
 #if defined(OS_WIN)
 TEST_F(SavePageTest, CleanFilenameFromPageTitle) {
   std::string file_name = "c.htm";
   FilePath full_file_name =
       download_dir_.AppendASCII(std::string("test.exe") + kAppendedExtension);
   FilePath dir = download_dir_.AppendASCII("test.exe_files");
 
   GURL url = URLRequestMockHTTPJob::GetMockUrl(
     UTF8ToWide(std::string(kTestDir) + "/" + file_name));
   scoped_refptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab.get());
   ASSERT_TRUE(tab->NavigateToURL(url));
   WaitUntilTabCount(1);
 
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   automation()->SavePackageShouldPromptUser(false);
   EXPECT_TRUE(browser->RunCommandAsync(IDC_SAVE_PAGE));
   EXPECT_TRUE(WaitForDownloadShelfVisible(browser.get()));
   automation()->SavePackageShouldPromptUser(true);
 
   CheckFile(full_file_name, FilePath::FromWStringHack(UTF8ToWide(file_name)),
             false);
-  EXPECT_TRUE(DieFileDie(full_file_name, false));
-  EXPECT_TRUE(DieFileDie(dir, true));
+  EXPECT_TRUE(file_util::DieFileDie(full_file_name, false));
+  EXPECT_TRUE(file_util::DieFileDie(dir, true));
 }
 #endif