[cros,de-hack] Get rid of singleton for the WebUILoginScreen.

chrome/browser/chromeos/login/existing_user_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 67 matching lines @@
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
   // Set a delegate that we will pass LoginStatusConsumer events to.
   // Used for testing.
   void set_login_status_consumer(LoginStatusConsumer* consumer) {
     login_status_consumer_ = consumer;
   }
 
-  // Returns the LoginDisplay instance created and owned by this controller.
+  // Returns the LoginDisplay created and owned by this controller.
   // Used for testing.
   LoginDisplay* login_display() {
-    return login_display_;
+    return login_display_.get();
   }
 
   // Returns the LoginDisplayHost for this controller.
-  // Used for testing.
   LoginDisplayHost* login_display_host() {
     return host_;
   }
 
  private:
   friend class ExistingUserControllerTest;
   friend class MockLoginPerformerDelegate;
 
   // LoginPerformer::Delegate implementation:
   virtual void OnLoginFailure(const LoginFailure& error);
@@ skipping 41 matching lines @@
     login_performer_delegate_.reset(d);
   }
 
   // Passes owner user to cryptohomed. Called right before mounting a user.
   // Subsequent disk space control checks are invoked by cryptohomed timer.
   void SetOwnerUserInCryptohome();
 
   // Used to execute login operations.
   scoped_ptr<LoginPerformer> login_performer_;
 
-  // Login UI implementation instance.
-  LoginDisplay* login_display_;
-
   // Delegate for login performer to be overridden by tests.
   // |this| is used if |login_performer_delegate_| is NULL.
   scoped_ptr<LoginPerformer::Delegate> login_performer_delegate_;
 
   // Delegate to forward all login status events to.
   // Tests can use this to receive login status events.
   LoginStatusConsumer* login_status_consumer_;
 
   // Username of the last login attempt.
   std::string last_login_attempt_username_;
 
   // OOBE/login display host.
   LoginDisplayHost* host_;
 
+  // Login UI implementation instance.
+  scoped_ptr<LoginDisplay> login_display_;
+
   // Number of login attempts. Used to show help link when > 1 unsuccessful
   // logins for the same user.
   size_t num_login_attempts_;
 
   // Pointer to the current instance of the controller to be used by
   // automation tests.
   static ExistingUserController* current_controller_;
 
   // Triggers prefetching of user settings.
   scoped_ptr<UserCrosSettingsProvider> user_settings_;
@@ skipping 20 matching lines @@
   bool is_owner_login_;
 
   FRIEND_TEST_ALL_PREFIXES(ExistingUserControllerTest, NewUserLogin);
 
   DISALLOW_COPY_AND_ASSIGN(ExistingUserController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_