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

chrome/browser/chromeos/system/syslogs_provider.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/system/syslogs_provider.h"
 
 #include <functional>
 #include <set>
 
 #include "base/command_line.h"
@@ skipping 157 matching lines @@
 
 }  // namespace
 
 class SyslogsProviderImpl : public SyslogsProvider {
  public:
   // SyslogsProvider implementation:
   virtual Handle RequestSyslogs(
       bool compress_logs,
       SyslogsContext context,
       CancelableRequestConsumerBase* consumer,
-      ReadCompleteCallback* callback);
+      const ReadCompleteCallback& callback);
 
   // Reads system logs, compresses content if requested.
   // Called from FILE thread.
   void ReadSyslogs(
       scoped_refptr<CancelableRequest<ReadCompleteCallback> > request,
       bool compress_logs,
       SyslogsContext context);
 
   // Loads compressed logs and writes into |zip_content|.
   void LoadCompressedLogs(const FilePath& zip_file,
@@ skipping 12 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SyslogsProviderImpl);
 };
 
 SyslogsProviderImpl::SyslogsProviderImpl() {
 }
 
 CancelableRequestProvider::Handle SyslogsProviderImpl::RequestSyslogs(
     bool compress_logs,
     SyslogsContext context,
     CancelableRequestConsumerBase* consumer,
-    ReadCompleteCallback* callback) {
+    const ReadCompleteCallback& callback) {
   // Register the callback request.
   scoped_refptr<CancelableRequest<ReadCompleteCallback> > request(
          new CancelableRequest<ReadCompleteCallback>(callback));
   AddRequest(request, consumer);
 
   // Schedule a task on the FILE thread which will then trigger a request
   // callback on the calling thread (e.g. UI) when complete.
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(
@@ skipping 56 matching lines @@
     }
     // Add one line for each reverse-sorted entry.
     std::string mem_string;
     for (ProcInfoSet::iterator iter = process_info.begin();
          iter != process_info.end(); ++iter) {
       mem_string +=
           iter->second + base::StringPrintf(": %d MB", iter->first) + "\n";
     }
     (*logs_)["mem_usage"] = mem_string;
     // This will call the callback on the calling thread.
-    request_->ForwardResult(
-        Tuple2<LogDictionaryType*, std::string*>(logs_, zip_content_));
+    request_->ForwardResult(logs_, zip_content_);
   }
 
  private:
   virtual ~SyslogsMemoryHandler() {}
 
   scoped_refptr<CancelableRequest<ReadCompleteCallback> > request_;
   LogDictionaryType* logs_;
   std::string* zip_content_;
   DISALLOW_COPY_AND_ASSIGN(SyslogsMemoryHandler);
 };
@@ skipping 74 matching lines @@
 SyslogsProvider* SyslogsProvider::GetInstance() {
   return SyslogsProviderImpl::GetInstance();
 }
 
 }  // namespace system
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. SyslogsProviderImpl is a
 // Singleton and won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::system::SyslogsProviderImpl);