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

chrome/common/pref_service_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 <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
+#include "base/test_file_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 
@@ skipping 34 matching lines @@
   bool LaunchAppWithProfile() {
     if (!file_util::PathExists(tmp_pref_file_))
       return false;
     UITest::SetUp();
     return true;
   }
 
   void TearDown() {
     UITest::TearDown();
 
-    EXPECT_TRUE(DieFileDie(tmp_profile_, true));
+    EXPECT_TRUE(file_util::DieFileDie(tmp_profile_, true));
   }
 
 public:
   FilePath tmp_pref_file_;
   FilePath tmp_profile_;
 };
 
 #if defined(OS_WIN)
 // This test verifies that the window position from the prefs file is restored
 // when the app restores.  This doesn't really make sense on Linux, where
@@ skipping 51 matching lines @@
 
   // Find if launched window is maximized
   bool is_window_maximized = (window_placement.showCmd == SW_MAXIMIZE);
 
   bool is_maximized = false;
   EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + L".maximized",
       &is_maximized));
   EXPECT_EQ(is_maximized, is_window_maximized);
 }
 #endif