Restart instead of signout when there are pending updates.

BUG=chromium-os:9782
TEST=Install an update, signout. With this change, we will reboot (installing
the update).

Review URL: http://codereview.chromium.org/6410038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73550 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 0 deletions

diff --git a/chrome/browser/chromeos/login/update_screen_browsertest.cc b/chrome/browser/chromeos/login/update_screen_browsertest.cc
index 5fa4eb1..16f45f8 100644
--- a/chrome/browser/chromeos/login/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/update_screen_browsertest.cc
@@ -65,6 +65,14 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
     WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
   }
 
+  void ExpectUpdateStatusCheck() {
+    // browser_list::NotifyAndTerminate calls status().
+    UpdateLibrary::Status status;
+    EXPECT_CALL(*mock_update_library_, status())
+        .Times(AtLeast(1))
+        .WillRepeatedly(ReturnRef(status));
+  }
+
   MockLoginLibrary* mock_login_library_;
   MockUpdateLibrary* mock_update_library_;
   MockNetworkLibrary* mock_network_library_;
@@ -82,6 +90,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestBasic) {
   ASSERT_EQ(controller()->current_screen(), update_screen);
   UpdateView* update_view = update_screen->view();
   ASSERT_TRUE(update_view != NULL);
+  ExpectUpdateStatusCheck();
   controller()->set_observer(NULL);
 }
 
@@ -193,6 +202,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorIssuingUpdateCheck) {
       .Times(1);
   update_screen->StartUpdate();
 
+  ExpectUpdateStatusCheck();
   controller()->set_observer(NULL);
 }