//content: Change ScopedTempDir::path() to GetPath()

content/browser/dom_storage/dom_storage_database_unittest.cc

 // Copyright 2013 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.
 
 #include "content/browser/dom_storage/dom_storage_database.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
@@ skipping 97 matching lines @@
   EXPECT_TRUE(db.IsOpen());
   EXPECT_EQ(DOMStorageDatabase::V2, db.DetectSchemaVersion());
   db.Close();
   EXPECT_FALSE(db.IsOpen());
 }
 
 TEST(DOMStorageDatabaseTest, CloseEmptyDatabaseDeletesFile) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath file_name =
-      temp_dir.path().AppendASCII("TestDOMStorageDatabase.db");
+      temp_dir.GetPath().AppendASCII("TestDOMStorageDatabase.db");
   DOMStorageValuesMap storage;
   CreateMapWithValues(&storage);
 
   // First test the case that explicitly clearing the database will
   // trigger its deletion from disk.
   {
     DOMStorageDatabase db(file_name);
     EXPECT_EQ(file_name, db.file_path());
     ASSERT_TRUE(db.CommitChanges(false, storage));
   }
@@ skipping 37 matching lines @@
   }
   EXPECT_FALSE(base::PathExists(file_name));
 }
 
 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.
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath file_name =
-      temp_dir.path().AppendASCII("TestDOMStorageDatabase.db");
+      temp_dir.GetPath().AppendASCII("TestDOMStorageDatabase.db");
 
   DOMStorageDatabase db(file_name);
   EXPECT_FALSE(db.IsOpen());
   DOMStorageValuesMap values;
   db.ReadAllValues(&values);
   // Reading an empty db should not open the database.
   EXPECT_FALSE(db.IsOpen());
 
   values[ASCIIToUTF16("key")] =
       base::NullableString16(ASCIIToUTF16("value"), false);
@@ skipping 28 matching lines @@
 }
 
 TEST(DOMStorageDatabaseTest, TestLazyOpenUpgradesDatabase) {
   // This test needs to operate with a file on disk so that we
   // 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).
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath file_name =
-      temp_dir.path().AppendASCII("TestDOMStorageDatabase.db");
+      temp_dir.GetPath().AppendASCII("TestDOMStorageDatabase.db");
 
   DOMStorageDatabase db(file_name);
   db.db_.reset(new sql::Connection());
   ASSERT_TRUE(db.db_->Open(file_name));
   CreateV1Table(db.db_.get());
   db.Close();
 
   EXPECT_TRUE(db.LazyOpen(true));
   EXPECT_EQ(DOMStorageDatabase::V2, db.DetectSchemaVersion());
 }
@@ skipping 98 matching lines @@
 
   it = values.find(ASCIIToUTF16("not_there"));
   EXPECT_TRUE(it == values.end());
 }
 
 TEST(DOMStorageDatabaseTest, TestCanOpenFileThatIsNotADatabase) {
   // Write into the temporary file first.
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath file_name =
-      temp_dir.path().AppendASCII("TestDOMStorageDatabase.db");
+      temp_dir.GetPath().AppendASCII("TestDOMStorageDatabase.db");
 
   const char kData[] = "I am not a database.";
   base::WriteFile(file_name, kData, strlen(kData));
 
   {
     sql::test::ScopedErrorExpecter expecter;
 
     // Earlier versions of Chromium compiled against SQLite 3.6.7.3, which
     // returned SQLITE_IOERR_SHORT_READ in this case.  Some platforms may still
     // compile against an earlier SQLite via USE_SYSTEM_SQLITE.
@@ skipping 17 matching lines @@
 
     ASSERT_TRUE(expecter.SawExpectedErrors());
   }
 
   {
     sql::test::ScopedErrorExpecter expecter;
     expecter.ExpectError(SQLITE_CANTOPEN);
 
     // Try to open a directory, we should fail gracefully and not attempt
     // to delete it.
-    DOMStorageDatabase db(temp_dir.path());
+    DOMStorageDatabase db(temp_dir.GetPath());
     DOMStorageValuesMap values;
     CreateMapWithValues(&values);
     EXPECT_FALSE(db.CommitChanges(true, values));
     EXPECT_FALSE(db.CommitChanges(false, values));
     EXPECT_FALSE(db.IsOpen());
 
     values.clear();
 
     db.ReadAllValues(&values);
     EXPECT_EQ(0u, values.size());
     EXPECT_FALSE(db.IsOpen());
 
-    EXPECT_TRUE(base::PathExists(temp_dir.path()));
+    EXPECT_TRUE(base::PathExists(temp_dir.GetPath()));
 
     ASSERT_TRUE(expecter.SawExpectedErrors());
   }
 }
 
 }  // namespace content