chromeos: Change all clients of UpdateLibrary to use UpdateEngineClient.

chrome/browser/ui/webui/options/chromeos/about_page_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_ABOUT_PAGE_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_ABOUT_PAGE_HANDLER_H_
 
 #include <string>
 
 #include "chrome/browser/ui/webui/options/options_ui.h"
 
 #include "chrome/browser/ui/webui/options/chromeos/cros_options_page_ui_handler.h"
-#include "chrome/browser/chromeos/cros/update_library.h"
+#include "chrome/browser/chromeos/dbus/update_engine_client.h"
 #include "chrome/browser/chromeos/version_loader.h"
 
 namespace chromeos {
 
 // ChromeOS about page UI handler.
 class AboutPageHandler : public CrosOptionsPageUIHandler {
 
  public:
   AboutPageHandler();
   virtual ~AboutPageHandler();
@@ skipping 14 matching lines @@
   void CheckNow(const base::ListValue* args);
 
   // Restarts the system.
   void RestartNow(const base::ListValue* args);
 
   // Callback from VersionLoader giving the version.
   void OnOSVersion(VersionLoader::Handle handle,
                    std::string version);
   void OnOSFirmware(VersionLoader::Handle handle,
                     std::string firmware);
-  void UpdateStatus(const UpdateLibrary::Status& status);
+  void UpdateStatus(const UpdateEngineClient::Status& status);
 
   // UpdateEngine Callback handler.
-  static void UpdateSelectedChannel(void* user_data, const char* channel);
+  class UpdateObserver;

[stevenjb, 2011/11/21 19:28:05]

nit: Forward declaration at start of section? (I don't think it's covered in the
guide, but it seems consistent to put this where typedefs would be).

[satorux1, 2011/11/22 07:33:05]

Done.

+  static void UpdateSelectedChannel(UpdateObserver* observer,
+                                    const std::string& channel);
 
   // Handles asynchronously loading the version.
   VersionLoader loader_;
 
   // Used to request the version.
   CancelableRequestConsumer consumer_;
 
   // Update Observer
-  class UpdateObserver;
   scoped_ptr<UpdateObserver> update_observer_;
 
   int progress_;
   bool sticky_;
   bool started_;
 
   DISALLOW_COPY_AND_ASSIGN(AboutPageHandler);
 };
 
 } // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_ABOUT_PAGE_HANDLER_H_