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

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/strings/string16.h"
@@ skipping 68 matching lines @@
   base::ScopedTempDir temp_directory;
   ASSERT_TRUE(temp_directory.CreateUniqueTempDir());
   const base::FilePath path = temp_directory.path();
   net::URLRequestContext* request_context = NULL;
   MockLevelDBFactory mock_leveldb_factory;
   blink::WebIDBDataLoss data_loss =
       blink::WebIDBDataLossNone;
   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,
                                   path,
                                   request_context,
                                   &data_loss,
                                   &data_loss_message,
                                   &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
 // currently set to false in all 4 calls below.
 template <class T>
 class MockErrorLevelDBFactory : public LevelDBFactory {
  public:
   MockErrorLevelDBFactory(T error, bool expect_destroy)
       : error_(error),
         expect_destroy_(expect_destroy),
@@ skipping 27 matching lines @@
   const GURL origin("http://localhost:81");
   net::URLRequestContext* request_context = NULL;
   base::ScopedTempDir temp_directory;
   ASSERT_TRUE(temp_directory.CreateUniqueTempDir());
   const base::FilePath path = temp_directory.path();
   blink::WebIDBDataLoss data_loss =
       blink::WebIDBDataLossNone;
   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 =
       IndexedDBBackingStore::Open(factory,
                                   origin,
                                   path,
                                   request_context,
                                   &data_loss,
                                   &data_loss_reason,
                                   &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);
   scoped_refptr<IndexedDBBackingStore> backing_store2 =
       IndexedDBBackingStore::Open(factory,
                                   origin,
                                   path,
                                   request_context,
                                   &data_loss,
                                   &data_loss_reason,
                                   &disk_full,
                                   &mock_leveldb_factory2,
                                   task_runner,
-                                  false /* clean_journal */);
+                                  clean_journal);
 
   MockErrorLevelDBFactory<int> mock_leveldb_factory3(EIO, false);
   scoped_refptr<IndexedDBBackingStore> backing_store3 =
       IndexedDBBackingStore::Open(factory,
                                   origin,
                                   path,
                                   request_context,
                                   &data_loss,
                                   &data_loss_reason,
                                   &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);
   scoped_refptr<IndexedDBBackingStore> backing_store4 =
       IndexedDBBackingStore::Open(factory,
                                   origin,
                                   path,
                                   request_context,
                                   &data_loss,
                                   &data_loss_reason,
                                   &disk_full,
                                   &mock_leveldb_factory4,
                                   task_runner,
-                                  false /* clean_journal */);
+                                  clean_journal);
 }
 
 }  // namespace