Clear up session only storage on localstorage shutdown

content/browser/dom_storage/dom_storage_browsertest.cc

 // Copyright (c) 2012 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/command_line.h"
 #include "build/build_config.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
 #include "content/browser/dom_storage/local_storage_context_mojo.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/dom_storage/dom_storage_types.h"
@@ skipping 36 matching lines @@
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ContentBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kMojoLocalStorage);
   }
 
   LocalStorageContextMojo* context() {
     return static_cast<DOMStorageContextWrapper*>(
                BrowserContext::GetDefaultStoragePartition(
                    shell()->web_contents()->GetBrowserContext())
                    ->GetDOMStorageContext())
-        ->mojo_state_.get();
+        ->mojo_state_;
   }
 
   void EnsureConnected() {
     base::RunLoop run_loop;
-    context()->RunWhenConnected(run_loop.QuitClosure());
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::BindOnce(
+            &LocalStorageContextMojo::RunWhenConnected,
+            base::Unretained(context()),
+            base::BindOnce(base::IgnoreResult(&base::TaskRunner::PostTask),
+                           base::ThreadTaskRunnerHandle::Get(), FROM_HERE,
+                           run_loop.QuitClosure())));
     run_loop.Run();
   }
-
-  void Flush() {
-    // Process any tasks that are currently queued, to ensure
-    // LevelDBWrapperImpl methods get called.
-    base::RunLoop().RunUntilIdle();
-    // And finally flush all the now queued up changes to leveldb.
-    context()->Flush();
-    base::RunLoop().RunUntilIdle();
-  }
 };
 
 static const bool kIncognito = true;
 static const bool kNotIncognito = false;
 
 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheck) {
   SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito);
 }
 
 IN_PROC_BROWSER_TEST_F(DOMStorageBrowserTest, SanityCheckIncognito) {
@@ skipping 18 matching lines @@
   SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kNotIncognito);
 }
 
 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, SanityCheckIncognito) {
   SimpleTest(GetTestUrl("dom_storage", "sanity_check.html"), kIncognito);
 }
 
 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, PRE_DataPersists) {
   EnsureConnected();
   SimpleTest(GetTestUrl("dom_storage", "store_data.html"), kNotIncognito);
-  Flush();
 }
 
 IN_PROC_BROWSER_TEST_F(MojoDOMStorageBrowserTest, MAYBE_DataPersists) {
   SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito);
 }
 
 class DOMStorageMigrationBrowserTest : public DOMStorageBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ContentBrowserTest::SetUpCommandLine(command_line);
@@ skipping 13 matching lines @@
 #if defined(OS_ANDROID)
 #define MAYBE_DataMigrates DISABLED_DataMigrates
 #else
 #define MAYBE_DataMigrates DataMigrates
 #endif
 IN_PROC_BROWSER_TEST_F(DOMStorageMigrationBrowserTest, MAYBE_DataMigrates) {
   SimpleTest(GetTestUrl("dom_storage", "verify_data.html"), kNotIncognito);
 }
 
 }  // namespace content