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

Unified Diff: webkit/fileapi/file_system_origin_database_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
Index: webkit/fileapi/file_system_origin_database_unittest.cc
diff --git a/webkit/fileapi/file_system_origin_database_unittest.cc b/webkit/fileapi/file_system_origin_database_unittest.cc
index 68ad6e33c2c5b348f3f9dd40f9e1b2f57c198d64..695bea8d2000353f503fd4723cb1d8292932baa9 100644
--- a/webkit/fileapi/file_system_origin_database_unittest.cc
+++ b/webkit/fileapi/file_system_origin_database_unittest.cc
@@ -9,8 +9,8 @@
#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/platform_file.h"
-#include "base/scoped_temp_dir.h"
#include "base/stl_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/leveldatabase/src/db/filename.h"
@@ -28,7 +28,7 @@ const FilePath::CharType kOriginDatabaseName[] = FILE_PATH_LITERAL("Origins");
} // namespace
TEST(FileSystemOriginDatabaseTest, BasicTest) {
- ScopedTempDir dir;
+ base::ScopedTempDir dir;
ASSERT_TRUE(dir.CreateUniqueTempDir());
const FilePath kFSDir = dir.path().Append(kFileSystemDirName);
EXPECT_FALSE(file_util::PathExists(kFSDir));
@@ -58,7 +58,7 @@ TEST(FileSystemOriginDatabaseTest, BasicTest) {
}
TEST(FileSystemOriginDatabaseTest, TwoPathTest) {
- ScopedTempDir dir;
+ base::ScopedTempDir dir;
ASSERT_TRUE(dir.CreateUniqueTempDir());
const FilePath kFSDir = dir.path().Append(kFileSystemDirName);
EXPECT_FALSE(file_util::PathExists(kFSDir));
@@ -86,7 +86,7 @@ TEST(FileSystemOriginDatabaseTest, TwoPathTest) {
}
TEST(FileSystemOriginDatabaseTest, DropDatabaseTest) {
- ScopedTempDir dir;
+ base::ScopedTempDir dir;
ASSERT_TRUE(dir.CreateUniqueTempDir());
const FilePath kFSDir = dir.path().Append(kFileSystemDirName);
EXPECT_FALSE(file_util::PathExists(kFSDir));
@@ -114,7 +114,7 @@ TEST(FileSystemOriginDatabaseTest, DropDatabaseTest) {
}
TEST(FileSystemOriginDatabaseTest, DeleteOriginTest) {
- ScopedTempDir dir;
+ base::ScopedTempDir dir;
ASSERT_TRUE(dir.CreateUniqueTempDir());
const FilePath kFSDir = dir.path().Append(kFileSystemDirName);
EXPECT_FALSE(file_util::PathExists(kFSDir));
@@ -141,7 +141,7 @@ TEST(FileSystemOriginDatabaseTest, DeleteOriginTest) {
}
TEST(FileSystemOriginDatabaseTest, ListOriginsTest) {
- ScopedTempDir dir;
+ base::ScopedTempDir dir;
ASSERT_TRUE(dir.CreateUniqueTempDir());
const FilePath kFSDir = dir.path().Append(kFileSystemDirName);
EXPECT_FALSE(file_util::PathExists(kFSDir));
@@ -190,7 +190,7 @@ TEST(FileSystemOriginDatabaseTest, DatabaseRecoveryTest) {
// After repairing, the origin database should be consistent even when some
// entries lost.
- ScopedTempDir dir;
+ base::ScopedTempDir dir;
ASSERT_TRUE(dir.CreateUniqueTempDir());
const FilePath kFSDir = dir.path().Append(kFileSystemDirName);
const FilePath kDBDir = kFSDir.Append(kOriginDatabaseName);
« no previous file with comments | « webkit/fileapi/file_system_mount_point_provider_unittest.cc ('k') | webkit/fileapi/file_system_quota_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698