chromeos: Stop passing |this| from UpdateLibrary.

Instead, we should pass the status data that callers are interested in.

BUG=chromium-os:16564
TEST=chrome and tests build as before.

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

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

8 files changed, 36 insertions, 33 deletions

diff --git a/chrome/browser/chromeos/cros/update_library.cc b/chrome/browser/chromeos/cros/update_library.cc
index fb0efb3..168cb20 100644
--- a/chrome/browser/chromeos/cros/update_library.cc
+++ b/chrome/browser/chromeos/cros/update_library.cc
@@ -66,7 +66,7 @@ class UpdateLibraryImpl : public UpdateLibrary {
   }
   // End UpdateLibrary implementation.
 
-  const UpdateLibrary::Status& status() const {
+  const UpdateLibrary::Status& status() OVERRIDE const{
     return status_;
   }
 
@@ -82,7 +82,7 @@ class UpdateLibraryImpl : public UpdateLibrary {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     status_ = status;
-    FOR_EACH_OBSERVER(Observer, observers_, UpdateStatusChanged(this));
+    FOR_EACH_OBSERVER(Observer, observers_, UpdateStatusChanged(status));
   }
 
   ObserverList<Observer> observers_;
@@ -121,7 +121,9 @@ class UpdateLibraryStubImpl : public UpdateLibrary {
   }
   // End UpdateLibrary implementation.
 
-  const UpdateLibrary::Status& status() const { return status_; }
+  const UpdateLibrary::Status& status() OVERRIDE const {
+    return status_;
+  }
 
  private:
   Status status_;
diff --git a/chrome/browser/chromeos/cros/update_library.h b/chrome/browser/chromeos/cros/update_library.h
index 7370f7f..3aa41e2 100644
--- a/chrome/browser/chromeos/cros/update_library.h
+++ b/chrome/browser/chromeos/cros/update_library.h
@@ -49,7 +49,7 @@ class UpdateLibrary {
    public:
     virtual ~Observer() {}
 
-    virtual void UpdateStatusChanged(UpdateLibrary* library) = 0;
+    virtual void UpdateStatusChanged(const Status& status) = 0;
   };
 
   virtual ~UpdateLibrary() {}
diff --git a/chrome/browser/chromeos/login/update_screen.cc b/chrome/browser/chromeos/login/update_screen.cc
index 676c22e..f788b3a 100644
--- a/chrome/browser/chromeos/login/update_screen.cc
+++ b/chrome/browser/chromeos/login/update_screen.cc
@@ -88,16 +88,16 @@ UpdateScreen::~UpdateScreen() {
     actor_->SetDelegate(NULL);
 }
 
-void UpdateScreen::UpdateStatusChanged(UpdateLibrary* library) {
-  UpdateStatusOperation status = library->status().status;
-  if (is_checking_for_update_ && status > UPDATE_STATUS_CHECKING_FOR_UPDATE) {
+void UpdateScreen::UpdateStatusChanged(const UpdateLibrary::Status& status) {
+  if (is_checking_for_update_ &&
+      status.status > UPDATE_STATUS_CHECKING_FOR_UPDATE) {
     is_checking_for_update_ = false;
   }
-  if (ignore_idle_status_ && status > UPDATE_STATUS_IDLE) {
+  if (ignore_idle_status_ && status.status > UPDATE_STATUS_IDLE) {
     ignore_idle_status_ = false;
   }
 
-  switch (status) {
+  switch (status.status) {
     case UPDATE_STATUS_CHECKING_FOR_UPDATE:
       // Do nothing in these cases, we don't want to notify the user of the
       // check unless there is an update.
@@ -107,11 +107,11 @@ void UpdateScreen::UpdateStatusChanged(UpdateLibrary* library) {
       actor_->SetProgress(kBeforeDownloadProgress);
       if (!HasCriticalUpdate()) {
         LOG(INFO) << "Noncritical update available: "
-                  << library->status().new_version;
+                  << status.new_version;
         ExitUpdate(REASON_UPDATE_NON_CRITICAL);
       } else {
         LOG(INFO) << "Critical update available: "
-                  << library->status().new_version;
+                  << status.new_version;
         actor_->ShowPreparingUpdatesInfo(true);
         actor_->ShowCurtain(false);
       }
@@ -125,17 +125,17 @@ void UpdateScreen::UpdateStatusChanged(UpdateLibrary* library) {
           is_downloading_update_ = true;
           if (!HasCriticalUpdate()) {
             LOG(INFO) << "Non-critical update available: "
-                      << library->status().new_version;
+                      << status.new_version;
             ExitUpdate(REASON_UPDATE_NON_CRITICAL);
           } else {
             LOG(INFO) << "Critical update available: "
-                      << library->status().new_version;
+                      << status.new_version;
             actor_->ShowPreparingUpdatesInfo(false);
             actor_->ShowCurtain(false);
           }
         }
         int download_progress = static_cast<int>(
-            library->status().download_progress * kDownloadProgressIncrement);
+            status.download_progress * kDownloadProgressIncrement);
         actor_->SetProgress(kBeforeDownloadProgress + download_progress);
       }
       break;
diff --git a/chrome/browser/chromeos/login/update_screen.h b/chrome/browser/chromeos/login/update_screen.h
index 7e13f0f..c84a61d 100644
--- a/chrome/browser/chromeos/login/update_screen.h
+++ b/chrome/browser/chromeos/login/update_screen.h
@@ -61,7 +61,7 @@ class UpdateScreen: public UpdateLibrary::Observer,
   virtual void ExitUpdate(ExitReason reason);
 
   // UpdateLibrary::Observer implementation:
-  virtual void UpdateStatusChanged(UpdateLibrary* library);
+  virtual void UpdateStatusChanged(const UpdateLibrary::Status& status);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestBasic);
diff --git a/chrome/browser/chromeos/login/update_screen_browsertest.cc b/chrome/browser/chromeos/login/update_screen_browsertest.cc
index 445fd07..6c6bccc 100644
--- a/chrome/browser/chromeos/login/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/update_screen_browsertest.cc
@@ -111,19 +111,19 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestNoUpdate) {
   EXPECT_CALL(*mock_update_library_, status())
       .Times(1)
       .WillRepeatedly(ReturnRef(status));
-  update_screen_->UpdateStatusChanged(mock_update_library_);
+  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(mock_update_library_);
+  update_screen_->UpdateStatusChanged(status);
   status.status = UPDATE_STATUS_IDLE;
   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(mock_update_library_);
+  update_screen_->UpdateStatusChanged(status);
 }
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestUpdateAvailable) {
@@ -135,38 +135,38 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestUpdateAvailable) {
   EXPECT_CALL(*mock_update_library_, status())
       .Times(AtLeast(1))
       .WillRepeatedly(ReturnRef(status));
-  update_screen_->UpdateStatusChanged(mock_update_library_);
+  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(mock_update_library_);
+  update_screen_->UpdateStatusChanged(status);
 
   status.download_progress = 0.5;
   EXPECT_CALL(*mock_update_library_, status())
       .Times(AtLeast(1))
       .WillRepeatedly(ReturnRef(status));
-  update_screen_->UpdateStatusChanged(mock_update_library_);
+  update_screen_->UpdateStatusChanged(status);
 
   status.download_progress = 1.0;
   EXPECT_CALL(*mock_update_library_, status())
       .Times(AtLeast(1))
       .WillRepeatedly(ReturnRef(status));
-  update_screen_->UpdateStatusChanged(mock_update_library_);
+  update_screen_->UpdateStatusChanged(status);
 
   status.status = UPDATE_STATUS_VERIFYING;
   EXPECT_CALL(*mock_update_library_, status())
       .Times(AtLeast(1))
       .WillRepeatedly(ReturnRef(status));
-  update_screen_->UpdateStatusChanged(mock_update_library_);
+  update_screen_->UpdateStatusChanged(status);
 
   status.status = UPDATE_STATUS_FINALIZING;
   EXPECT_CALL(*mock_update_library_, status())
       .Times(AtLeast(1))
       .WillRepeatedly(ReturnRef(status));
-  update_screen_->UpdateStatusChanged(mock_update_library_);
+  update_screen_->UpdateStatusChanged(status);
 
   status.status = UPDATE_STATUS_UPDATED_NEED_REBOOT;
   EXPECT_CALL(*mock_update_library_, status())
@@ -174,7 +174,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestUpdateAvailable) {
       .WillRepeatedly(ReturnRef(status));
   EXPECT_CALL(*mock_update_library_, RebootAfterUpdate())
       .Times(1);
-  update_screen_->UpdateStatusChanged(mock_update_library_);
+  update_screen_->UpdateStatusChanged(status);
 }
 
 static void RequestUpdateCheckFail(UpdateCallback callback, void* userdata) {
@@ -212,7 +212,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorCheckingForUpdate) {
   EXPECT_CALL(*mock_screen_observer_,
               OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
       .Times(1);
-  update_screen_->UpdateStatusChanged(mock_update_library_);
+  update_screen_->UpdateStatusChanged(status);
 }
 
 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorUpdating) {
@@ -222,7 +222,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorUpdating) {
   EXPECT_CALL(*mock_update_library_, status())
       .Times(AtLeast(1))
       .WillRepeatedly(ReturnRef(status));
-  update_screen_->UpdateStatusChanged(mock_update_library_);
+  update_screen_->UpdateStatusChanged(status);
 
   status.status = UPDATE_STATUS_ERROR;
   EXPECT_CALL(*mock_update_library_, status())
@@ -231,7 +231,7 @@ IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorUpdating) {
   EXPECT_CALL(*mock_screen_observer_,
               OnExit(ScreenObserver::UPDATE_ERROR_UPDATING))
       .Times(1);
-  update_screen_->UpdateStatusChanged(mock_update_library_);
+  update_screen_->UpdateStatusChanged(status);
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.cc b/chrome/browser/chromeos/upgrade_detector_chromeos.cc
index 9445c04..e8fe6c5 100644
--- a/chrome/browser/chromeos/upgrade_detector_chromeos.cc
+++ b/chrome/browser/chromeos/upgrade_detector_chromeos.cc
@@ -26,8 +26,8 @@ UpgradeDetectorChromeos::~UpgradeDetectorChromeos() {
 }
 
 void UpgradeDetectorChromeos::UpdateStatusChanged(
-    chromeos::UpdateLibrary* library) {
-  if (library->status().status != chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT)
+    const chromeos::UpdateLibrary::Status& status) {
+  if (status.status != chromeos::UPDATE_STATUS_UPDATED_NEED_REBOOT)
     return;
 
   NotifyUpgradeDetected();
diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.h b/chrome/browser/chromeos/upgrade_detector_chromeos.h
index 09f2f70..86e5b50 100644
--- a/chrome/browser/chromeos/upgrade_detector_chromeos.h
+++ b/chrome/browser/chromeos/upgrade_detector_chromeos.h
@@ -25,7 +25,8 @@ class UpgradeDetectorChromeos : public UpgradeDetector,
   UpgradeDetectorChromeos();
 
   // chromeos::UpdateLibrary::Observer implementation.
-  virtual void UpdateStatusChanged(chromeos::UpdateLibrary* library);
+  virtual void UpdateStatusChanged(
+      const chromeos::UpdateLibrary::Status& status);
 
   // The function that sends out a notification (after a certain time has
   // elapsed) that lets the rest of the UI know we should start notifying the
diff --git a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
index 5b43ebc..ffd3c13 100644
--- a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc
@@ -71,8 +71,8 @@ class AboutPageHandler::UpdateObserver
   AboutPageHandler* page_handler() const { return page_handler_; }
 
  private:
-  virtual void UpdateStatusChanged(UpdateLibrary* object) {
-    page_handler_->UpdateStatus(object->status());
+  virtual void UpdateStatusChanged(const UpdateLibrary::Status& status) {
+    page_handler_->UpdateStatus(status);
   }
 
   AboutPageHandler* page_handler_;