diff options
Diffstat (limited to 'webkit/fileapi')
23 files changed, 55 insertions, 55 deletions
diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc index 0c8b06c..3d24205 100644 --- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_dir_url_request_job_unittest.cc @@ -7,11 +7,11 @@ #include <string> #include "base/file_path.h" +#include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" -#include "base/scoped_temp_dir.h" #include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "net/base/net_errors.h" @@ -212,7 +212,7 @@ class FileSystemDirURLRequestJobTest : public testing::Test { // leaks caused by tasks posted during shutdown. MessageLoop message_loop_; - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; net::URLRequestContext empty_context_; scoped_ptr<net::TestDelegate> delegate_; scoped_ptr<net::URLRequest> request_; diff --git a/webkit/fileapi/file_system_directory_database_unittest.cc b/webkit/fileapi/file_system_directory_database_unittest.cc index ab708fd..d5c31ae 100644 --- a/webkit/fileapi/file_system_directory_database_unittest.cc +++ b/webkit/fileapi/file_system_directory_database_unittest.cc @@ -8,9 +8,9 @@ #include <limits> #include "base/file_util.h" -#include "base/platform_file.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" -#include "base/scoped_temp_dir.h" +#include "base/platform_file.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -137,7 +137,7 @@ class FileSystemDirectoryDatabaseTest : public testing::Test { protected: // Common temp base for nondestructive uses. - ScopedTempDir base_; + base::ScopedTempDir base_; scoped_ptr<FileSystemDirectoryDatabase> db_; DISALLOW_COPY_AND_ASSIGN(FileSystemDirectoryDatabaseTest); diff --git a/webkit/fileapi/file_system_file_stream_reader_unittest.cc b/webkit/fileapi/file_system_file_stream_reader_unittest.cc index f95a1d5..c2de0cd 100644 --- a/webkit/fileapi/file_system_file_stream_reader_unittest.cc +++ b/webkit/fileapi/file_system_file_stream_reader_unittest.cc @@ -7,10 +7,10 @@ #include <limits> #include <string> +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" -#include "base/scoped_temp_dir.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" @@ -151,7 +151,7 @@ class FileSystemFileStreamReaderTest : public testing::Test { } MessageLoop message_loop_; - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy_; scoped_refptr<FileSystemContext> file_system_context_; base::Time test_file_modification_time_; diff --git a/webkit/fileapi/file_system_file_util_unittest.cc b/webkit/fileapi/file_system_file_util_unittest.cc index e0bbb66..7e45cef 100644 --- a/webkit/fileapi/file_system_file_util_unittest.cc +++ b/webkit/fileapi/file_system_file_util_unittest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "base/file_path.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" -#include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_operation_context.h" @@ -49,7 +49,7 @@ class FileSystemFileUtilTest : public testing::Test { const GURL& src_origin, fileapi::FileSystemType src_type, const GURL& dest_origin, fileapi::FileSystemType dest_type, bool copy) { - ScopedTempDir base_dir; + base::ScopedTempDir base_dir; ASSERT_TRUE(base_dir.CreateUniqueTempDir()); scoped_ptr<ObfuscatedFileUtil> file_util( new ObfuscatedFileUtil(base_dir.path())); diff --git a/webkit/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/fileapi/file_system_mount_point_provider_unittest.cc index f9cfb3b..a09f090 100644 --- a/webkit/fileapi/file_system_mount_point_provider_unittest.cc +++ b/webkit/fileapi/file_system_mount_point_provider_unittest.cc @@ -8,12 +8,12 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/scoped_temp_dir.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" @@ -253,7 +253,7 @@ class FileSystemMountPointProviderTest : public testing::Test { } private: - ScopedTempDir data_dir_; + base::ScopedTempDir data_dir_; MessageLoop message_loop_; base::WeakPtrFactory<FileSystemMountPointProviderTest> weak_factory_; diff --git a/webkit/fileapi/file_system_origin_database_unittest.cc b/webkit/fileapi/file_system_origin_database_unittest.cc index 68ad6e3..695bea8 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); diff --git a/webkit/fileapi/file_system_quota_client_unittest.cc b/webkit/fileapi/file_system_quota_client_unittest.cc index 1dd308f..4dc3383 100644 --- a/webkit/fileapi/file_system_quota_client_unittest.cc +++ b/webkit/fileapi/file_system_quota_client_unittest.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/basictypes.h" +#include "base/bind.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" -#include "base/scoped_temp_dir.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_context.h" @@ -251,7 +251,7 @@ class FileSystemQuotaClientTest : public testing::Test { deletion_status_ = status; } - ScopedTempDir data_dir_; + base::ScopedTempDir data_dir_; MessageLoop message_loop_; scoped_refptr<FileSystemContext> file_system_context_; base::WeakPtrFactory<FileSystemQuotaClientTest> weak_factory_; diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/fileapi/file_system_url_request_job_unittest.cc index 7297194..b0091dc 100644 --- a/webkit/fileapi/file_system_url_request_job_unittest.cc +++ b/webkit/fileapi/file_system_url_request_job_unittest.cc @@ -9,13 +9,13 @@ #include "base/bind.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" #include "base/rand_util.h" -#include "base/scoped_temp_dir.h" #include "base/string_piece.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" @@ -197,7 +197,7 @@ class FileSystemURLRequestJobTest : public testing::Test { // Put the message loop at the top, so that it's the last thing deleted. MessageLoop message_loop_; - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; scoped_refptr<quota::MockSpecialStoragePolicy> special_storage_policy_; scoped_refptr<FileSystemContext> file_system_context_; base::WeakPtrFactory<FileSystemURLRequestJobTest> weak_factory_; diff --git a/webkit/fileapi/file_system_usage_cache_unittest.cc b/webkit/fileapi/file_system_usage_cache_unittest.cc index 90c6a4d..8662dc8 100644 --- a/webkit/fileapi/file_system_usage_cache_unittest.cc +++ b/webkit/fileapi/file_system_usage_cache_unittest.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/file_util.h" -#include "base/scoped_temp_dir.h" +#include "base/files/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" namespace fileapi { @@ -25,7 +25,7 @@ class FileSystemUsageCacheTest : public testing::Test { } private: - ScopedTempDir data_dir_; + base::ScopedTempDir data_dir_; DISALLOW_COPY_AND_ASSIGN(FileSystemUsageCacheTest); }; diff --git a/webkit/fileapi/file_writer_delegate_unittest.cc b/webkit/fileapi/file_writer_delegate_unittest.cc index 345f1ee..415c2d9 100644 --- a/webkit/fileapi/file_writer_delegate_unittest.cc +++ b/webkit/fileapi/file_writer_delegate_unittest.cc @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/bind.h" +#include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" -#include "base/scoped_temp_dir.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/url_request/url_request.h" @@ -128,7 +128,7 @@ class FileWriterDelegateTest : public PlatformTest { scoped_ptr<Result> result_; LocalFileSystemTestOriginHelper test_helper_; - ScopedTempDir dir_; + base::ScopedTempDir dir_; static const char* content_; }; diff --git a/webkit/fileapi/isolated_file_util_unittest.cc b/webkit/fileapi/isolated_file_util_unittest.cc index c8be5c9..9a5b48e 100644 --- a/webkit/fileapi/isolated_file_util_unittest.cc +++ b/webkit/fileapi/isolated_file_util_unittest.cc @@ -8,10 +8,10 @@ #include <vector> #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/scoped_temp_dir.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_context.h" @@ -234,7 +234,7 @@ class IsolatedFileUtilTest : public testing::Test { filesystem_id_ = isolated_context()->RegisterDraggedFileSystem(toplevels); } - ScopedTempDir data_dir_; + base::ScopedTempDir data_dir_; MessageLoop message_loop_; std::string filesystem_id_; scoped_refptr<FileSystemContext> file_system_context_; diff --git a/webkit/fileapi/local_file_stream_writer_unittest.cc b/webkit/fileapi/local_file_stream_writer_unittest.cc index e26eed9..2a7fa68 100644 --- a/webkit/fileapi/local_file_stream_writer_unittest.cc +++ b/webkit/fileapi/local_file_stream_writer_unittest.cc @@ -8,10 +8,10 @@ #include "base/callback.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/logging.h" -#include "base/message_loop.h" -#include "base/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" +#include "base/message_loop.h" #include "net/base/io_buffer.h" #include "net/base/test_completion_callback.h" #include "testing/gtest/include/gtest/gtest.h" @@ -67,7 +67,7 @@ class LocalFileStreamWriterTest : public testing::Test { private: MessageLoop message_loop_; - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; }; void NeverCalled(int unused) { diff --git a/webkit/fileapi/local_file_system_operation_unittest.cc b/webkit/fileapi/local_file_system_operation_unittest.cc index 6da4718..1fe046a 100644 --- a/webkit/fileapi/local_file_system_operation_unittest.cc +++ b/webkit/fileapi/local_file_system_operation_unittest.cc @@ -5,11 +5,11 @@ #include "webkit/fileapi/local_file_system_operation.h" #include "base/bind.h" +#include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" @@ -22,8 +22,8 @@ #include "webkit/fileapi/file_util_helper.h" #include "webkit/fileapi/local_file_system_test_helper.h" #include "webkit/fileapi/mock_file_change_observer.h" -#include "webkit/quota/quota_manager.h" #include "webkit/quota/mock_quota_manager.h" +#include "webkit/quota/quota_manager.h" using quota::QuotaManager; using quota::QuotaManagerProxy; @@ -71,7 +71,7 @@ class LocalFileSystemOperationTest protected: // Common temp base for nondestructive uses. - ScopedTempDir base_; + base::ScopedTempDir base_; quota::MockQuotaManager* quota_manager() { return static_cast<quota::MockQuotaManager*>(quota_manager_.get()); diff --git a/webkit/fileapi/local_file_system_operation_write_unittest.cc b/webkit/fileapi/local_file_system_operation_write_unittest.cc index eb51b8b..6ba606d 100644 --- a/webkit/fileapi/local_file_system_operation_write_unittest.cc +++ b/webkit/fileapi/local_file_system_operation_write_unittest.cc @@ -4,11 +4,11 @@ #include <vector> +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/scoped_temp_dir.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" @@ -152,7 +152,7 @@ class LocalFileSystemOperationWriteTest MessageLoop loop_; - ScopedTempDir dir_; + base::ScopedTempDir dir_; FilePath virtual_path_; // For post-operation status. diff --git a/webkit/fileapi/local_file_system_quota_unittest.cc b/webkit/fileapi/local_file_system_quota_unittest.cc index 0b861d3..e848afb 100644 --- a/webkit/fileapi/local_file_system_quota_unittest.cc +++ b/webkit/fileapi/local_file_system_quota_unittest.cc @@ -8,12 +8,12 @@ // 3) the result of QuotaManager::GetUsageAndQuota. #include "base/bind.h" +#include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" -#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_usage_cache.h" @@ -162,7 +162,7 @@ class LocalFileSystemQuotaTest LocalFileSystemTestOriginHelper test_helper_; - ScopedTempDir work_dir_; + base::ScopedTempDir work_dir_; MessageLoop message_loop_; scoped_refptr<quota::QuotaManager> quota_manager_; diff --git a/webkit/fileapi/local_file_util_unittest.cc b/webkit/fileapi/local_file_util_unittest.cc index 5dea512..9d29082 100644 --- a/webkit/fileapi/local_file_util_unittest.cc +++ b/webkit/fileapi/local_file_util_unittest.cc @@ -5,10 +5,10 @@ #include <string> #include "base/file_path.h" +#include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" -#include "base/scoped_temp_dir.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" @@ -97,7 +97,7 @@ class LocalFileUtilTest : public testing::Test { private: scoped_ptr<LocalFileUtil> local_file_util_; - ScopedTempDir data_dir_; + base::ScopedTempDir data_dir_; MessageLoop message_loop_; LocalFileSystemTestOriginHelper test_helper_; diff --git a/webkit/fileapi/media/native_media_file_util_unittest.cc b/webkit/fileapi/media/native_media_file_util_unittest.cc index f14c7aa..6be9471 100644 --- a/webkit/fileapi/media/native_media_file_util_unittest.cc +++ b/webkit/fileapi/media/native_media_file_util_unittest.cc @@ -6,8 +6,8 @@ #include <string> #include "base/bind.h" +#include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" -#include "base/scoped_temp_dir.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_context.h" #include "webkit/fileapi/file_system_operation.h" @@ -146,7 +146,7 @@ class NativeMediaFileUtilTest : public testing::Test { private: MessageLoop message_loop_; - ScopedTempDir data_dir_; + base::ScopedTempDir data_dir_; scoped_refptr<FileSystemContext> file_system_context_; FileSystemFileUtil* file_util_; diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc index df2ad66..afb5efd 100644 --- a/webkit/fileapi/obfuscated_file_util_unittest.cc +++ b/webkit/fileapi/obfuscated_file_util_unittest.cc @@ -9,10 +9,10 @@ #include "base/bind.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" -#include "base/scoped_temp_dir.h" #include "base/sys_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_context.h" @@ -495,7 +495,7 @@ class ObfuscatedFileUtilTest : public testing::Test { } void TestCopyInForeignFileHelper(bool overwrite) { - ScopedTempDir source_dir; + base::ScopedTempDir source_dir; ASSERT_TRUE(source_dir.CreateUniqueTempDir()); FilePath root_file_path = source_dir.path(); FilePath src_file_path = root_file_path.AppendASCII("file_name"); @@ -634,7 +634,7 @@ class ObfuscatedFileUtilTest : public testing::Test { } private: - ScopedTempDir data_dir_; + base::ScopedTempDir data_dir_; MessageLoop message_loop_; ObfuscatedFileUtil* obfuscated_file_util_; scoped_refptr<quota::QuotaManager> quota_manager_; @@ -1412,7 +1412,7 @@ TEST_F(ObfuscatedFileUtilTest, TestEnumerator) { } TEST_F(ObfuscatedFileUtilTest, TestMigration) { - ScopedTempDir source_dir; + base::ScopedTempDir source_dir; ASSERT_TRUE(source_dir.CreateUniqueTempDir()); FilePath root_path = source_dir.path().AppendASCII("chrome-pLmnMWXE7NzTFRsn"); ASSERT_TRUE(file_util::CreateDirectory(root_path)); diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc index 20f56c0..2e4f209 100644 --- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc +++ b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc @@ -10,13 +10,13 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" -#include "base/scoped_temp_dir.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/fileapi/file_system_context.h" @@ -59,7 +59,7 @@ class SandboxMountPointProviderOriginEnumeratorTest : public testing::Test { ASSERT_TRUE(file_util::DirectoryExists(target)); } - ScopedTempDir data_dir_; + base::ScopedTempDir data_dir_; MessageLoop message_loop_; scoped_ptr<SandboxMountPointProvider> sandbox_provider_; }; @@ -329,7 +329,7 @@ class SandboxMountPointProviderMigrationTest : public testing::Test { } protected: - ScopedTempDir data_dir_; + base::ScopedTempDir data_dir_; MessageLoop message_loop_; scoped_refptr<FileSystemContext> file_system_context_; base::WeakPtrFactory<SandboxMountPointProviderMigrationTest> weak_factory_; diff --git a/webkit/fileapi/syncable/canned_syncable_file_system.h b/webkit/fileapi/syncable/canned_syncable_file_system.h index 1e5de78..783bfa5 100644 --- a/webkit/fileapi/syncable/canned_syncable_file_system.h +++ b/webkit/fileapi/syncable/canned_syncable_file_system.h @@ -9,10 +9,10 @@ #include <vector> #include "base/callback_forward.h" +#include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/observer_list_threadsafe.h" #include "base/platform_file.h" -#include "base/scoped_temp_dir.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/fileapi/file_system_url.h" #include "webkit/fileapi/file_system_util.h" @@ -181,7 +181,7 @@ class CannedSyncableFileSystem void InitializeSyncStatusObserver(); - ScopedTempDir data_dir_; + base::ScopedTempDir data_dir_; const std::string service_name_; scoped_refptr<quota::QuotaManager> quota_manager_; diff --git a/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc b/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc index ce37e60..cc54e8c 100644 --- a/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc +++ b/webkit/fileapi/syncable/local_file_change_tracker_unittest.cc @@ -8,10 +8,10 @@ #include <set> #include "base/basictypes.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/scoped_temp_dir.h" #include "base/stl_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/blob/mock_blob_url_request_context.h" diff --git a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc index 58be431..a61c141d 100644 --- a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc +++ b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc @@ -467,7 +467,7 @@ TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForDeletion) { } TEST_F(LocalFileSyncContextTest, ApplyRemoteChangeForAddOrUpdate) { - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName, diff --git a/webkit/fileapi/syncable/syncable_file_system_unittest.cc b/webkit/fileapi/syncable/syncable_file_system_unittest.cc index 5d42509..6accbd0 100644 --- a/webkit/fileapi/syncable/syncable_file_system_unittest.cc +++ b/webkit/fileapi/syncable/syncable_file_system_unittest.cc @@ -81,7 +81,7 @@ class SyncableFileSystemTest : public testing::Test { return file_system_context()->change_tracker(); } - ScopedTempDir data_dir_; + base::ScopedTempDir data_dir_; MessageLoop message_loop_; CannedSyncableFileSystem file_system_; |