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

chrome/browser/ui/webui/options/options_sync_setup_handler.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/options/options_sync_setup_handler.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "content/browser/webui/web_ui.h"
 
 OptionsSyncSetupHandler::OptionsSyncSetupHandler(
     ProfileManager* profile_manager) : SyncSetupHandler(profile_manager) {
 }
 
 OptionsSyncSetupHandler::~OptionsSyncSetupHandler() {
 }
 
 void OptionsSyncSetupHandler::StepWizardForShowSetupUI() {
   ProfileSyncService* service =
@@ skipping 11 matching lines @@
   } else {
     service->get_wizard().Step(SyncSetupWizard::GetLoginState());
   }
 }
 
 void OptionsSyncSetupHandler::ShowSetupUI() {
   // Show the Sync Setup page.
   scoped_ptr<Value> page(Value::CreateStringValue("syncSetup"));
   web_ui()->CallJavascriptFunction("OptionsPage.navigateToPage", *page);
 }