cros: Apply the Init() model to UpdateLibrary API.

chrome/browser/chromeos/cros/update_library.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 "chrome/browser/chromeos/cros/update_library.h"
 
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "content/browser/browser_thread.h"
 
 namespace chromeos {
 
 class UpdateLibraryImpl : public UpdateLibrary {
  public:
-  UpdateLibraryImpl() : status_connection_(NULL) {
-    if (CrosLibrary::Get()->EnsureLoaded())
-      Init();
-  }
+  UpdateLibraryImpl() : status_connection_(NULL) {}
 
   virtual ~UpdateLibraryImpl() {
     if (status_connection_) {
       chromeos::DisconnectUpdateProgress(status_connection_);
       status_connection_ = NULL;
     }
   }
 
+  void Init() {
+    if (CrosLibrary::Get()->EnsureLoaded()) {
+      CHECK(!status_connection_) << "Already initialized";
+      status_connection_ =
+          chromeos::MonitorUpdateStatus(&UpdateStatusHandler, this);
+      // Asynchronously load the initial state.
+      chromeos::RequestUpdateStatus(&UpdateStatusHandler, this);
+    }
+  }
+
   void AddObserver(Observer* observer) {
     observers_.AddObserver(observer);
   }
 
   void RemoveObserver(Observer* observer) {
     observers_.RemoveObserver(observer);
   }
 
   bool HasObserver(Observer* observer) {
     return observers_.HasObserver(observer);
@@ skipping 20 matching lines @@
                        void* user_data) {
     if (CrosLibrary::Get()->EnsureLoaded())
       chromeos::RequestUpdateTrack(callback, user_data);
   }
 
   const UpdateLibrary::Status& status() const {
     return status_;
   }
 
  private:
-  static void ChangedHandler(void* object, const UpdateProgress& status) {
+  static void UpdateStatusHandler(void* object, const UpdateProgress& status) {
     UpdateLibraryImpl* impl = static_cast<UpdateLibraryImpl*>(object);
     impl->UpdateStatus(Status(status));
   }
 
-  void Init() {
-    status_connection_ = chromeos::MonitorUpdateStatus(&ChangedHandler, this);
-    // Asynchronously load the initial state.
-    RequestUpdateStatus(&ChangedHandler, this);
-  }
-
   void UpdateStatus(const Status& status) {
     // Make sure we run on UI thread.
     if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
       BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
           NewRunnableMethod(this, &UpdateLibraryImpl::UpdateStatus, status));
       return;
     }
 
     status_ = status;
     FOR_EACH_OBSERVER(Observer, observers_, UpdateStatusChanged(this));
   }
 
   ObserverList<Observer> observers_;
 
   // A reference to the update api, to allow callbacks when the update
   // status changes.
   UpdateStatusConnection status_connection_;
 
   // The latest power status.
   Status status_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateLibraryImpl);
 };
 
 class UpdateLibraryStubImpl : public UpdateLibrary {
  public:
   UpdateLibraryStubImpl() {}
   virtual ~UpdateLibraryStubImpl() {}
+  void Init() {}
   void AddObserver(Observer* observer) {}
   void RemoveObserver(Observer* observer) {}
   bool HasObserver(Observer* observer) { return false; }
   void RequestUpdateCheck(chromeos::UpdateCallback callback, void* user_data) {
     if (callback)
       callback(user_data, UPDATE_RESULT_FAILED, "stub update");
   }
   bool RebootAfterUpdate() { return false; }
   void SetReleaseTrack(const std::string& track) { }
   void GetReleaseTrack(chromeos::UpdateTrackCallback callback,
                        void* user_data) {
     if (callback)
       callback(user_data, "beta-channel");
   }
-  const UpdateLibrary::Status& status() const {
-    return status_;
-  }
+  const UpdateLibrary::Status& status() const { return status_; }
 
  private:
   Status status_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateLibraryStubImpl);
 };
 
 // static
 UpdateLibrary* UpdateLibrary::GetImpl(bool stub) {
+  UpdateLibrary* impl;
   if (stub)
-    return new UpdateLibraryStubImpl();
+    impl = new UpdateLibraryStubImpl();
   else
-    return new UpdateLibraryImpl();
+    impl = new UpdateLibraryImpl();
+  impl->Init();
+  return impl;
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::UpdateLibraryImpl);