base::Bind: Convert chrome/service/cloud_print.

chrome/service/cloud_print/cloud_print_connector.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/service/cloud_print/cloud_print_connector.h"
 
+#include "base/bind.h"

[csilv, 2011/11/19 01:33:57]

add bind/bind_helpers.h

[James Hawkins, 2011/11/19 01:49:35]

Done.

 #include "base/md5.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"
 #include "chrome/service/cloud_print/cloud_print_helpers.h"
 #include "grit/generated_resources.h"
@@ skipping 356 matching lines @@
   task.type = PENDING_PRINTER_REGISTER;
   task.printer_info = info;
   AddPendingTask(task);
 }
 
 void CloudPrintConnector::AddPendingTask(const PendingTask& task) {
   pending_tasks_.push_back(task);
   // If this is the only pending task, we need to start the process.
   if (pending_tasks_.size() == 1) {
     MessageLoop::current()->PostTask(
-        FROM_HERE, NewRunnableMethod(
-            this, &CloudPrintConnector::ProcessPendingTask));
+        FROM_HERE, base::Bind(&CloudPrintConnector::ProcessPendingTask, this));
   }
 }
 
 void CloudPrintConnector::ProcessPendingTask() {
   if (!IsRunning())
     return;  // Orphant call.
   if (pending_tasks_.size() == 0)
     return;  // No peding tasks.
 
   PendingTask task = pending_tasks_.front();
@@ skipping 26 matching lines @@
     const printing::PrinterBasicInfo& info) {
   for (JobHandlerMap::iterator it = job_handler_map_.begin();
        it != job_handler_map_.end(); ++it) {
     if (IsSamePrinter(it->second->GetPrinterName(), info.printer_name)) {
       // Printer already registered, continue to the next task.
       ContinuePendingTaskProcessing();
       return;
     }
   }
 
-  cloud_print::PrintSystem::PrinterCapsAndDefaultsCallback* callback =
-       NewCallback(this, &CloudPrintConnector::OnReceivePrinterCaps);
-  // Asnchronously fetch the printer caps and defaults. The story will
+  // Asynchronously fetch the printer caps and defaults. The story will
   // continue in OnReceivePrinterCaps.
   print_system_->GetPrinterCapsAndDefaults(
-      info.printer_name.c_str(), callback);
+      info.printer_name.c_str(),
+      base::Bind(&CloudPrintConnector::OnReceivePrinterCaps,
+                 base::Unretained(this)));
 }
 
 void CloudPrintConnector::OnPrinterDelete(const std::string& printer_id) {
   // Remove corresponding printer job handler.
   JobHandlerMap::iterator it = job_handler_map_.find(printer_id);
   if (it != job_handler_map_.end()) {
     it->second->Shutdown();
     job_handler_map_.erase(it);
   }
 
   // TODO(gene): We probably should not try indefinitely here. Just once or
   // twice should be enough.
   // Bug: http://code.google.com/p/chromium/issues/detail?id=101850
   GURL url = CloudPrintHelpers::GetUrlForPrinterDelete(cloud_print_server_url_,
                                                        printer_id);
   StartGetRequest(url,
                   kCloudPrintAPIMaxRetryCount,
                   &CloudPrintConnector::HandlePrinterDeleteResponse);
 }
 
 void CloudPrintConnector::ContinuePendingTaskProcessing() {
   if (pending_tasks_.size() == 0)
-    return;  // No peding tasks.
+    return;  // No pending tasks.
 
-  // Delete current task and repost if we have more task avaialble.
+  // Delete current task and repost if we have more task available.
   pending_tasks_.pop_front();
   if (pending_tasks_.size() != 0) {
     MessageLoop::current()->PostTask(
-        FROM_HERE, NewRunnableMethod(
-            this, &CloudPrintConnector::ProcessPendingTask));
+        FROM_HERE, base::Bind(&CloudPrintConnector::ProcessPendingTask, this));
   }
 }
 
 void CloudPrintConnector::OnReceivePrinterCaps(
     bool succeeded,
     const std::string& printer_name,
     const printing::PrinterCapsAndDefaults& caps_and_defaults) {
   if (!IsRunning())
     return;  // Orphant call.
   DCHECK(pending_tasks_.size() > 0 &&
@@ skipping 66 matching lines @@
                    mime_type,
                    post_data,
                    &CloudPrintConnector::HandleRegisterPrinterResponse);
 }
 
 bool CloudPrintConnector::IsSamePrinter(const std::string& name1,
                                         const std::string& name2) const {
   return (0 == base::strcasecmp(name1.c_str(), name2.c_str()));
 }