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

chrome/browser/chromeos/login/webui_login_display_host.cc

 // Copyright (c) 2012 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/chromeos/login/webui_login_display_host.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/oobe_display.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
+#include "content/browser/webui/web_ui.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ui/aura/window.h"
 #endif
 
 namespace chromeos {
 
@@ skipping 118 matching lines @@
     login_window_->Show();
 #if defined(USE_AURA)
     login_window_->GetNativeView()->SetName("WebUILoginView");
 #endif
     login_view_->OnWindowCreated();
   }
   login_view_->LoadURL(url);
 }
 
 OobeUI* WebUILoginDisplayHost::GetOobeUI() const {
-  return static_cast<OobeUI*>(login_view_->GetWebUI());
+  return static_cast<OobeUI*>(login_view_->GetWebUI()->GetController());
 }
 
 WizardController* WebUILoginDisplayHost::CreateWizardController() {
   // TODO(altimofeev): ensure that WebUI is ready.
   OobeDisplay* oobe_display = GetOobeUI();
   return new WizardController(this, oobe_display);
 }
 
 }  // namespace chromeos