base::Bind: More converts, mostly in WebUI.

chrome/browser/chromeos/version_loader.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_CHROMEOS_VERSION_LOADER_H_
 #define CHROME_BROWSER_CHROMEOS_VERSION_LOADER_H_
 #pragma once
 
 #include <string>
 
-#include "base/callback_old.h"
+#include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "content/browser/cancelable_request.h"
 
 class FilePath;
 
 namespace chromeos {
 
 // ChromeOSVersionLoader loads the version of Chrome OS from the file system.
 // Loading is done asynchronously on the file thread. Once loaded,
 // ChromeOSVersionLoader callback to a method of your choice with the version
@@ skipping 14 matching lines @@
   VersionLoader();
   virtual ~VersionLoader();
 
   enum VersionFormat {
     VERSION_SHORT,
     VERSION_SHORT_WITH_DATE,
     VERSION_FULL,
   };
 
   // Signature
-  typedef Callback2<Handle, std::string>::Type GetVersionCallback;
+  typedef base::Callback<void(Handle, std::string)> GetVersionCallback;
   typedef CancelableRequest<GetVersionCallback> GetVersionRequest;
 
-  typedef Callback2<Handle, std::string>::Type GetFirmwareCallback;
+  typedef base::Callback<void(Handle, std::string)> GetFirmwareCallback;
   typedef CancelableRequest<GetFirmwareCallback> GetFirmwareRequest;
 
   // Asynchronously requests the version.
   // If |full_version| is true version string with extra info is extracted,
   // otherwise it's in short format x.x.xx.x.
   Handle GetVersion(CancelableRequestConsumerBase* consumer,
-                    GetVersionCallback* callback,
+                    const GetVersionCallback& callback,
                     VersionFormat format);
 
   Handle GetFirmware(CancelableRequestConsumerBase* consumer,
-                     GetFirmwareCallback* callback);
+                     const GetFirmwareCallback& callback);
 
   // Parse the version information as a Chrome platfrom, not Chrome OS
   // TODO(rkc): Change this and everywhere it is used once we switch Chrome OS
   // over to xx.yyy.zz version numbers instead of 0.xx.yyy.zz
   // Refer to http://code.google.com/p/chromium-os/issues/detail?id=15789
   void EnablePlatformVersions(bool enable);
 
   static const char kFullVersionPrefix[];
   static const char kVersionPrefix[];
   static const char kFirmwarePrefix[];
@@ skipping 36 matching lines @@
   static std::string ParseFirmware(const std::string& contents);
 
   scoped_refptr<Backend> backend_;
 
   DISALLOW_COPY_AND_ASSIGN(VersionLoader);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_VERSION_LOADER_H_