Modify UpdateLibrary to use async RequestUpdateCheck call

chrome/browser/chromeos/login/update_screen.cc

 // Copyright (c) 2010 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 "chrome/browser/chromeos/login/update_screen.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/chromeos/login/update_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "content/browser/browser_thread.h"
 
 namespace {
 
 // Progress bar stages. Each represents progress bar value
 // at the beginning of each stage.
 // TODO(nkostylev): Base stage progress values on approximate time.
 // TODO(nkostylev): Animate progress during each state.
 const int kBeforeUpdateCheckProgress = 7;
 const int kBeforeDownloadProgress = 14;
 const int kBeforeVerifyingProgress = 74;
 const int kBeforeFinalizingProgress = 81;
 const int kProgressComplete = 100;
 
 // Defines what part of update progress does download part takes.
 const int kDownloadProgressIncrement = 60;
 
 // Considering 10px shadow from each side.
 const int kUpdateScreenWidth = 580;
 const int kUpdateScreenHeight = 305;
 
 const char kUpdateDeadlineFile[] = "/tmp/update-check-response-deadline";
 
 }  // anonymous namespace
 
 namespace chromeos {
 
+
+// static
+UpdateScreen::InstanceSet& UpdateScreen::GetInstanceSet() {
+  static std::set<UpdateScreen*> instance_set;
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));  // not threadsafe.
+  return instance_set;
+}
+
+// static
+bool UpdateScreen::HasInstance(UpdateScreen* inst) {
+  InstanceSet& instance_set = GetInstanceSet();
+  InstanceSet::iterator found = instance_set.find(inst);
+  return (found != instance_set.end());
+}
+
 UpdateScreen::UpdateScreen(WizardScreenDelegate* delegate)
     : DefaultViewScreen<chromeos::UpdateView>(delegate,
                                               kUpdateScreenWidth,
                                               kUpdateScreenHeight),
       checking_for_update_(true),
       reboot_check_delay_(0),
       is_downloading_update_(false),
       is_all_updates_critical_(false) {
+  GetInstanceSet().insert(this);
 }
 
 UpdateScreen::~UpdateScreen() {
   // Remove pointer to this object from view.
   if (view())
     view()->set_controller(NULL);
   CrosLibrary::Get()->GetUpdateLibrary()->RemoveObserver(this);
+  GetInstanceSet().erase(this);
 }
 
 void UpdateScreen::UpdateStatusChanged(UpdateLibrary* library) {
   UpdateStatusOperation status = library->status().status;
   if (checking_for_update_ && status > UPDATE_STATUS_CHECKING_FOR_UPDATE) {
     checking_for_update_ = false;
   }
 
   switch (status) {
     case UPDATE_STATUS_CHECKING_FOR_UPDATE:
@@ skipping 62 matching lines @@
     case UPDATE_STATUS_ERROR:
     case UPDATE_STATUS_REPORTING_ERROR_EVENT:
       ExitUpdate(REASON_UPDATE_ENDED);
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
+namespace {
+// Invoked from call to RequestUpdateCheck upon completion of the DBus call.
+void StartUpdateCallback(void* user_data,
+                         UpdateResult result,
+                         const char* msg) {
+  if (result != UPDATE_RESULT_SUCCESS) {
+    DCHECK(user_data);
+    UpdateScreen* screen = static_cast<UpdateScreen*>(user_data);
+    if (UpdateScreen::HasInstance(screen))
+      screen->ExitUpdate(UpdateScreen::REASON_UPDATE_INIT_FAILED);
+  }
+}
+}  // namespace
+
 void UpdateScreen::StartUpdate() {
   // Reset view if view was created.
   if (view()) {
     view()->Reset();
     view()->set_controller(this);
     is_downloading_update_ = false;
     view()->SetProgress(kBeforeUpdateCheckProgress);
   }
 
   if (!CrosLibrary::Get()->EnsureLoaded()) {
     LOG(ERROR) << "Error loading CrosLibrary";
     ExitUpdate(REASON_UPDATE_INIT_FAILED);
   } else {
     CrosLibrary::Get()->GetUpdateLibrary()->AddObserver(this);
     VLOG(1) << "Initiate update check";
-    if (!CrosLibrary::Get()->GetUpdateLibrary()->CheckForUpdate()) {
-      ExitUpdate(REASON_UPDATE_INIT_FAILED);
-    }
+    CrosLibrary::Get()->GetUpdateLibrary()->RequestUpdateCheck(
+        StartUpdateCallback, this);
   }
 }
 
 void UpdateScreen::CancelUpdate() {
   // Screen has longer lifetime than it's view.
   // View is deleted after wizard proceeds to the next screen.
   if (view())
     ExitUpdate(REASON_UPDATE_CANCELED);
 }
 
@@ skipping 84 matching lines @@
   // TODO(dpolukhin): Analyze file content. Now we can just assume that
   // if the file exists and not empty, there is critical update.
   return true;
 }
 
 void UpdateScreen::SetAllUpdatesCritical(bool is_critical) {
   is_all_updates_critical_ = is_critical;
 }
 
 }  // namespace chromeos