Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/browser/prefs/pref_service_uitest.cc

 // Copyright (c) 2011 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/path_service.h"
 #include "base/test/test_file_util.h"
 #include "base/values.h"
+#include "base/memory/scoped_temp_dir.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"
 #include "ui/gfx/rect.h"
 
 class PreferenceServiceTest : public UITest {
  public:
   void SetUp() {
-    PathService::Get(base::DIR_TEMP, &tmp_profile_);
-    tmp_profile_ = tmp_profile_.AppendASCII("tmp_profile");
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    FilePath tmp_profile = temp_dir_.path().AppendASCII("tmp_profile");
 
-    // Create a fresh, empty copy of this directory.
-    file_util::Delete(tmp_profile_, true);
-    file_util::CreateDirectory(tmp_profile_);
+    file_util::CreateDirectory(tmp_profile);

[Paweł Hajdan Jr., 2011/04/12 08:32:02]

Ah, check return value of this (ASSERT_TRUE).

[Mike West, 2011/04/12 12:00:05]

Done.

 
     FilePath reference_pref_file;
     if (new_profile_) {
       reference_pref_file = test_data_directory_
           .AppendASCII("profiles")
           .AppendASCII("window_placement")
           .AppendASCII("Default")
           .Append(chrome::kPreferencesFilename);
-      tmp_pref_file_ = tmp_profile_.AppendASCII("Default");
+      tmp_pref_file_ = tmp_profile.AppendASCII("Default");
       ASSERT_TRUE(file_util::CreateDirectory(tmp_pref_file_));
       tmp_pref_file_ = tmp_pref_file_.Append(chrome::kPreferencesFilename);
     } else {
       reference_pref_file = test_data_directory_
             .AppendASCII("profiles")
             .AppendASCII("window_placement")
             .Append(chrome::kLocalStateFilename);
-      tmp_pref_file_ = tmp_profile_.Append(chrome::kLocalStateFilename);
+      tmp_pref_file_ = tmp_profile.Append(chrome::kLocalStateFilename);
     }
 
     ASSERT_TRUE(file_util::PathExists(reference_pref_file));
     // Copy only the Preferences file if |new_profile_|, or Local State if not,
     // and the rest will be automatically created.
     ASSERT_TRUE(file_util::CopyFile(reference_pref_file, tmp_pref_file_));
 
 #if defined(OS_WIN)
     // Make the copy writable.  On POSIX we assume the umask allows files
     // we create to be writable.
     ASSERT_TRUE(::SetFileAttributesW(tmp_pref_file_.value().c_str(),
         FILE_ATTRIBUTE_NORMAL));
 #endif
 
-    launch_arguments_.AppendSwitchPath(switches::kUserDataDir, tmp_profile_);
+    launch_arguments_.AppendSwitchPath(switches::kUserDataDir, tmp_profile);
   }
 
   bool LaunchAppWithProfile() {
     if (!file_util::PathExists(tmp_pref_file_))
       return false;
     UITest::SetUp();
     return true;
   }
 
   void TearDown() {
     UITest::TearDown();
-
-    EXPECT_TRUE(file_util::DieFileDie(tmp_profile_, true));
   }
 
  public:
   bool new_profile_;
   FilePath tmp_pref_file_;
-  FilePath tmp_profile_;
+
+ private:
+  ScopedTempDir temp_dir_;
 };
 
 #if !defined(OS_LINUX)
 // 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
 // the window manager might fight with you over positioning.  However, we
 // might be able to make this work on buildbots.
 // TODO(port): revisit this.
 TEST_F(PreferenceServiceTest, PreservedWindowPlacementIsLoaded) {
   // The window should open with the new reference profile, with window
@@ skipping 107 matching lines @@
   // Find if launched window is maximized.
   bool is_window_maximized = false;
   ASSERT_TRUE(window->IsMaximized(&is_window_maximized));
   bool is_maximized = false;
   EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + ".maximized",
       &is_maximized));
   EXPECT_EQ(is_maximized, is_window_maximized);
 }
 #endif