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

content/browser/tab_contents/tab_contents_unittest.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 "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/mock_content_browser_client.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
@@ skipping 12 matching lines @@
 #include "content/public/common/content_constants.h"
 #include "content/public/common/url_constants.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webkit_glue.h"
 
 using content::BrowserThread;
 using content::NavigationEntry;
 using content::NavigationEntryImpl;
 using content::WebContents;
+using content::WebUIController;
 using webkit::forms::PasswordForm;
 
 namespace {
 
 class TabContentsTestWebUIFactory : public content::EmptyWebUIFactory {
  public:
-  virtual WebUI* CreateWebUIForURL(WebContents* source,
-                                   const GURL& url) const OVERRIDE {
+  virtual WebUIController* CreateWebUIForURL(WebUI* web_ui,
+                                             const GURL& url) const OVERRIDE {
    if (!HasWebUIScheme(url))
      return NULL;
 
-   static content::WebUIController temp_controller;
-   return new WebUI(source, &temp_controller);
+   return new WebUIController(web_ui);
   }
 
   virtual bool UseWebUIForURL(content::BrowserContext* browser_context,
                               const GURL& url) const OVERRIDE {
     return HasWebUIScheme(url);
   }
 
   virtual bool HasWebUIScheme(const GURL& url) const OVERRIDE {
     return url.SchemeIs("tabcontentstest");
   }
 
   virtual bool IsURLAcceptableForWebUI(content::BrowserContext* browser_context,
       const GURL& url) const {
     return HasWebUIScheme(url);
   }
-
 };
 
 class TabContentsTestBrowserClient : public content::MockContentBrowserClient {
  public:
   TabContentsTestBrowserClient() {
   }
 
   virtual content::WebUIFactory* GetWebUIFactory() OVERRIDE {
     return &factory_;
   }
@@ skipping 1752 matching lines @@
 
   // It should have a transient entry.
   EXPECT_TRUE(other_controller.GetTransientEntry());
 
   // And the interstitial should be showing.
   EXPECT_TRUE(other_contents->ShowingInterstitialPage());
 
   // And the interstitial should do a reload on don't proceed.
   EXPECT_TRUE(other_contents->GetInterstitialPage()->reload_on_dont_proceed());
 }