Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

base/i18n/file_util_icu_unittest.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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/i18n/file_util_icu.h"
 
 #include "base/file_util.h"
-#include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 // file_util winds up using autoreleased objects on the Mac, so this needs
 // to be a PlatformTest
 class FileUtilICUTest : public PlatformTest {

[Paweł Hajdan Jr., 2011/04/08 15:58:17]

Please switch it to a typedef then, or at least don't override SetUp and
TearDown which just call the parent implementation.

[Mike West, 2011/04/11 14:47:04]

Fair enough. I've dropped the overrides, but left the class definition. A
typedef doesn't feel right here...

If you feel strongly otherwise, I'm happy to change it. 

  protected:
   virtual void SetUp() {
     PlatformTest::SetUp();
-    // Name a subdirectory of the temp directory.
-    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
-    test_dir_ = test_dir_.Append(FILE_PATH_LITERAL("FileUtilTest"));
-
-    // Create a fresh, empty copy of this directory.
-    file_util::Delete(test_dir_, true);
-    file_util::CreateDirectory(test_dir_);
   }
   virtual void TearDown() {
     PlatformTest::TearDown();
-    // Clean up test directory
-    ASSERT_TRUE(file_util::Delete(test_dir_, true));
-    ASSERT_FALSE(file_util::PathExists(test_dir_));
   }
-
-  // the path to temporary directory used to contain the test operations
-  FilePath test_dir_;
 };
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 
 // Linux disallows some evil ASCII characters, but passes all non-ASCII.
 static const struct goodbad_pair {
   const char* bad_name;
   const char* good_name;
 } kIllegalCharacterCases[] = {
   {"bad*file:name?.jpg", "bad-file-name-.jpg"},
@@ skipping 50 matching lines @@
 #elif defined(OS_MACOSX)
     std::string bad_name(WideToUTF8(kIllegalCharacterCases[i].bad_name));
     file_util::ReplaceIllegalCharactersInPath(&bad_name, '-');
     EXPECT_EQ(WideToUTF8(kIllegalCharacterCases[i].good_name), bad_name);
 #endif
   }
 }
 
 #endif