Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

chrome/browser/ui/webui/sessions_ui.cc

Index: chrome/browser/ui/webui/sessions_ui.cc
===================================================================
--- chrome/browser/ui/webui/sessions_ui.cc	(revision 117871)
+++ chrome/browser/ui/webui/sessions_ui.cc	(working copy)
@@ -257,11 +257,12 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-SessionsUI::SessionsUI(WebContents* contents) : WebUI(contents, this) {
-  AddMessageHandler(new SessionsDOMHandler());
+SessionsUI::SessionsUI(WebUI* web_ui) : WebUIController(web_ui) {
+  web_ui->AddMessageHandler(new SessionsDOMHandler());
 
   // Set up the chrome://sessions/ source.
-  Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
+  Profile* profile = Profile::FromBrowserContext(
+      web_ui->web_contents()->GetBrowserContext());
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateSessionsUIHTMLSource());
 }