Start session fail causes restart chrome

chrome/browser/chromeos/login/crash_restore_browsertest.cc

Index: chrome/browser/chromeos/login/crash_restore_browsertest.cc
diff --git a/chrome/browser/chromeos/login/crash_restore_browsertest.cc b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
index 8bcaaf5576c09cfdabaff64548010ca59ff3d3a1..52de77197d9a1105e00fcbd207787508c86968e7 100644
--- a/chrome/browser/chromeos/login/crash_restore_browsertest.cc
+++ b/chrome/browser/chromeos/login/crash_restore_browsertest.cc
@@ -33,7 +33,7 @@ const char kUserId3[] = "user3@example.com";
 
 class CrashRestoreSimpleTest : public InProcessBrowserTest {
  protected:
-  CrashRestoreSimpleTest() {}
+  CrashRestoreSimpleTest() : session_started_cnt_(0) {}
 
   virtual ~CrashRestoreSimpleTest() {}
 
@@ -53,10 +53,23 @@ class CrashRestoreSimpleTest : public InProcessBrowserTest {
     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) {
@@ -118,8 +131,18 @@ class CrashRestoreComplexTest : public CrashRestoreSimpleTest {
 
   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_);
   }
 };
 
@@ -128,7 +151,6 @@ IN_PROC_BROWSER_TEST_F(CrashRestoreComplexTest, RestoreSessionForThreeUsers) {
     UserSessionRestoreObserver restore_observer;
     restore_observer.Wait();
   }
-
   UserManager* user_manager = UserManager::Get();
   DCHECK(user_manager->UserSessionsRestored());