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

chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 627 matching lines @@
 }
 
 }  // namespace imageburner.
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ImageBurnUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-ImageBurnUI::ImageBurnUI(WebContents* contents) : WebUI(contents, this) {
+ImageBurnUI::ImageBurnUI(WebUI* web_ui) : WebUIController(web_ui) {
+  WebContents* contents = web_ui->web_contents();
   imageburner::WebUIHandler* handler = new imageburner::WebUIHandler(contents);
-  AddMessageHandler(handler);
+  web_ui->AddMessageHandler(handler);
 
   Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateImageburnerUIHTMLSource());
 }