chromeos: Fix UpdateScreenTest.NoUpdate and TestUpdateAvailable

chrome/browser/chromeos/login/update_screen_browsertest.cc

 // Copyright (c) 2011 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 "base/message_loop.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/cros/mock_update_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/mock_session_manager_client.h"
 #include "chrome/browser/chromeos/login/mock_screen_observer.h"
@@ skipping 93 matching lines @@
 };
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestBasic) {
   ASSERT_TRUE(update_screen_->actor_ != NULL);
 }
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestNoUpdate) {
   update_screen_->SetIgnoreIdleStatus(true);
   UpdateLibrary::Status status;
   status.status = UPDATE_STATUS_IDLE;
-  EXPECT_CALL(*mock_update_library_, status())
-      .Times(1)
-      .WillRepeatedly(ReturnRef(status));
   update_screen_->UpdateStatusChanged(status);
   status.status = UPDATE_STATUS_CHECKING_FOR_UPDATE;
-  EXPECT_CALL(*mock_update_library_, status())
-      .Times(1)
-      .WillRepeatedly(ReturnRef(status));
   update_screen_->UpdateStatusChanged(status);
   status.status = UPDATE_STATUS_IDLE;
+  // status() will be called via ExitUpdate() called from
+  // UpdateStatusChanged().
   EXPECT_CALL(*mock_update_library_, status())
       .Times(AtLeast(1))
       .WillRepeatedly(ReturnRef(status));
   EXPECT_CALL(*mock_screen_observer_, OnExit(ScreenObserver::UPDATE_NOUPDATE))
       .Times(1);
   update_screen_->UpdateStatusChanged(status);
 }
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestUpdateAvailable) {
   update_screen_->is_ignore_update_deadlines_ = true;
 
   UpdateLibrary::Status status;
   status.status = UPDATE_STATUS_UPDATE_AVAILABLE;
   status.new_version = "latest and greatest";
-  EXPECT_CALL(*mock_update_library_, status())
-      .Times(AtLeast(1))
-      .WillRepeatedly(ReturnRef(status));
   update_screen_->UpdateStatusChanged(status);
 
   status.status = UPDATE_STATUS_DOWNLOADING;
   status.download_progress = 0.0;
-  EXPECT_CALL(*mock_update_library_, status())
-      .Times(AtLeast(1))
-      .WillRepeatedly(ReturnRef(status));
   update_screen_->UpdateStatusChanged(status);
 
   status.download_progress = 0.5;
-  EXPECT_CALL(*mock_update_library_, status())
-      .Times(AtLeast(1))
-      .WillRepeatedly(ReturnRef(status));
   update_screen_->UpdateStatusChanged(status);
 
   status.download_progress = 1.0;
-  EXPECT_CALL(*mock_update_library_, status())
-      .Times(AtLeast(1))
-      .WillRepeatedly(ReturnRef(status));
   update_screen_->UpdateStatusChanged(status);
 
   status.status = UPDATE_STATUS_VERIFYING;
-  EXPECT_CALL(*mock_update_library_, status())
-      .Times(AtLeast(1))
-      .WillRepeatedly(ReturnRef(status));
   update_screen_->UpdateStatusChanged(status);
 
   status.status = UPDATE_STATUS_FINALIZING;
-  EXPECT_CALL(*mock_update_library_, status())
-      .Times(AtLeast(1))
-      .WillRepeatedly(ReturnRef(status));
   update_screen_->UpdateStatusChanged(status);
 
   status.status = UPDATE_STATUS_UPDATED_NEED_REBOOT;
-  EXPECT_CALL(*mock_update_library_, status())
-      .Times(AtLeast(1))
-      .WillRepeatedly(ReturnRef(status));
   EXPECT_CALL(*mock_update_library_, RebootAfterUpdate())
       .Times(1);
   update_screen_->UpdateStatusChanged(status);
 }
 
 static void RequestUpdateCheckFail(UpdateCallback callback, void* userdata) {
   callback(userdata, chromeos::UPDATE_RESULT_FAILED, NULL);
 }
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorIssuingUpdateCheck) {
@@ skipping 14 matching lines @@
       .WillOnce(Invoke(RequestUpdateCheckFail));
   EXPECT_CALL(*mock_screen_observer_,
               OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
       .Times(1);
   update_screen_->StartUpdate();
 }
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorCheckingForUpdate) {
   UpdateLibrary::Status status;
   status.status = UPDATE_STATUS_ERROR;
+  // status() will be called via ExitUpdate() called from
+  // UpdateStatusChanged().
   EXPECT_CALL(*mock_update_library_, status())
       .Times(AtLeast(1))
       .WillRepeatedly(ReturnRef(status));
   EXPECT_CALL(*mock_screen_observer_,
               OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
       .Times(1);
   update_screen_->UpdateStatusChanged(status);
 }
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorUpdating) {
   UpdateLibrary::Status status;
   status.status = UPDATE_STATUS_UPDATE_AVAILABLE;
   status.new_version = "latest and greatest";
+  // status() will be called via ExitUpdate() called from
+  // UpdateStatusChanged().
   EXPECT_CALL(*mock_update_library_, status())
       .Times(AtLeast(1))
       .WillRepeatedly(ReturnRef(status));
   update_screen_->UpdateStatusChanged(status);
 
   status.status = UPDATE_STATUS_ERROR;
+  // status() will be called via ExitUpdate() called from
+  // UpdateStatusChanged().
   EXPECT_CALL(*mock_update_library_, status())
       .Times(AtLeast(1))
       .WillRepeatedly(ReturnRef(status));
   EXPECT_CALL(*mock_screen_observer_,
               OnExit(ScreenObserver::UPDATE_ERROR_UPDATING))
       .Times(1);
   update_screen_->UpdateStatusChanged(status);
 }
 
 }  // namespace chromeos