base::Bind: Conversions in webkit/plugins/npapi.

webkit/plugins/npapi/webplugin_impl.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 "webkit/plugins/npapi/webplugin_impl.h"
 
+#include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_util.h"
 #include "net/base/escape.h"
@@ skipping 323 matching lines @@
   // first update geometry sequence. We need to ensure that the plugin
   // receives the geometry update before it starts receiving data.
   if (first_geometry_update_) {
     // An empty url corresponds to an EMBED tag with no src attribute.
     if (!load_manually_ && plugin_url_.is_valid()) {
       // The Flash plugin hangs for a while if it receives data before
       // receiving valid plugin geometry. By valid geometry we mean the
       // geometry received by a call to setFrameRect in the Webkit
       // layout code path. To workaround this issue we download the
       // plugin source url on a timer.
-      MessageLoop::current()->PostDelayedTask(
-          FROM_HERE, method_factory_.NewRunnableMethod(
-              &WebPluginImpl::OnDownloadPluginSrcUrl), 0);
+      MessageLoop::current()->PostTask(
+          FROM_HERE, base::Bind(&WebPluginImpl::OnDownloadPluginSrcUrl,
+                                weak_factory_.GetWeakPtr()));
     }
   }
 
 #if defined(OS_WIN)
   // Don't cache the geometry during the first geometry update. The first
   // geometry update sequence is received when Widget::setParent is called.
   // For plugins like media player which have a bug where they only honor
   // the first geometry update, we have a quirk which ignores the first
   // geometry update. To ensure that these plugins work correctly in cases
   // where we receive only one geometry update from webkit, we also force
@@ skipping 104 matching lines @@
       page_delegate_(page_delegate),
       webframe_(webframe),
       delegate_(NULL),
       container_(NULL),
       plugin_url_(params.url),
       load_manually_(params.loadManually),
       first_geometry_update_(true),
       ignore_response_error_(false),
       file_path_(file_path),
       mime_type_(UTF16ToASCII(params.mimeType)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   DCHECK_EQ(params.attributeNames.size(), params.attributeValues.size());
   StringToLowerASCII(&mime_type_);
 
   for (size_t i = 0; i < params.attributeNames.size(); ++i) {
     arg_names_.push_back(params.attributeNames[i].utf8());
     arg_values_.push_back(params.attributeValues[i].utf8());
   }
 }
 
 WebPluginImpl::~WebPluginImpl() {
@@ skipping 855 matching lines @@
 
     if (client_info.loader.get())
       client_info.loader->cancel();
 
     client_index = clients_.erase(client_index);
   }
 
   // This needs to be called now and not in the destructor since the
   // webframe_ might not be valid anymore.
   webframe_ = NULL;
-  method_factory_.RevokeAll();
+  weak_factory_.InvalidateWeakPtrs();
 }
 
 void WebPluginImpl::SetReferrer(WebKit::WebURLRequest* request,
                                 Referrer referrer_flag) {
   switch (referrer_flag) {
     case DOCUMENT_URL:
       webframe_->setReferrerForRequest(*request, GURL());
       break;
 
     case PLUGIN_SRC:
       webframe_->setReferrerForRequest(*request, plugin_url_);
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace npapi
 }  // namespace webkit