cros: Remove unneeded includes from update_library.h plus some random cleanups.

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/message_loop.h"
-#include "base/string_util.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()) {
+  UpdateLibraryImpl() : status_connection_(NULL) {
+    if (CrosLibrary::Get()->EnsureLoaded())
       Init();

[stevenjb, 2011/08/05 00:01:42]

We should make Init() virtual for this class also (or at least move the
EnsueLoaded() check to Init())

[tfarina, 2011/08/05 00:03:53]

Sure, I'll do. It was in my TODO list. I was planning to do in a follow up patch
though.

-    }
   }
 
   virtual ~UpdateLibraryImpl() {
     if (status_connection_) {
-      DisconnectUpdateProgress(status_connection_);
+      chromeos::DisconnectUpdateProgress(status_connection_);
+      status_connection_ = NULL;
     }
   }
 
   void AddObserver(Observer* observer) {
     observers_.AddObserver(observer);
   }
 
   void RemoveObserver(Observer* observer) {
     observers_.RemoveObserver(observer);
   }
@@ skipping 23 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) {
-    UpdateLibraryImpl* updater = static_cast<UpdateLibraryImpl*>(object);
-    updater->UpdateStatus(Status(status));
+  static void ChangedHandler(void* object, const UpdateProgress& status) {
+    UpdateLibraryImpl* impl = static_cast<UpdateLibraryImpl*>(object);
+    impl->UpdateStatus(Status(status));
   }
 
   void Init() {
-    status_connection_ = MonitorUpdateStatus(&ChangedHandler, this);
+    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));
@@ skipping 50 matching lines @@
     return new UpdateLibraryStubImpl();
   else
     return new UpdateLibraryImpl();
 }
 
 }  // 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);