Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / login_manager_test.cc

diff --git a/src/chrome/browser/chromeos/login/login_manager_test.cc b/src/chrome/browser/chromeos/login/login_manager_test.cc
index 4d8738d..a83fe0d 100644 (file)
--- a/src/chrome/browser/chromeos/login/login_manager_test.cc
+++ b/src/chrome/browser/chromeos/login/login_manager_test.cc
@@ -8,11 +8,13 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/chromeos/login/login_display_host_impl.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/login/webui_login_view.h"
-#include "chrome/common/chrome_switches.h"
+#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
+#include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/login/auth/key.h"
+#include "chromeos/login/auth/user_context.h"
+#include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
@@ -27,7 +29,8 @@ LoginManagerTest::LoginManagerTest(bool should_launch_browser)
   set_exit_when_last_browser_closes(false);
 }
 
-void LoginManagerTest::CleanUpOnMainThread() {
+void LoginManagerTest::TearDownOnMainThread() {
+  MixinBasedBrowserTest::TearDownOnMainThread();
   if (LoginDisplayHostImpl::default_host())
     LoginDisplayHostImpl::default_host()->Finalize();
   base::MessageLoop::current()->RunUntilIdle();
@@ -36,10 +39,11 @@ void LoginManagerTest::CleanUpOnMainThread() {
 void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) {
   command_line->AppendSwitch(chromeos::switches::kLoginManager);
   command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
-  command_line->AppendSwitch(::switches::kMultiProfiles);
+  MixinBasedBrowserTest::SetUpCommandLine(command_line);
 }
 
 void LoginManagerTest::SetUpInProcessBrowserTestFixture() {
+  MixinBasedBrowserTest::SetUpInProcessBrowserTestFixture();
   mock_login_utils_ = new testing::NiceMock<MockLoginUtils>();
   mock_login_utils_->DelegateToFake();
   mock_login_utils_->GetFakeLoginUtils()->set_should_launch_browser(
@@ -48,60 +52,66 @@ void LoginManagerTest::SetUpInProcessBrowserTestFixture() {
 }
 
 void LoginManagerTest::SetUpOnMainThread() {
+  MixinBasedBrowserTest::SetUpOnMainThread();
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
       content::NotificationService::AllSources()).Wait();
   InitializeWebContents();
 }
 
-void LoginManagerTest::RegisterUser(const std::string& username) {
+void LoginManagerTest::RegisterUser(const std::string& user_id) {
   ListPrefUpdate users_pref(g_browser_process->local_state(), "LoggedInUsers");
-  users_pref->AppendIfNotPresent(new base::StringValue(username));
+  users_pref->AppendIfNotPresent(new base::StringValue(user_id));
 }
 
-void LoginManagerTest::SetExpectedCredentials(const std::string& username,
-                                              const std::string& password) {
-  login_utils().GetFakeLoginUtils()->SetExpectedCredentials(username, password);
+void LoginManagerTest::SetExpectedCredentials(const UserContext& user_context) {
+  login_utils().GetFakeLoginUtils()->SetExpectedCredentials(user_context);
 }
 
-bool LoginManagerTest::TryToLogin(const std::string& username,
-                                  const std::string& password) {
-  if (!AddUserTosession(username, password))
+bool LoginManagerTest::TryToLogin(const UserContext& user_context) {
+  if (!AddUserToSession(user_context))
     return false;
-  if (const User* active_user = UserManager::Get()->GetActiveUser())
-    return active_user->email() == username;
+  if (const user_manager::User* active_user =
+          user_manager::UserManager::Get()->GetActiveUser())
+    return active_user->email() == user_context.GetUserID();
   return false;
 }
 
-bool LoginManagerTest::AddUserTosession(const std::string& username,
-                                        const std::string& password) {
+bool LoginManagerTest::AddUserToSession(const UserContext& user_context) {
   ExistingUserController* controller =
       ExistingUserController::current_controller();
   if (!controller) {
     ADD_FAILURE();
     return false;
   }
-  controller->Login(UserContext(username, password, std::string()));
-  content::WindowedNotificationObserver(
+  content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_SESSION_STARTED,
-      content::NotificationService::AllSources()).Wait();
-  const UserList& logged_users = UserManager::Get()->GetLoggedInUsers();
-  for (UserList::const_iterator it = logged_users.begin();
-       it != logged_users.end(); ++it) {
-    if ((*it)->email() == username)
+      content::NotificationService::AllSources());
+  controller->Login(user_context, SigninSpecifics());
+  observer.Wait();
+  const user_manager::UserList& logged_users =
+      user_manager::UserManager::Get()->GetLoggedInUsers();
+  for (user_manager::UserList::const_iterator it = logged_users.begin();
+       it != logged_users.end();
+       ++it) {
+    if ((*it)->email() == user_context.GetUserID())
       return true;
   }
   return false;
 }
 
-void LoginManagerTest::LoginUser(const std::string& username) {
-  SetExpectedCredentials(username, "password");
-  EXPECT_TRUE(TryToLogin(username, "password"));
+void LoginManagerTest::LoginUser(const std::string& user_id) {
+  UserContext user_context(user_id);
+  user_context.SetKey(Key("password"));
+  SetExpectedCredentials(user_context);
+  EXPECT_TRUE(TryToLogin(user_context));
 }
 
-void LoginManagerTest::AddUser(const std::string& username) {
-  SetExpectedCredentials(username, "password");
-  EXPECT_TRUE(AddUserTosession(username, "password"));
+void LoginManagerTest::AddUser(const std::string& user_id) {
+  UserContext user_context(user_id);
+  user_context.SetKey(Key("password"));
+  SetExpectedCredentials(user_context);
+  EXPECT_TRUE(AddUserToSession(user_context));
 }
 
 void LoginManagerTest::JSExpect(const std::string& expression) {
@@ -109,14 +119,14 @@ void LoginManagerTest::JSExpect(const std::string& expression) {
 }
 
 void LoginManagerTest::InitializeWebContents() {
-    LoginDisplayHost* host = LoginDisplayHostImpl::default_host();
-    EXPECT_TRUE(host != NULL);
-
-    content::WebContents* web_contents =
-        host->GetWebUILoginView()->GetWebContents();
-    EXPECT_TRUE(web_contents != NULL);
-    set_web_contents(web_contents);
-    js_checker_.set_web_contents(web_contents);
-  }
+  LoginDisplayHost* host = LoginDisplayHostImpl::default_host();
+  EXPECT_TRUE(host != NULL);
+
+  content::WebContents* web_contents =
+      host->GetWebUILoginView()->GetWebContents();
+  EXPECT_TRUE(web_contents != NULL);
+  set_web_contents(web_contents);
+  js_checker_.set_web_contents(web_contents);
+}
 
 }  // namespace chromeos