Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: chrome/browser/download/save_package_unittest.cc

Issue 6793008: Replacing base::DIR_TEMP with ScopedTempDir when appropriate. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: I obviously need a Windows test machine. Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/download/save_package_unittest.cc
diff --git a/chrome/browser/download/save_package_unittest.cc b/chrome/browser/download/save_package_unittest.cc
index 45ccf61db96ff56499a51d628d3183f3c0802004..b7332dcf7832a6a24bde91a066f17d9b0d7dae1e 100644
--- a/chrome/browser/download/save_package_unittest.cc
+++ b/chrome/browser/download/save_package_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
@@ -6,6 +6,7 @@
#include "base/file_path.h"
#include "base/path_service.h"
+#include "base/memory/scoped_temp_dir.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/download/save_package.h"
@@ -98,22 +99,22 @@ class SavePackageTest : public RenderViewHostTestHarness {
// Do the initialization in SetUp so contents() is initialized by
// RenderViewHostTestHarness::SetUp.
- FilePath test_dir;
- PathService::Get(base::DIR_TEMP, &test_dir);
+ ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
save_package_success_ = new SavePackage(contents(),
- test_dir.AppendASCII("testfile" HTML_EXTENSION),
- test_dir.AppendASCII("testfile_files"));
+ temp_dir_.path().AppendASCII("testfile" HTML_EXTENSION),
+ temp_dir_.path().AppendASCII("testfile_files"));
// We need to construct a path that is *almost* kMaxFilePathLength long
long_file_name.resize(kMaxFilePathLength + long_file_name.length());
while (long_file_name.length() < kMaxFilePathLength)
long_file_name += long_file_name;
- long_file_name.resize(kMaxFilePathLength - 9 - test_dir.value().length());
+ long_file_name.resize(
+ kMaxFilePathLength - 9 - temp_dir_.path().value().length());
save_package_fail_ = new SavePackage(contents(),
- test_dir.AppendASCII(long_file_name + HTML_EXTENSION),
- test_dir.AppendASCII(long_file_name + "_files"));
+ temp_dir_.path().AppendASCII(long_file_name + HTML_EXTENSION),
+ temp_dir_.path().AppendASCII(long_file_name + "_files"));
}
private:
@@ -122,6 +123,8 @@ class SavePackageTest : public RenderViewHostTestHarness {
// SavePackage for failed generating file name.
scoped_refptr<SavePackage> save_package_fail_;
+ ScopedTempDir temp_dir_;
+
DISALLOW_COPY_AND_ASSIGN(SavePackageTest);
};

Powered by Google App Engine
This is Rietveld 408576698