Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/browser/bookmarks/bookmark_html_writer_unittest.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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/i18n/time_formatting.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/importer/firefox2_importer.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
@@ skipping 10 matching lines @@
   uint32_t* src_data = bmp->getAddr32(0, 0);
   for (int i = 0; i < w * h; i++) {
     src_data[i] = SkPreMultiplyARGB(i % 255, i % 250, i % 245, i % 240);
   }
 }
 
 }  // namespace
 
 class BookmarkHTMLWriterTest : public TestingBrowserProcessTest {
  protected:
   virtual void SetUp() {

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

Oh, could you also make it call the parent's SetUp method?

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

Done.

-    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &path_));
-    path_ = path_.AppendASCII("bookmarks.html");
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    path_ = temp_dir_.path().AppendASCII("bookmarks.html");
     file_util::Delete(path_, true);

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

Shouldn't be needed.

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

Done.

   }
 
   virtual void TearDown() {

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

Can you remove it entirely then?

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

Done.

-    if (!path_.empty())
-      file_util::Delete(path_, true);
   }
 
   // Converts a BookmarkEntry to a string suitable for assertion testing.
   string16 BookmarkEntryToString(
       const ProfileWriter::BookmarkEntry& entry) {
     string16 result;
     result.append(ASCIIToUTF16("on_toolbar="));
     if (entry.in_toolbar)
       result.append(ASCIIToUTF16("false"));
     else
@@ skipping 49 matching lines @@
                                  const string16& title,
                                  base::Time creation_time,
                                  const string16& f1,
                                  const string16& f2,
                                  const string16& f3) {
     EXPECT_EQ(BookmarkValuesToString(on_toolbar, url, title, creation_time,
                                      f1, f2, f3),
               BookmarkEntryToString(entry));
   }
 
+  ScopedTempDir temp_dir_;
   FilePath path_;
 };
 
 // Class that will notify message loop when file is written.
 class BookmarksObserver : public BookmarksExportObserver {
  public:
   explicit BookmarksObserver(MessageLoop* loop) : loop_(loop) {
     DCHECK(loop);
   }
 
@@ skipping 127 matching lines @@
                             bookmark_folder_name, string16(), string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[3], false, url4, url4_title, t4,
                             bookmark_folder_name, string16(), string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url1, url1_title, t1,
                             string16(), string16(), string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url2, url2_title, t2,
                             string16(), string16(), string16());
   AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1,
                             f3_title, f4_title, string16());
 }