Discard uncommitted changes when shutting down DOMStorageArea

content/browser/dom_storage/dom_storage_area_unittest.cc

 // Copyright 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 "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 50 matching lines @@
     EXPECT_TRUE(area->HasUncommittedChanges());
     // Make additional change and verify that a new commit batch
     // is created for that change.
     base::NullableString16 old_value;
     EXPECT_TRUE(area->SetItem(kKey2, kValue2, &old_value));
     EXPECT_TRUE(area->commit_batch_.get());
     EXPECT_EQ(1, area->commit_batches_in_flight_);
     EXPECT_TRUE(area->HasUncommittedChanges());
   }
 
-  // Class used in the CommitChangesAtShutdown test case.
-  class VerifyChangesCommittedDatabase : public DOMStorageDatabase {
-   public:
-    VerifyChangesCommittedDatabase() {}
-    ~VerifyChangesCommittedDatabase() override {
-      const base::string16 kKey(ASCIIToUTF16("key"));
-      const base::string16 kValue(ASCIIToUTF16("value"));
-      DOMStorageValuesMap values;
-      ReadAllValues(&values);
-      EXPECT_EQ(1u, values.size());
-      EXPECT_EQ(kValue, values[kKey].string());
-    }
-  };
-
  private:
   base::MessageLoop message_loop_;
 };
 
 TEST_F(DOMStorageAreaTest, DOMStorageAreaBasics) {
   scoped_refptr<DOMStorageArea> area(
       new DOMStorageArea(1, std::string(), kOrigin, NULL, NULL));
   base::string16 old_value;
   base::NullableString16 old_nullable_value;
   scoped_refptr<DOMStorageArea> copy;
@@ skipping 194 matching lines @@
   EXPECT_TRUE(area->HasOneRef());
   EXPECT_FALSE(area->HasUncommittedChanges());
   // Verify the changes made it to the database.
   values.clear();
   area->backing_->ReadAllValues(&values);
   EXPECT_EQ(2u, values.size());
   EXPECT_EQ(kValue, values[kKey].string());
   EXPECT_EQ(kValue2, values[kKey2].string());
 }
 
-TEST_F(DOMStorageAreaTest, CommitChangesAtShutdown) {
-  base::ScopedTempDir temp_dir;
-  ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
-  scoped_refptr<DOMStorageArea> area(new DOMStorageArea(
-      kOrigin,
-      temp_dir.path(),
-      new MockDOMStorageTaskRunner(base::MessageLoopProxy::current().get())));
-
-  // Inject an in-memory db to speed up the test and also to verify
-  // the final changes are commited in it's dtor.
-  static_cast<LocalStorageDatabaseAdapter*>(area->backing_.get())->db_.reset(
-      new VerifyChangesCommittedDatabase());
-
-  DOMStorageValuesMap values;
-  base::NullableString16 old_value;
-  EXPECT_TRUE(area->SetItem(kKey, kValue, &old_value));
-  EXPECT_TRUE(area->HasUncommittedChanges());
-  area->backing_->ReadAllValues(&values);
-  EXPECT_TRUE(values.empty());  // not committed yet
-  area->Shutdown();
-  base::MessageLoop::current()->RunUntilIdle();
-  EXPECT_TRUE(area->HasOneRef());
-  EXPECT_FALSE(area->backing_.get());
-  // The VerifyChangesCommittedDatabase destructor verifies values
-  // were committed.
-}
-
 TEST_F(DOMStorageAreaTest, DeleteOrigin) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   scoped_refptr<DOMStorageArea> area(new DOMStorageArea(
       kOrigin,
       temp_dir.path(),
       new MockDOMStorageTaskRunner(base::MessageLoopProxy::current().get())));
 
   // This test puts files on disk.
   base::FilePath db_file_path = static_cast<LocalStorageDatabaseAdapter*>(
@@ skipping 192 matching lines @@
                 base::TimeDelta::FromMilliseconds(750)));
   EXPECT_EQ(base::TimeDelta(),
             rate_limiter.ComputeDelayNeeded(
                 base::TimeDelta::FromMilliseconds(1500)));
   EXPECT_EQ(base::TimeDelta(),
             rate_limiter.ComputeDelayNeeded(
                 base::TimeDelta::FromDays(1)));
 }
 
 }  // namespace content