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

chrome/browser/ui/webui/conflicts_ui.h

Index: chrome/browser/ui/webui/conflicts_ui.h
===================================================================
--- chrome/browser/ui/webui/conflicts_ui.h	(revision 117871)
+++ chrome/browser/ui/webui/conflicts_ui.h	(working copy)
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_
 #pragma once
 
-#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/web_ui_controller.h"
 
 #if defined(OS_WIN)
@@ -14,9 +13,9 @@
 class RefCountedMemory;
 
 // The Web UI handler for about:conflicts.
-class ConflictsUI : public WebUI, public content::WebUIController {
+class ConflictsUI : public content::WebUIController {
  public:
-  explicit ConflictsUI(content::WebContents* contents);
+  explicit ConflictsUI(WebUI* web_ui);
 
   static RefCountedMemory* GetFaviconResourceBytes();