Shutdown StoragePartition before ProfileIOData is being shut down

content/browser/browser_context.cc

Index: content/browser/browser_context.cc
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index 729df89e82c5aea8770db483dfdfbb6bdf806e55..59b0047b06762270ccd31eb0b1abae02ed25d0d7 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -486,10 +486,18 @@ BrowserContext::~BrowserContext() {
       << "Attempting to destroy a BrowserContext that never called "
       << "Initialize()";
 
+  DCHECK(!GetUserData(kStoragePartitionMapKeyName))
+      << "StoragePartitionMap is not shut down properly";
+
   RemoveBrowserContextFromUserIdMap(this);
 
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 }
 
+void BrowserContext::ShutdownStoragePartitions() {
+  if (GetUserData(kStoragePartitionMapKeyName))
+    RemoveUserData(kStoragePartitionMapKeyName);

[mmenke, 2016/07/19 17:55:20]

Storage partitions are stored as user data attached to the BrowserContext?  I
don't suppose there are plans to change that?

[kinuko, 2016/07/21 03:06:25]

I suppose we wanted to avoid exposing internal stuff at BrowserContext's public
header?  I don't like UserData approach too much but I want to explorer other
options separately from this change.

[mmenke, 2016/07/21 15:27:20]

I didn't mean to suggest you make that part of this change, was just hoping that
since you seem to be working on the code, you might want to consider changing
the ownership model.

+}
+
 }  // namespace content