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

chrome/browser/download/save_page_browsertest.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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 79 matching lines @@
         content::NotificationService::AllSources());
     return content::Details<DownloadItem>(observer.details()).ptr()->
         GetOriginalUrl();
   }
 
 #if defined(OS_CHROMEOS) && !defined(USE_AURA)
   const ActiveDownloadsUI::DownloadList& GetDownloads() const {
     Browser* popup = ActiveDownloadsUI::GetPopup();
     EXPECT_TRUE(popup);
     ActiveDownloadsUI* downloads_ui = static_cast<ActiveDownloadsUI*>(
-        popup->GetSelectedWebContents()->GetWebUI());
+        popup->GetSelectedWebContents()->GetWebUI()->GetController());
     EXPECT_TRUE(downloads_ui);
     return downloads_ui->GetDownloads();
   }
 #endif
 
   void CheckDownloadUI(const FilePath& download_path) const {
 #if defined(OS_CHROMEOS) && !defined(USE_AURA)
     const ActiveDownloadsUI::DownloadList& downloads = GetDownloads();
     EXPECT_EQ(downloads.size(), 1U);
 
@@ skipping 236 matching lines @@
 IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, ExplicitCancel) {
   GURL url = NavigateToMockURL("a");
   FilePath full_file_name, dir;
   GetDestinationPaths("a", &full_file_name, &dir);
   scoped_refptr<SavePackage> save_package(new SavePackage(GetCurrentTab(),
       SavePackage::SAVE_AS_ONLY_HTML, full_file_name, dir));
   save_package->Cancel(true);
 }
 
 }  // namespace