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

chrome/browser/ui/webui/test_chrome_web_ui_factory.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/test_chrome_web_ui_factory.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/web_contents.h"
 
 using content::WebContents;
+using content::WebUIController;
 
 TestChromeWebUIFactory::WebUIProvider::~WebUIProvider() {
 }
 
 TestChromeWebUIFactory::TestChromeWebUIFactory() {
 }
 
 TestChromeWebUIFactory::~TestChromeWebUIFactory() {
 }
 
 void TestChromeWebUIFactory::AddFactoryOverride(const std::string& host,
                                                 WebUIProvider* provider) {
   DCHECK_EQ(0U, GetInstance()->factory_overrides_.count(host));
   GetInstance()->factory_overrides_[host] = provider;
 }
 
 void TestChromeWebUIFactory::RemoveFactoryOverride(const std::string& host) {
   DCHECK_EQ(1U, GetInstance()->factory_overrides_.count(host));
   GetInstance()->factory_overrides_.erase(host);
 }
 
 WebUI::TypeID TestChromeWebUIFactory::GetWebUIType(
     content::BrowserContext* browser_context, const GURL& url) const {
   Profile* profile = Profile::FromBrowserContext(browser_context);
   WebUIProvider* provider = GetWebUIProvider(profile, url);
   return provider ? reinterpret_cast<WebUI::TypeID>(provider) :
       ChromeWebUIFactory::GetWebUIType(profile, url);
 }
 
-WebUI* TestChromeWebUIFactory::CreateWebUIForURL(WebContents* web_contents,
-                                                 const GURL& url) const {
+WebUIController* TestChromeWebUIFactory::CreateWebUIForURL(
+    WebUI* web_ui, const GURL& url) const {
   Profile* profile =
-      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+      Profile::FromBrowserContext(web_ui->web_contents()->GetBrowserContext());
   WebUIProvider* provider = GetWebUIProvider(profile, url);
-  return provider ? provider->NewWebUI(web_contents, url) :
-      ChromeWebUIFactory::CreateWebUIForURL(web_contents, url);
+  return provider ? provider->NewWebUI(web_ui, url) :
+      ChromeWebUIFactory::CreateWebUIForURL(web_ui, url);
 }
 
 TestChromeWebUIFactory* TestChromeWebUIFactory::GetInstance() {
   return static_cast<TestChromeWebUIFactory*>(
       ChromeWebUIFactory::GetInstance());
 }
 
 TestChromeWebUIFactory::WebUIProvider* TestChromeWebUIFactory::GetWebUIProvider(
     Profile* profile, const GURL& url) const {
   FactoryOverridesMap::const_iterator found =
       factory_overrides_.find(url.host());
   return (found == factory_overrides_.end()) ? NULL : found->second;
 }