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

content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc

Index: content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc
diff --git a/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc b/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc
index 45890604d3c8c324eb6554070f04b017ebbab110..81f76a964fcadde4ae65dd354164c7d836db2ffa 100644
--- a/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc
+++ b/content/browser/indexed_db/indexed_db_cleanup_on_io_error_unittest.cc
@@ -15,6 +15,7 @@
 #include "content/browser/indexed_db/indexed_db_data_loss_info.h"
 #include "content/browser/indexed_db/leveldb/leveldb_database.h"
 #include "content/browser/indexed_db/leveldb/mock_leveldb_factory.h"
+#include "content/common/indexed_db/indexed_db_data_format_version.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -22,6 +23,7 @@
 
 using base::StringPiece;
 using content::IndexedDBBackingStore;
+using content::IndexedDBDataFormatVersion;
 using content::LevelDBComparator;
 using content::LevelDBDatabase;
 using content::LevelDBFactory;
@@ -105,8 +107,9 @@ TEST(IndexedDBIOErrorTest, CleanUpTest) {
   leveldb::Status s;
   scoped_refptr<IndexedDBBackingStore> backing_store =
       IndexedDBBackingStore::Open(
-          factory, origin, path, request_context_getter, &data_loss_info,
-          &disk_full, &mock_leveldb_factory, task_runner, clean_journal, &s);
+          factory, origin, path, IndexedDBDataFormatVersion(),
+          request_context_getter, &data_loss_info, &disk_full,
+          &mock_leveldb_factory, task_runner, clean_journal, &s);
 }
 
 TEST(IndexedDBNonRecoverableIOErrorTest, NuancedCleanupTest) {
@@ -137,8 +140,9 @@ TEST(IndexedDBNonRecoverableIOErrorTest, NuancedCleanupTest) {
                                           base::File::FILE_ERROR_NO_SPACE));
   scoped_refptr<IndexedDBBackingStore> backing_store =
       IndexedDBBackingStore::Open(
-          factory, origin, path, request_context_getter, &data_loss_info,
-          &disk_full, &mock_leveldb_factory, task_runner, clean_journal, &s);
+          factory, origin, path, IndexedDBDataFormatVersion(),
+          request_context_getter, &data_loss_info, &disk_full,
+          &mock_leveldb_factory, task_runner, clean_journal, &s);
   ASSERT_TRUE(s.IsIOError());
 
   busted_factory.SetOpenError(MakeIOError("some filename",
@@ -147,8 +151,9 @@ TEST(IndexedDBNonRecoverableIOErrorTest, NuancedCleanupTest) {
                                           base::File::FILE_ERROR_NO_MEMORY));
   scoped_refptr<IndexedDBBackingStore> backing_store2 =
       IndexedDBBackingStore::Open(
-          factory, origin, path, request_context_getter, &data_loss_info,
-          &disk_full, &mock_leveldb_factory, task_runner, clean_journal, &s);
+          factory, origin, path, IndexedDBDataFormatVersion(),
+          request_context_getter, &data_loss_info, &disk_full,
+          &mock_leveldb_factory, task_runner, clean_journal, &s);
   ASSERT_TRUE(s.IsIOError());
 
   busted_factory.SetOpenError(MakeIOError("some filename", "some message",
@@ -156,8 +161,9 @@ TEST(IndexedDBNonRecoverableIOErrorTest, NuancedCleanupTest) {
                                           base::File::FILE_ERROR_IO));
   scoped_refptr<IndexedDBBackingStore> backing_store3 =
       IndexedDBBackingStore::Open(
-          factory, origin, path, request_context_getter, &data_loss_info,
-          &disk_full, &mock_leveldb_factory, task_runner, clean_journal, &s);
+          factory, origin, path, IndexedDBDataFormatVersion(),
+          request_context_getter, &data_loss_info, &disk_full,
+          &mock_leveldb_factory, task_runner, clean_journal, &s);
   ASSERT_TRUE(s.IsIOError());
 
   busted_factory.SetOpenError(MakeIOError("some filename",
@@ -166,8 +172,9 @@ TEST(IndexedDBNonRecoverableIOErrorTest, NuancedCleanupTest) {
                                           base::File::FILE_ERROR_FAILED));
   scoped_refptr<IndexedDBBackingStore> backing_store4 =
       IndexedDBBackingStore::Open(
-          factory, origin, path, request_context_getter, &data_loss_info,
-          &disk_full, &mock_leveldb_factory, task_runner, clean_journal, &s);
+          factory, origin, path, IndexedDBDataFormatVersion(),
+          request_context_getter, &data_loss_info, &disk_full,
+          &mock_leveldb_factory, task_runner, clean_journal, &s);
   ASSERT_TRUE(s.IsIOError());
 }