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 41 matching lines @@
   LocalStorageContextMojo* context() {
     return static_cast<DOMStorageContextWrapper*>(
                BrowserContext::GetDefaultStoragePartition(
                    shell()->web_contents()->GetBrowserContext())
                    ->GetDOMStorageContext())
         ->mojo_state_.get();
   }
 
   void EnsureConnected() {
     base::RunLoop run_loop;
-    context()->RunWhenConnected(run_loop.QuitClosure());
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::BindOnce(
+            &LocalStorageContextMojo::RunWhenConnected, 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();
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::BindOnce(&LocalStorageContextMojo::Flush, context()));
     base::RunLoop().RunUntilIdle();

[michaeln, 2017/05/03 21:01:29]

I'm not sure what the RunUntilIdle() here accomplished before, but i don't think
it's applicable anymore now that the mojo interface is running on a different
thread?

Can this line be deleted?

[Marijn Kruisselbrink, 2017/05/04 23:03:46]

Hmm, yeah, good point... probably all of this flush method can actually be
deleted now the shutdown behavior is implemented, as this was only used to
(attempt to) make sure that data got flushed properly on browser shutdown...

   }
 };
 
 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);
 }
 
@@ skipping 67 matching lines @@
 // http://crbug.com/712872 All the mojo tests are flaky on Mac.
 #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