Some changes to support incognito mode, and some small cleanup.

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 34efff3166c06364c8f129f8a03b76976c2b8262..d19a0b886b979c7eaf3a524b7c2c1c95364865d4 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
@@ -86,6 +86,7 @@ TEST(IndexedDBIOErrorTest, CleanUpTest) {
   std::string data_loss_message;
   bool disk_full = false;
   base::TaskRunner* task_runner = NULL;
+  bool clean_journal = false;
   scoped_refptr<IndexedDBBackingStore> backing_store =
       IndexedDBBackingStore::Open(factory,
                                   origin,
@@ -96,7 +97,7 @@ TEST(IndexedDBIOErrorTest, CleanUpTest) {
                                   &disk_full,
                                   &mock_leveldb_factory,
                                   task_runner,
-                                  false /* clean_journal */);
+                                  clean_journal);
 }
 
 // TODO(dgrogan): Remove expect_destroy if we end up not using it again. It is
@@ -144,6 +145,7 @@ TEST(IndexedDBNonRecoverableIOErrorTest, NuancedCleanupTest) {
   std::string data_loss_reason;
   bool disk_full = false;
   base::TaskRunner* task_runner = NULL;
+  bool clean_journal = false;
 
   MockErrorLevelDBFactory<int> mock_leveldb_factory(ENOSPC, false);
   scoped_refptr<IndexedDBBackingStore> backing_store =
@@ -156,7 +158,7 @@ TEST(IndexedDBNonRecoverableIOErrorTest, NuancedCleanupTest) {
                                   &disk_full,
                                   &mock_leveldb_factory,
                                   task_runner,
-                                  false /* clean_journal */);
+                                  clean_journal);
 
   MockErrorLevelDBFactory<base::File::Error> mock_leveldb_factory2(
       base::File::FILE_ERROR_NO_MEMORY, false);
@@ -170,7 +172,7 @@ TEST(IndexedDBNonRecoverableIOErrorTest, NuancedCleanupTest) {
                                   &disk_full,
                                   &mock_leveldb_factory2,
                                   task_runner,
-                                  false /* clean_journal */);
+                                  clean_journal);
 
   MockErrorLevelDBFactory<int> mock_leveldb_factory3(EIO, false);
   scoped_refptr<IndexedDBBackingStore> backing_store3 =
@@ -183,7 +185,7 @@ TEST(IndexedDBNonRecoverableIOErrorTest, NuancedCleanupTest) {
                                   &disk_full,
                                   &mock_leveldb_factory3,
                                   task_runner,
-                                  false /* clean_journal */);
+                                  clean_journal);
 
   MockErrorLevelDBFactory<base::File::Error> mock_leveldb_factory4(
       base::File::FILE_ERROR_FAILED, false);
@@ -197,7 +199,7 @@ TEST(IndexedDBNonRecoverableIOErrorTest, NuancedCleanupTest) {
                                   &disk_full,
                                   &mock_leveldb_factory4,
                                   task_runner,
-                                  false /* clean_journal */);
+                                  clean_journal);
 }
 
 }  // namespace