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

content/browser/webui/empty_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 "content/browser/webui/empty_web_ui_factory.h"
 
 namespace content {
 
 EmptyWebUIFactory::EmptyWebUIFactory() {
 }
 
 EmptyWebUIFactory::~EmptyWebUIFactory() {
 }
 
-WebUI* EmptyWebUIFactory::CreateWebUIForURL(WebContents* source,
-                                            const GURL& url) const {
+WebUIController* EmptyWebUIFactory::CreateWebUIForURL(WebUI* web_ui,
+                                                      const GURL& url) const {
   return NULL;
 }
 
 WebUI::TypeID EmptyWebUIFactory::GetWebUIType(
     content::BrowserContext* browser_context, const GURL& url) const {
   return WebUI::kNoWebUI;
 }
 
 bool EmptyWebUIFactory::UseWebUIForURL(
     content::BrowserContext* browser_context, const GURL& url) const {
@@ skipping 14 matching lines @@
     const GURL& url) const {
   return false;
 }
 
 // static
 EmptyWebUIFactory* EmptyWebUIFactory::GetInstance() {
   return Singleton<EmptyWebUIFactory>::get();
 }
 
 }  // namespace content