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

chrome/browser/ui/webui/bookmarks_ui.h

Index: chrome/browser/ui/webui/bookmarks_ui.h
===================================================================
--- chrome/browser/ui/webui/bookmarks_ui.h	(revision 117871)
+++ chrome/browser/ui/webui/bookmarks_ui.h	(working copy)
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/web_ui_controller.h"
 
 class RefCountedMemory;
@@ -32,9 +31,9 @@
 
 // This class is used to hook up chrome://bookmarks/ which in turn gets
 // overridden by an extension.
-class BookmarksUI : public WebUI, public content::WebUIController {
+class BookmarksUI : public content::WebUIController {
  public:
-  explicit BookmarksUI(content::WebContents* contents);
+  explicit BookmarksUI(WebUI* web_ui);
 
   static RefCountedMemory* GetFaviconResourceBytes();