Start session fail causes restart chrome

chrome/browser/chromeos/login/crash_restore_browsertest.cc

 // Copyright 2013 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 <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
@@ skipping 15 matching lines @@
 namespace {
 
 const char kUserId1[] = "user1@example.com";
 const char kUserId2[] = "user2@example.com";
 const char kUserId3[] = "user3@example.com";
 
 }  // namespace
 
 class CrashRestoreSimpleTest : public InProcessBrowserTest {
  protected:
-  CrashRestoreSimpleTest() {}
+  CrashRestoreSimpleTest() : session_started_cnt_(0) {}
 
   virtual ~CrashRestoreSimpleTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(::switches::kMultiProfiles);
     command_line->AppendSwitchASCII(switches::kLoginUser, kUserId1);
     command_line->AppendSwitchASCII(
         switches::kLoginProfile,
         CryptohomeClient::GetStubSanitizedUsername(kUserId1));
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     // Redirect session_manager DBus calls to FakeSessionManagerClient.
     FakeDBusThreadManager* dbus_thread_manager = new FakeDBusThreadManager;
     dbus_thread_manager->SetFakeClients();
     session_manager_client_ = new FakeSessionManagerClient;
     dbus_thread_manager->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(session_manager_client_));
     DBusThreadManager::SetInstanceForTesting(dbus_thread_manager);
-    session_manager_client_->StartSession(kUserId1);
+    session_manager_client_->StartSession(
+        kUserId1,
+        base::Bind(&CrashRestoreSimpleTest::OnSessionStarted,
+                   base::Unretained(this),
+                   kUserId1));
+    ASSERT_EQ(1UL, session_started_cnt_);
   }
 
+ public:
+  void OnSessionStarted(const std::string& user_email, bool success) {
+    ASSERT_TRUE(success);
+    ++session_started_cnt_;
+  }
+
+ protected:
   FakeSessionManagerClient* session_manager_client_;
+  size_t session_started_cnt_;

[ygorshenin1, 2014/04/16 16:50:04]

nit: no need to use size_t here, use int instead. Also, use "count" instead of
"cnt".

[Nikita (slow), 2014/04/18 05:22:59]

nit: Please rename

either num_session_started_ or
session_started_count_

[Roman Sorokin (ftl), 2014/04/22 08:28:47]

Done.

[Roman Sorokin (ftl), 2014/04/22 08:28:47]

Done.

 };
 
 IN_PROC_BROWSER_TEST_F(CrashRestoreSimpleTest, RestoreSessionForOneUser) {
   UserManager* user_manager = UserManager::Get();
   User* user = user_manager->GetActiveUser();
   ASSERT_TRUE(user);
   EXPECT_EQ(kUserId1, user->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1),
             user->username_hash());
   EXPECT_EQ(1UL, user_manager->GetLoggedInUsers().size());
@@ skipping 41 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(UserSessionRestoreObserver);
 };
 
 class CrashRestoreComplexTest : public CrashRestoreSimpleTest {
  protected:
   CrashRestoreComplexTest() {}
   virtual ~CrashRestoreComplexTest() {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     CrashRestoreSimpleTest::SetUpInProcessBrowserTestFixture();
-    session_manager_client_->StartSession(kUserId2);
-    session_manager_client_->StartSession(kUserId3);
+    session_manager_client_->StartSession(
+        kUserId2,
+        base::Bind(&CrashRestoreSimpleTest::OnSessionStarted,
+                   base::Unretained(this),
+                   kUserId2));
+    ASSERT_EQ(2UL, CrashRestoreSimpleTest::session_started_cnt_);
+    session_manager_client_->StartSession(
+        kUserId3,
+        base::Bind(&CrashRestoreSimpleTest::OnSessionStarted,
+                   base::Unretained(this),
+                   kUserId3));
+    ASSERT_EQ(3UL, CrashRestoreSimpleTest::session_started_cnt_);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(CrashRestoreComplexTest, RestoreSessionForThreeUsers) {
   {
     UserSessionRestoreObserver restore_observer;
     restore_observer.Wait();
   }
-
   UserManager* user_manager = UserManager::Get();
   DCHECK(user_manager->UserSessionsRestored());
 
   // User that is last in the user sessions map becomes active. This behavior
   // will become better defined once each user gets a separate user desktop.
   User* user = user_manager->GetActiveUser();
   ASSERT_TRUE(user);
   EXPECT_EQ(kUserId3, user->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId3),
             user->username_hash());
   const UserList& users = user_manager->GetLoggedInUsers();
   ASSERT_EQ(3UL, users.size());
 
   // User that becomes active moves to the beginning of the list.
   EXPECT_EQ(kUserId3, users[0]->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId3),
             users[0]->username_hash());
   EXPECT_EQ(kUserId2, users[1]->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId2),
             users[1]->username_hash());
   EXPECT_EQ(kUserId1, users[2]->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1),
             users[2]->username_hash());
 }
 
 }  // namespace chromeos