Use a two-part data format version in IndexedDB metadata.

content/browser/indexed_db/indexed_db_backing_store_unittest.cc

 // Copyright (c) 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/indexed_db/indexed_db_backing_store.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 12 matching lines @@
 #include "content/browser/indexed_db/indexed_db_leveldb_coding.h"
 #include "content/browser/indexed_db/indexed_db_value.h"
 #include "content/browser/indexed_db/leveldb/leveldb_factory.h"
 #include "content/browser/quota/mock_quota_manager_proxy.h"
 #include "content/public/test/mock_special_storage_policy.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/url_request/url_request_test_util.h"
 #include "storage/browser/blob/blob_data_handle.h"
 #include "storage/browser/quota/special_storage_policy.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseException.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBTypes.h"
 
 using base::ASCIIToUTF16;
 using url::Origin;
 
 namespace content {
 
 namespace {
 static const size_t kDefaultMaxOpenIteratorsPerDatabase = 50;
 
@@ skipping 31 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultLevelDBFactory);
 };
 
 class TestableIndexedDBBackingStore : public IndexedDBBackingStore {
  public:
   static scoped_refptr<TestableIndexedDBBackingStore> Open(
       IndexedDBFactory* indexed_db_factory,
       const Origin& origin,
       const base::FilePath& path_base,
+      const IndexedDBDataFormatVersion& data_format_version,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       LevelDBFactory* leveldb_factory,
       base::SequencedTaskRunner* task_runner,
       leveldb::Status* status) {
     DCHECK(!path_base.empty());
 
     std::unique_ptr<LevelDBComparator> comparator =
         base::MakeUnique<Comparator>();
 
     if (!base::CreateDirectory(path_base)) {
       *status = leveldb::Status::IOError("Unable to create base dir");
       return scoped_refptr<TestableIndexedDBBackingStore>();
     }
 
-    const base::FilePath file_path = path_base.AppendASCII("test_db_path");
-    const base::FilePath blob_path = path_base.AppendASCII("test_blob_path");
+    const base::FilePath file_path =
+        path_base.Append(IndexedDBContextImpl::GetLevelDBFileName(origin));
+    const base::FilePath blob_path =
+        path_base.Append(IndexedDBContextImpl::GetBlobStoreFileName(origin));
 
     std::unique_ptr<LevelDBDatabase> db;
     bool is_disk_full = false;
     *status = leveldb_factory->OpenLevelDB(
         file_path, comparator.get(), &db, &is_disk_full);
 
     if (!db || !status->ok())
       return scoped_refptr<TestableIndexedDBBackingStore>();
 
     scoped_refptr<TestableIndexedDBBackingStore> backing_store(
         new TestableIndexedDBBackingStore(indexed_db_factory, origin, blob_path,
+                                          data_format_version,
                                           request_context_getter, std::move(db),
                                           std::move(comparator), task_runner));
 
     *status = backing_store->SetUpMetadata();
     if (!status->ok())
       return scoped_refptr<TestableIndexedDBBackingStore>();
 
     return backing_store;
   }
 
@@ skipping 41 matching lines @@
   // Timers don't play nicely with unit tests.
   void StartJournalCleaningTimer() override {
     CleanPrimaryJournalIgnoreReturn();
   }
 
  private:
   TestableIndexedDBBackingStore(
       IndexedDBFactory* indexed_db_factory,
       const Origin& origin,
       const base::FilePath& blob_path,
+      const IndexedDBDataFormatVersion& data_format_version,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       std::unique_ptr<LevelDBDatabase> db,
       std::unique_ptr<LevelDBComparator> comparator,
       base::SequencedTaskRunner* task_runner)
       : IndexedDBBackingStore(indexed_db_factory,
                               origin,
                               blob_path,
+                              data_format_version,
                               request_context_getter,
                               std::move(db),
                               std::move(comparator),
                               task_runner),
         database_id_(0) {}
 
   int64_t database_id_;
   std::vector<Transaction::WriteDescriptor> writes_;
 
   // This is modified in an overridden virtual function that is properly const
   // in the real implementation, therefore must be mutable here.
   mutable std::vector<int64_t> removals_;
 
   DISALLOW_COPY_AND_ASSIGN(TestableIndexedDBBackingStore);
 };
 
 class TestIDBFactory : public IndexedDBFactoryImpl {
  public:
   explicit TestIDBFactory(IndexedDBContextImpl* idb_context)
       : IndexedDBFactoryImpl(idb_context) {}
 
   scoped_refptr<TestableIndexedDBBackingStore> OpenBackingStoreForTest(
       const Origin& origin,
       scoped_refptr<net::URLRequestContextGetter> url_request_context_getter) {
     IndexedDBDataLossInfo data_loss_info;
     bool disk_full;
     leveldb::Status status;
     scoped_refptr<IndexedDBBackingStore> backing_store = OpenBackingStore(
-        origin, context()->data_path(), url_request_context_getter,
-        &data_loss_info, &disk_full, &status);
+        origin, context()->data_path(), IndexedDBDataFormatVersion(),
+        url_request_context_getter, &data_loss_info, &disk_full, &status);
     scoped_refptr<TestableIndexedDBBackingStore> testable_store =
         static_cast<TestableIndexedDBBackingStore*>(backing_store.get());
     return testable_store;
   }
 
  protected:
   ~TestIDBFactory() override {}
 
   scoped_refptr<IndexedDBBackingStore> OpenBackingStoreHelper(
       const Origin& origin,
       const base::FilePath& data_directory,
+      const IndexedDBDataFormatVersion& data_format_version,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       IndexedDBDataLossInfo* data_loss_info,
       bool* disk_full,
       bool first_time,
       leveldb::Status* status) override {
     DefaultLevelDBFactory leveldb_factory;
     return TestableIndexedDBBackingStore::Open(
-        this, origin, data_directory, request_context_getter, &leveldb_factory,
-        context()->TaskRunner(), status);
+        this, origin, data_directory, data_format_version,
+        request_context_getter, &leveldb_factory, context()->TaskRunner(),
+        status);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestIDBFactory);
 };
 
 class IndexedDBBackingStoreTest : public testing::Test {
  public:
   IndexedDBBackingStoreTest() {}
   void SetUp() override {
@@ skipping 910 matching lines @@
 
   // Dictionary, message key and more.
   ASSERT_TRUE(WriteFile(info_path, "{\"message\":\"foo\",\"bar\":5}"));
   EXPECT_TRUE(
       IndexedDBBackingStore::ReadCorruptionInfo(path_base, origin, &message));
   EXPECT_FALSE(PathExists(info_path));
   EXPECT_EQ("foo", message);
 }
 
 }  // namespace content