Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Unified Diff: chrome/browser/chromeos/login/crash_restore_browsertest.cc

Issue 228703004: Start session fail causes restart chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed comments and rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..4a24ba719e73417b97319495491d301ad9e1da81 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_count_(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(1, session_started_count_);
}
+ 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) {
@@ -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(2, CrashRestoreSimpleTest::session_started_count_);
+ session_manager_client_->StartSession(
+ kUserId3,
+ base::Bind(&CrashRestoreSimpleTest::OnSessionStarted,
+ base::Unretained(this),
+ kUserId3));
+ ASSERT_EQ(3, CrashRestoreSimpleTest::session_started_count_);
}
};
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/login_utils.cc » ('j') | chromeos/dbus/fake_session_manager_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698