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

chrome/browser/ui/webui/uber/uber_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_UBER_UBER_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_UBER_UBER_UI_H_
 #pragma once
 
 #include <string>
 
 #include "base/memory/scoped_vector.h"
 #include "base/values.h"
-#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/web_ui_controller.h"
 
 // The WebUI class for the uber page (chrome://chrome). It manages the UI for
 // the uber page (navigation bar and so forth) as well as WebUI objects for
 // pages that appear in the uber page.
-class UberUI : public WebUI, public content::WebUIController {
+class UberUI : public content::WebUIController {
  public:
-  explicit UberUI(content::WebContents* contents);
+  explicit UberUI(WebUI* web_ui);
   virtual ~UberUI();
 
   // WebUIController implementation.
   virtual bool OverrideHandleWebUIMessage(const GURL& source_url,
                                           const std::string& message,
                                           const ListValue& args) OVERRIDE;
 
   // We forward these to |sub_uis_|.
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderViewReused(RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidBecomeActiveForReusedRenderView() OVERRIDE;
 
  private:
   // A map from URL origin to WebUI instance.
   typedef std::map<std::string, WebUI*> SubpageMap;
 
   // Creates and stores a WebUI for the given URL.
   void RegisterSubpage(const std::string& page_url);
 
   // The WebUI*s in this map are owned.
   SubpageMap sub_uis_;
 
   DISALLOW_COPY_AND_ASSIGN(UberUI);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_UBER_UBER_UI_H_