Ties up OOBE controllers and WebUI handlers.

chrome/browser/chromeos/login/wizard_controller.cc

Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index b866e30adad22ed182f421bd9b63992dd3225386..a073a5b11293378995753c6182b3e6a0278846cc 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -240,7 +240,7 @@ void WizardController::ShowLoginScreen() {
   host_->SetOobeProgress(chromeos::BackgroundView::SIGNIN);
   host_->StartSignInScreen();
   smooth_show_timer_.Stop();
-  oobe_display_.reset(NULL);
+  oobe_display_ = NULL;
 }
 
 void WizardController::ShowUpdateScreen() {
@@ -456,7 +456,7 @@ void WizardController::SetCurrentScreen(WizardScreen* new_current) {
 void WizardController::ShowCurrentScreen() {
   // ShowCurrentScreen may get called by smooth_show_timer_ even after
   // flow has been switched to sign in screen (ExistingUserController).
-  if (!oobe_display_.get())
+  if (!oobe_display_)
     return;
 
   smooth_show_timer_.Stop();