Pass focus to browser after login.

chrome/browser/chromeos/login/user_adding_screen_browsertest.cc

Index: chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc b/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
index 38865177bbcda11fce994d753d77e56c60590dd8..91b6c3e9c9bdb9b558351ca655bb0dd61d812aef 100644
--- a/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/user_adding_screen_browsertest.cc
@@ -2,16 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
-#include "chrome/browser/chromeos/login/mock_login_utils.h"
+#include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chromeos/chromeos_switches.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -27,66 +24,35 @@ const char* kTestUsers[] = {"test-user@gmail.com",
 
 namespace chromeos {
 
-class UserAddingScreenTest : public InProcessBrowserTest,
+class UserAddingScreenTest : public LoginManagerTest,
                              public UserAddingScreen::Observer {
  public:
-  UserAddingScreenTest() : user_adding_started_(0), user_adding_finished_(0) {
-    set_exit_when_last_browser_closes(false);
+  UserAddingScreenTest() : LoginManagerTest(false),
+                           user_adding_started_(0),
+                           user_adding_finished_(0) {
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    LoginManagerTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(::switches::kMultiProfiles);
-    command_line->AppendSwitch(chromeos::switches::kLoginManager);
-    command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+    LoginManagerTest::SetUpInProcessBrowserTestFixture();
     UserAddingScreen::Get()->AddObserver(this);
-    mock_login_utils_ = new NiceMock<MockLoginUtils>();
-    mock_login_utils_->DelegateToFake();
-    LoginUtils::Set(mock_login_utils_);
   }
 
   virtual void OnUserAddingFinished() OVERRIDE { ++user_adding_finished_; }
 
   virtual void OnUserAddingStarted() OVERRIDE { ++user_adding_started_; }
 
-  void RegisterUser(const std::string& username) {
-    ListPrefUpdate users_pref(g_browser_process->local_state(),
-                              "LoggedInUsers");
-    users_pref->AppendIfNotPresent(new base::StringValue(username));
-  }
-
-  void SetExpectedCredentials(const std::string& username,
-                              const std::string& password) {
-    mock_login_utils_->GetFakeLoginUtils()->
-        SetExpectedCredentials(username, password);
-  }
-
-  bool TryToLogin(const std::string& username, const std::string& password) {
-    ExistingUserController* controller =
-        ExistingUserController::current_controller();
-    EXPECT_TRUE(controller != NULL);
-    controller->Login(UserContext(username, password, ""));
-    content::RunAllPendingInMessageLoop();
-    return UserManager::Get()->GetActiveUser()->email() == username;
-  }
-
-  void LoginUser(const std::string& username) {
-    SetExpectedCredentials(username, "password");
-    EXPECT_TRUE(TryToLogin(username, "password"));
-  }
-
   int user_adding_started() { return user_adding_started_; }
 
   int user_adding_finished() { return user_adding_finished_; }
 
-  MockLoginUtils& login_utils() { return *mock_login_utils_; }
-
  private:
   int user_adding_started_;
   int user_adding_finished_;
-  MockLoginUtils* mock_login_utils_;
 
   DISALLOW_COPY_AND_ASSIGN(UserAddingScreenTest);
 };