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

content/browser/indexed_db/mock_indexed_db_factory.h

Index: content/browser/indexed_db/mock_indexed_db_factory.h
diff --git a/content/browser/indexed_db/mock_indexed_db_factory.h b/content/browser/indexed_db/mock_indexed_db_factory.h
index a94314c5e8a7270e66ccd22293775e24e9f1b050..5b5d080302adfe4e57fcc6728e4051c3273c1181 100644
--- a/content/browser/indexed_db/mock_indexed_db_factory.h
+++ b/content/browser/indexed_db/mock_indexed_db_factory.h
@@ -22,36 +22,40 @@ class MockIndexedDBFactory : public IndexedDBFactory {
   MOCK_METHOD2(ReleaseDatabase,
                void(const IndexedDBDatabase::Identifier& identifier,
                     bool forced_close));
-  MOCK_METHOD4(
+  MOCK_METHOD5(
       GetDatabaseNames,
       void(scoped_refptr<IndexedDBCallbacks> callbacks,
            const url::Origin& origin,
            const base::FilePath& data_directory,
+           const IndexedDBDataFormatVersion& data_format_version,
            scoped_refptr<net::URLRequestContextGetter> request_context_getter));
-  MOCK_METHOD5(
+  MOCK_METHOD6(
       OpenProxy,
       void(const base::string16& name,
            IndexedDBPendingConnection* connection,
            scoped_refptr<net::URLRequestContextGetter> request_context_getter,
            const url::Origin& origin,
-           const base::FilePath& data_directory));
+           const base::FilePath& data_directory,
+           const IndexedDBDataFormatVersion& data_format_version));
   // Googlemock can't deal with move-only types, so *Proxy() is a workaround.
   virtual void Open(
       const base::string16& name,
       std::unique_ptr<IndexedDBPendingConnection> connection,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       const url::Origin& origin,
-      const base::FilePath& data_directory) {
+      const base::FilePath& data_directory,
+      const IndexedDBDataFormatVersion& data_format_version) {
     OpenProxy(name, connection.get(), request_context_getter, origin,
-              data_directory);
+              data_directory, data_format_version);
   }
-  MOCK_METHOD6(
+  MOCK_METHOD7(
       DeleteDatabase,
       void(const base::string16& name,
            scoped_refptr<net::URLRequestContextGetter> request_context_getter,
            scoped_refptr<IndexedDBCallbacks> callbacks,
            const url::Origin& origin,
            const base::FilePath& data_directory,
+           const IndexedDBDataFormatVersion& data_format_version,
            bool force_close));
   MOCK_METHOD1(HandleBackingStoreFailure, void(const url::Origin& origin));
   MOCK_METHOD2(HandleBackingStoreCorruption,
@@ -72,21 +76,23 @@ class MockIndexedDBFactory : public IndexedDBFactory {
  protected:
   virtual ~MockIndexedDBFactory();
 
-  MOCK_METHOD6(
+  MOCK_METHOD7(
       OpenBackingStore,
       scoped_refptr<IndexedDBBackingStore>(
           const url::Origin& origin,
           const base::FilePath& data_directory,
+          const IndexedDBDataFormatVersion& client_data_format_version,
           scoped_refptr<net::URLRequestContextGetter> request_context_getter,
           IndexedDBDataLossInfo* data_loss_info,
           bool* disk_full,
           leveldb::Status* s));
 
-  MOCK_METHOD7(
+  MOCK_METHOD8(
       OpenBackingStoreHelper,
       scoped_refptr<IndexedDBBackingStore>(
           const url::Origin& origin,
           const base::FilePath& data_directory,
+          const IndexedDBDataFormatVersion& client_data_format_version,
           scoped_refptr<net::URLRequestContextGetter> request_context_getter,
           IndexedDBDataLossInfo* data_loss_info,
           bool* disk_full,