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

content/browser/indexed_db/indexed_db_cleanup_on_io_error_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 <cerrno>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #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"
 #include "third_party/leveldatabase/env_chromium.h"
 
 using base::StringPiece;
 using content::IndexedDBBackingStore;
+using content::IndexedDBDataFormatVersion;
 using content::LevelDBComparator;
 using content::LevelDBDatabase;
 using content::LevelDBFactory;
 using content::LevelDBSnapshot;
 using testing::_;
 using testing::Exactly;
 using testing::Invoke;
 
 namespace base {
 class TaskRunner;
@@ skipping 63 matching lines @@
 
   EXPECT_CALL(mock_leveldb_factory, OpenLevelDB(_, _, _, _)).Times(Exactly(1));
   EXPECT_CALL(mock_leveldb_factory, DestroyLevelDB(_)).Times(Exactly(1));
   content::IndexedDBDataLossInfo data_loss_info;
   bool disk_full = false;
   base::SequencedTaskRunner* task_runner = NULL;
   bool clean_journal = false;
   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) {
   content::IndexedDBFactory* factory = NULL;
   const url::Origin origin(GURL("http://localhost:81"));
   scoped_refptr<net::URLRequestContextGetter> request_context_getter;
   base::ScopedTempDir temp_directory;
   ASSERT_TRUE(temp_directory.CreateUniqueTempDir());
   const base::FilePath path = temp_directory.GetPath();
   content::IndexedDBDataLossInfo data_loss_info;
@@ skipping 10 matching lines @@
       Invoke(&busted_factory, &BustedLevelDBFactory::DestroyLevelDB));
 
   EXPECT_CALL(mock_leveldb_factory, OpenLevelDB(_, _, _, _)).Times(Exactly(4));
   EXPECT_CALL(mock_leveldb_factory, DestroyLevelDB(_)).Times(Exactly(0));
 
   busted_factory.SetOpenError(MakeIOError("some filename", "some message",
                                           leveldb_env::kNewLogger,
                                           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",
                                           "some message",
                                           leveldb_env::kNewLogger,
                                           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",
                                           leveldb_env::kNewLogger,
                                           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",
                                           "some message",
                                           leveldb_env::kNewLogger,
                                           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());
 }
 
 }  // namespace