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

chrome/browser/ui/webui/constrained_html_ui.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CONSTRAINED_HTML_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_CONSTRAINED_HTML_UI_H_
 #pragma once
 
-#include "content/browser/webui/web_ui.h"
+#include "base/compiler_specific.h"
 #include "content/public/browser/web_ui_controller.h"
 
 class ConstrainedWindow;
 class HtmlDialogUIDelegate;
 class Profile;
 class RenderViewHost;
 class TabContentsWrapper;
 
 namespace base {
 template<class T> class PropertyAccessor;
@@ skipping 21 matching lines @@
  protected:
   virtual ~ConstrainedHtmlUIDelegate() {}
 };
 
 // ConstrainedHtmlUI is a facility to show HTML WebUI content
 // in a tab-modal constrained dialog.  It is implemented as an adapter
 // between an HtmlDialogUI object and a ConstrainedWindow object.
 //
 // Since ConstrainedWindow requires platform-specific delegate
 // implementations, this class is just a factory stub.
-class ConstrainedHtmlUI : public WebUI, public content::WebUIController {
+class ConstrainedHtmlUI : public content::WebUIController {
  public:
-  explicit ConstrainedHtmlUI(content::WebContents* contents);
+  explicit ConstrainedHtmlUI(WebUI* web_ui);
   virtual ~ConstrainedHtmlUI();
 
   // WebUIController implementation:
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
 
   // Create a constrained HTML dialog. The actual object that gets created
   // is a ConstrainedHtmlUIDelegate, which later triggers construction of a
   // ConstrainedHtmlUI object.
   static ConstrainedHtmlUIDelegate* CreateConstrainedHtmlDialog(
       Profile* profile,
@@ skipping 11 matching lines @@
   ConstrainedHtmlUIDelegate* GetConstrainedDelegate();
 
  private:
   // JS Message Handler
   void OnDialogCloseMessage(const base::ListValue* args);
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedHtmlUI);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CONSTRAINED_HTML_UI_H_