Clear up session only storage on localstorage shutdown

content/browser/dom_storage/dom_storage_context_wrapper.h

Index: content/browser/dom_storage/dom_storage_context_wrapper.h
diff --git a/content/browser/dom_storage/dom_storage_context_wrapper.h b/content/browser/dom_storage/dom_storage_context_wrapper.h
index 2c37e330b91a164044bea0da9f7dd3282880a5bd..85b6b60f1400da6721f83f3b37f8aeb4dafe3bb7 100644
--- a/content/browser/dom_storage/dom_storage_context_wrapper.h
+++ b/content/browser/dom_storage/dom_storage_context_wrapper.h
@@ -96,11 +96,13 @@ class CONTENT_EXPORT DOMStorageContextWrapper :
   void PurgeMemory(DOMStorageContextImpl::PurgeOption purge_option);
 
   void GotMojoLocalStorageUsage(GetLocalStorageUsageCallback callback,
+                                base::SingleThreadTaskRunner* reply_task_runner,
                                 std::vector<LocalStorageUsageInfo> usage);
 
   // Keep all mojo-ish details together and not bleed them through the public
   // interface.
-  std::unique_ptr<LocalStorageContextMojo> mojo_state_;

[michaeln, 2017/05/18 23:55:39]

maybe continue using std::unique_ptr<> to document ownership even though we
won't be using the dtor for destruction

oh, nevermind, i see, the dtor is private, maybe comment about the ownership
here?

[Marijn Kruisselbrink, 2017/05/19 00:19:46]

It definitely would be cleanest to somehow have a std::unique_ptr with a custom
deleter that posts a task to the mojo_task_runner_ to call ShutdownAndDelete.
But actually doing that seemed to involve so much code and make things in
general a lot more confusing (due to the need of the deleter to actually know
what task runner to post a task to), so it seemed simpler to just keep it as a
raw pointer, since it's not like random code will ever end up creating
LocalStorageContextMojo instances...

Added more of a comment explaining the ownership at least.

+  LocalStorageContextMojo* mojo_state_ = nullptr;
+  scoped_refptr<base::SingleThreadTaskRunner> mojo_task_runner_;
 
   // To receive memory pressure signals.
   std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;