| Index: webkit/dom_storage/dom_storage_database_unittest.cc
|
| diff --git a/webkit/dom_storage/dom_storage_database_unittest.cc b/webkit/dom_storage/dom_storage_database_unittest.cc
|
| index b11ea89201ba93f65bb0f2f88f25b4af251dc148..3e9bfbddf997c2fec6d19af7706983ef0a87f765 100644
|
| --- a/webkit/dom_storage/dom_storage_database_unittest.cc
|
| +++ b/webkit/dom_storage/dom_storage_database_unittest.cc
|
| @@ -6,8 +6,8 @@
|
|
|
| #include "base/file_path.h"
|
| #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/utf_string_conversions.h"
|
| #include "sql/statement.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -108,7 +108,7 @@ TEST(DomStorageDatabaseTest, SimpleOpenAndClose) {
|
| }
|
|
|
| TEST(DomStorageDatabaseTest, CloseEmptyDatabaseDeletesFile) {
|
| - ScopedTempDir temp_dir;
|
| + base::ScopedTempDir temp_dir;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
|
| ValuesMap storage;
|
| @@ -165,7 +165,7 @@ TEST(DomStorageDatabaseTest, CloseEmptyDatabaseDeletesFile) {
|
| TEST(DomStorageDatabaseTest, TestLazyOpenIsLazy) {
|
| // This test needs to operate with a file on disk to ensure that we will
|
| // open a file that already exists when only invoking ReadAllValues.
|
| - ScopedTempDir temp_dir;
|
| + base::ScopedTempDir temp_dir;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
|
|
|
| @@ -212,7 +212,7 @@ TEST(DomStorageDatabaseTest, TestLazyOpenUpgradesDatabase) {
|
| // can create a table at version 1 and then close it again
|
| // so that LazyOpen sees there is work to do (LazyOpen will return
|
| // early if the database is already open).
|
| - ScopedTempDir temp_dir;
|
| + base::ScopedTempDir temp_dir;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
|
|
|
| @@ -332,7 +332,7 @@ TEST(DomStorageDatabaseTest, TestCanOpenAndReadWebCoreDatabase) {
|
|
|
| TEST(DomStorageDatabaseTest, TestCanOpenFileThatIsNotADatabase) {
|
| // Write into the temporary file first.
|
| - ScopedTempDir temp_dir;
|
| + base::ScopedTempDir temp_dir;
|
| ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
|
| FilePath file_name = temp_dir.path().AppendASCII("TestDomStorageDatabase.db");
|
|
|
|
|