summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks
diff options
context:
space:
mode:
authormkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-12 13:40:53 +0000
committermkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-12 13:40:53 +0000
commit3a305db06850635febc42acc54b65a93bf5739c7 (patch)
tree1e79d71199dd8bf13c31b94ee53a25c3afd1fe6b /chrome/browser/bookmarks
parentca0269fee674ebe4f233ae7f1efa91f503a8c784 (diff)
downloadchromium_src-3a305db06850635febc42acc54b65a93bf5739c7.zip
chromium_src-3a305db06850635febc42acc54b65a93bf5739c7.tar.gz
chromium_src-3a305db06850635febc42acc54b65a93bf5739c7.tar.bz2
Replacing base::DIR_TEMP with ScopedTempDir when appropriate.
BUG=73854 TEST=unit_tests Review URL: http://codereview.chromium.org/6793008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r--chrome/browser/bookmarks/bookmark_html_writer_unittest.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index 720445a..f203a04 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -12,6 +12,7 @@
#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"
@@ -43,14 +44,9 @@ void MakeTestSkBitmap(int w, int h, SkBitmap* bmp) {
class BookmarkHTMLWriterTest : public TestingBrowserProcessTest {
protected:
virtual void SetUp() {
- ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &path_));
- path_ = path_.AppendASCII("bookmarks.html");
- file_util::Delete(path_, true);
- }
-
- virtual void TearDown() {
- if (!path_.empty())
- file_util::Delete(path_, true);
+ TestingBrowserProcessTest::SetUp();
+ ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+ path_ = temp_dir_.path().AppendASCII("bookmarks.html");
}
// Converts a BookmarkEntry to a string suitable for assertion testing.
@@ -120,6 +116,7 @@ class BookmarkHTMLWriterTest : public TestingBrowserProcessTest {
BookmarkEntryToString(entry));
}
+ ScopedTempDir temp_dir_;
FilePath path_;
};