Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/browser/ui/tests/browser_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 "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
@@ skipping 262 matching lines @@
   EXPECT_FALSE(is_visible);
 }
 #endif  // !defined(OS_MACOSX)
 
 #if defined(OS_WIN)
 // This test verifies that Chrome can be launched with a user-data-dir path
 // which contains non ASCII characters.
 class LaunchBrowserWithNonAsciiUserDatadir : public UITest {
 public:
   void SetUp() {
-    PathService::Get(base::DIR_TEMP, &tmp_profile_);
-    tmp_profile_ = tmp_profile_.AppendASCII("tmp_profile");
-    tmp_profile_ = tmp_profile_.Append(L"Test Chrome G�raldine");
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    FilePath tmp_profile = temp_dir_.path().AppendASCII("tmp_profile");
+    tmp_profile = tmp_profile.Append(L"Test Chrome G�raldine");
 
-    // 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/11 18:16:53]

Could you check the return value of that? Just ASSERT_TRUE.

[Mike West, 2011/04/12 07:04:04]

Done.

 
-    launch_arguments_.AppendSwitchPath(switches::kUserDataDir, tmp_profile_);
+    launch_arguments_.AppendSwitchPath(switches::kUserDataDir, tmp_profile);
   }
 
   bool LaunchAppWithProfile() {
     UITest::SetUp();
     return true;
   }
 
   void TearDown() {

[Paweł Hajdan Jr., 2011/04/11 18:16:53]

You can remove the entire TearDown now.

[Mike West, 2011/04/12 07:04:04]

Done.

     UITest::TearDown();
-    EXPECT_TRUE(file_util::DieFileDie(tmp_profile_, true));
   }
 
 public:
-  FilePath tmp_profile_;
+  ScopedTempDir temp_dir_;
 };
 
 TEST_F(LaunchBrowserWithNonAsciiUserDatadir, TestNonAsciiUserDataDir) {
   ASSERT_TRUE(LaunchAppWithProfile());
   // Verify that the window is present.
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
 }
 #endif  // defined(OS_WIN)
 
@@ skipping 65 matching lines @@
   EXPECT_EQ(0, window_count);
 
   // Starting a browser window should work just fine.
   ASSERT_TRUE(IsBrowserRunning());
   ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, true));
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   EXPECT_EQ(1, window_count);
 }
 
 }  // namespace