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

chrome/browser/ui/webui/policy_ui.cc

 // 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.
 
 #include "chrome/browser/ui/webui/policy_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 215 matching lines @@
   DCHECK(static_cast<size_t>(error_details) < arraysize(error_to_string_id));
   return l10n_util::GetStringUTF16(error_to_string_id[error_details]);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // PolicyUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-PolicyUI::PolicyUI(WebContents* contents) : WebUI(contents, this) {
-  AddMessageHandler(new PolicyUIHandler);
+PolicyUI::PolicyUI(WebUI* web_ui) : WebUIController(web_ui) {
+  web_ui->AddMessageHandler(new PolicyUIHandler);
 
   // Set up the chrome://policy/ source.
-  Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
+  Profile* profile = Profile::FromBrowserContext(
+      web_ui->web_contents()->GetBrowserContext());
   profile->GetChromeURLDataManager()->AddDataSource(CreatePolicyUIHTMLSource());
 }
 
 PolicyUI::~PolicyUI() {
 }