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

chrome/browser/ui/webui/profiler_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/profiler_ui.h"
 
 #include <string>
 
 // When testing the javacript code, it is cumbersome to have to keep
 // re-building the resouces package and reloading the browser. To solve
 // this, enable the following flag to read the webapp's source files
 // directly off disk, so all you have to do is refresh the page to
 // test the modifications.
 //#define USE_SOURCE_FILES_DIRECTLY
 
 #include "base/bind.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/metrics/tracking_synchronizer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/trace_controller.h"
+#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 
 #ifdef USE_SOURCE_FILES_DIRECTLY
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 104 matching lines @@
   ProfilerUI* profiler_ui = reinterpret_cast<ProfilerUI*>(web_ui());
   profiler_ui->GetData();
 }
 
 void ProfilerMessageHandler::OnResetData(const ListValue* list) {
   tracked_objects::ThreadData::ResetAllThreadData();
 }
 
 }  // namespace
 
-ProfilerUI::ProfilerUI(WebContents* contents) : WebUI(contents, this) {
+ProfilerUI::ProfilerUI(WebUI* web_ui) : WebUIController(web_ui) {
   ui_weak_ptr_factory_.reset(new base::WeakPtrFactory<ProfilerUI>(this));
   ui_weak_ptr_ = ui_weak_ptr_factory_->GetWeakPtr();
 
-  AddMessageHandler(new ProfilerMessageHandler());
+  web_ui->AddMessageHandler(new ProfilerMessageHandler());
 
   // Set up the chrome://profiler/ source.
-  Profile::FromBrowserContext(contents->GetBrowserContext())->
+  Profile::FromBrowserContext(web_ui->web_contents()->GetBrowserContext())->
       GetChromeURLDataManager()->AddDataSource(CreateProfilerHTMLSource());
 }
 
 ProfilerUI::~ProfilerUI() {
 }
 
 void ProfilerUI::GetData() {
   TrackingSynchronizer::FetchProfilerDataAsynchronously(ui_weak_ptr_);
 }
 
 void ProfilerUI::ReceivedData(base::Value* value) {
   // Send the data to the renderer.
   scoped_ptr<Value> data_values(value);
-  CallJavascriptFunction("g_browserBridge.receivedData", *data_values.get());
+  web_ui()->CallJavascriptFunction(
+      "g_browserBridge.receivedData", *data_values.get());
 }