Move StoragePartition into content/public and remove BrowserContext::GetDOMStorageContext().

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index f5bb9c50c11291fcfa411cfd1b5322c773a3272d..5096f065ebf4de7f8b3c18a87a9629451b71a6e0 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -85,6 +85,7 @@
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -317,8 +318,12 @@ ProfileImpl::ProfileImpl(const FilePath& path,
   }
 
   if (command_line->HasSwitch(switches::kEnableRestoreSessionState)) {
-    content::BrowserContext::GetDefaultDOMStorageContext(this)->
-        SetSaveSessionStorageOnDisk();
+    // TODO(ajwong): This may be unsafe in the constructor as this calls back
+    // into ExtensionService.
+    //
+    // http://crbug.com/142656
+    content::BrowserContext::GetDefaultStoragePartition(this)->
+        GetDOMStorageContext()->SetSaveSessionStorageOnDisk();
   }
 }