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

chrome/browser/chromeos/version_loader.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/version_loader.h"
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 26 matching lines @@
 
 // Same but for short version (x.x.xx.x).
 // static
 const char VersionLoader::kVersionPrefix[] = "CHROMEOS_RELEASE_VERSION=";
 
 // Beginning of line we look for that gives the firmware version.
 const char VersionLoader::kFirmwarePrefix[] = "version";
 
 VersionLoader::Handle VersionLoader::GetVersion(
     CancelableRequestConsumerBase* consumer,
-    VersionLoader::GetVersionCallback* callback,
+    const VersionLoader::GetVersionCallback& callback,
     VersionFormat format) {
   if (!g_browser_process->file_thread()) {
     // This should only happen if Chrome is shutting down, so we don't do
     // anything.
     return 0;
   }
 
   scoped_refptr<GetVersionRequest> request(new GetVersionRequest(callback));
   AddRequest(request, consumer);
 
   g_browser_process->file_thread()->message_loop()->PostTask(
       FROM_HERE,
       NewRunnableMethod(backend_.get(), &Backend::GetVersion, request, format));
   return request->handle();
 }
 
 VersionLoader::Handle VersionLoader::GetFirmware(
     CancelableRequestConsumerBase* consumer,
-    VersionLoader::GetFirmwareCallback* callback) {
+    const VersionLoader::GetFirmwareCallback& callback) {
   if (!g_browser_process->file_thread()) {
     // This should only happen if Chrome is shutting down, so we don't do
     // anything.
     return 0;
   }
 
   scoped_refptr<GetFirmwareRequest> request(new GetFirmwareRequest(callback));
   AddRequest(request, consumer);
 
   g_browser_process->file_thread()->message_loop()->PostTask(
@@ skipping 70 matching lines @@
     if (file_util::GetFileInfo(file_path, &fileinfo)) {
       base::Time::Exploded ctime;
       fileinfo.creation_time.UTCExplode(&ctime);
       version += base::StringPrintf("-%02u.%02u.%02u",
                                     ctime.year % 100,
                                     ctime.month,
                                     ctime.day_of_month);
     }
   }
 
-  request->ForwardResult(GetVersionCallback::TupleType(request->handle(),
-                                                       version));
+  request->ForwardResult(request->handle(), version);
 }
 
 void VersionLoader::Backend::GetFirmware(
     scoped_refptr<GetFirmwareRequest> request) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (request->canceled())
     return;
 
   std::string firmware;
   std::string contents;
   const FilePath file_path(kPathFirmware);
   if (file_util::ReadFileToString(file_path, &contents)) {
     firmware = ParseFirmware(contents);
   }
 
-  request->ForwardResult(GetFirmwareCallback::TupleType(request->handle(),
-                                                        firmware));
+  request->ForwardResult(request->handle(), firmware);
 }
 
 }  // namespace chromeos