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

Unified Diff: chrome/common/zip_unittest.cc

Issue 11359217: Move scoped_temp_dir from base to base/files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « chrome/common/zip_reader_unittest.cc ('k') | chrome/installer/mini_installer/decompress_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/zip_unittest.cc
diff --git a/chrome/common/zip_unittest.cc b/chrome/common/zip_unittest.cc
index d2cff716971c4d6c581c0db8aaaed3350d713597..4d3d5d8ac91497ce0789e72294da5b4e5873e1cc 100644
--- a/chrome/common/zip_unittest.cc
+++ b/chrome/common/zip_unittest.cc
@@ -6,8 +6,8 @@
#include <vector>
#include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
-#include "base/scoped_temp_dir.h"
#include "base/string_util.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/zip.h"
@@ -87,7 +87,7 @@ class ZipTest : public PlatformTest {
// The path to temporary directory used to contain the test operations.
FilePath test_dir_;
- ScopedTempDir temp_dir_;
+ base::ScopedTempDir temp_dir_;
// Hard-coded contents of a known zip file.
std::set<FilePath> zip_contents_;
@@ -139,7 +139,7 @@ TEST_F(ZipTest, Zip) {
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &src_dir));
src_dir = src_dir.AppendASCII("zip").AppendASCII("test");
- ScopedTempDir temp_dir;
+ base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
FilePath zip_file = temp_dir.path().AppendASCII("out.zip");
@@ -152,7 +152,7 @@ TEST_F(ZipTest, ZipIgnoreHidden) {
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &src_dir));
src_dir = src_dir.AppendASCII("zip").AppendASCII("test");
- ScopedTempDir temp_dir;
+ base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
FilePath zip_file = temp_dir.path().AppendASCII("out.zip");
@@ -165,7 +165,7 @@ TEST_F(ZipTest, ZipFiles) {
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &src_dir));
src_dir = src_dir.AppendASCII("zip").AppendASCII("test");
- ScopedTempDir temp_dir;
+ base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
FilePath zip_file = temp_dir.path().AppendASCII("out.zip");
« no previous file with comments | « chrome/common/zip_reader_unittest.cc ('k') | chrome/installer/mini_installer/decompress_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698