Revert of 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() : session_started_count_(0) {}
+  CrashRestoreSimpleTest() {}
 
   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);
-    // We need to create MessageLoop here to process callback from
-    // session_manager
-    base::MessageLoop msg_loop;
-    session_manager_client_->StartSession(
-        kUserId1,
-        base::Bind(&CrashRestoreSimpleTest::OnSessionStarted,
-                   base::Unretained(this),
-                   kUserId1));
-    base::RunLoop().RunUntilIdle();
-    ASSERT_EQ(1, session_started_count_);
+    session_manager_client_->StartSession(kUserId1);
   }
 
- public:
-  void OnSessionStarted(const std::string& user_email, bool success) {
-    ASSERT_TRUE(success);
-    ++session_started_count_;
-  }
-
- protected:
   FakeSessionManagerClient* session_manager_client_;
-  int session_started_count_;
 };
 
 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();
-    // We need to create MessageLoop here to process callback from
-    // session_manager
-    base::MessageLoop msg_loop;
-    session_manager_client_->StartSession(
-        kUserId2,
-        base::Bind(&CrashRestoreSimpleTest::OnSessionStarted,
-                   base::Unretained(this),
-                   kUserId2));
-    session_manager_client_->StartSession(
-        kUserId3,
-        base::Bind(&CrashRestoreSimpleTest::OnSessionStarted,
-                   base::Unretained(this),
-                   kUserId3));
-    base::RunLoop().RunUntilIdle();
-    ASSERT_EQ(3, CrashRestoreSimpleTest::session_started_count_);
+    session_manager_client_->StartSession(kUserId2);
+    session_manager_client_->StartSession(kUserId3);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(CrashRestoreComplexTest, RestoreSessionForThreeUsers) {
   {
     UserSessionRestoreObserver restore_observer;
     restore_observer.Wait();
   }
 
   UserManager* user_manager = UserManager::Get();
@@ skipping 15 matching lines @@
             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