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

chrome/browser/ui/webui/policy_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_POLICY_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_POLICY_UI_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/policy/cloud_policy_subsystem.h"
 #include "chrome/browser/policy/configuration_policy_reader.h"
-#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 namespace policy {
 class CloudPolicyDataStore;
 }
 
 // The base class handler of Javascript messages of the about:policy page.
 class PolicyUIHandler : public content::WebUIMessageHandler,
                         public policy::PolicyStatus::Observer {
@@ skipping 40 matching lines @@
   // enum value |error_details|.
   static string16 CreateStatusMessageString(
       policy::CloudPolicySubsystem::ErrorDetails error_details);
 
   scoped_ptr<policy::PolicyStatus> policy_status_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyUIHandler);
 };
 
 // The Web UI handler for about:policy.
-class PolicyUI : public WebUI, public content::WebUIController {
+class PolicyUI : public content::WebUIController {
  public:
-  explicit PolicyUI(content::WebContents* contents);
+  explicit PolicyUI(WebUI* web_ui);
   virtual ~PolicyUI();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PolicyUI);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_POLICY_UI_H_