A few more base::Bind migrations.

chrome/browser/external_tab_container_win.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/external_tab_container_win.h"
 
 #include <string>
 
+#include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/win_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/debugger/devtools_toggle_action.h"
@@ skipping 76 matching lines @@
 ExternalTabContainer::ExternalTabContainer(
     AutomationProvider* automation, AutomationResourceMessageFilter* filter)
     : views::NativeWidgetWin(new views::Widget),
       automation_(automation),
       tab_contents_container_(NULL),
       tab_handle_(0),
       ignore_next_load_notification_(false),
       automation_resource_message_filter_(filter),
       load_requests_via_automation_(false),
       handle_top_level_requests_(false),
-      external_method_factory_(this),
+      weak_factory_(this),

[James Hawkins, 2011/11/23 18:09:51]

ALLOW_THIS_... for consistency across the code base.

[csilv, 2011/11/23 18:35:36]

Done.

       pending_(false),
       focus_manager_(NULL),
       external_tab_view_(NULL),
       unload_reply_message_(NULL),
       route_all_top_level_navigations_(false),
       is_popup_window_(false) {
 }
 
 ExternalTabContainer::~ExternalTabContainer() {
   Uninitialize();
@@ skipping 75 matching lines @@
   registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED,
                  content::NotificationService::AllSources());
 
   TabContentsObserver::Observe(tab_contents_->tab_contents());
 
   // Start loading initial URL
   if (!initial_url.is_empty()) {
     // Navigate out of context since we don't have a 'tab_handle_' yet.
     MessageLoop::current()->PostTask(
         FROM_HERE,
-        external_method_factory_.NewRunnableMethod(
-            &ExternalTabContainer::Navigate, initial_url, referrer));
+        base::Bind(&ExternalTabContainer::Navigate, weak_factory_.GetWeakPtr(),
+                   initial_url, referrer));
   }
 
   // We need WS_POPUP to be on the window during initialization, but
   // once initialized we apply the requested style which may or may not
   // include the popup bit.
   // Note that it's important to do this before we call SetParent since
   // during the SetParent call we will otherwise get a WA_ACTIVATE call
   // that causes us to steal the current focus.
   SetWindowLong(GWL_STYLE, (GetWindowLong(GWL_STYLE) & ~WS_POPUP) | style);
 
@@ skipping 42 matching lines @@
   if (!automation_provider || !filter) {
     NOTREACHED();
     return false;
   }
 
   automation_ = automation_provider;
   automation_resource_message_filter_ = filter;
   // Wait for the automation channel to be initialized before resuming pending
   // render views and sending in the navigation state.
   MessageLoop::current()->PostTask(
-      FROM_HERE,
-      external_method_factory_.NewRunnableMethod(
-          &ExternalTabContainer::OnReinitialize));
+      FROM_HERE, base::Bind(&ExternalTabContainer::OnReinitialize,
+                            weak_factory_.GetWeakPtr()));
 
   if (parent_window)
     SetParent(GetNativeView(), parent_window);
   return true;
 }
 
 void ExternalTabContainer::SetTabHandle(int handle) {
   tab_handle_ = handle;
 }
 
@@ skipping 257 matching lines @@
 
   return true;
 }
 
 bool ExternalTabContainer::CanDownload(TabContents* source, int request_id) {
   if (load_requests_via_automation_) {
     if (automation_) {
       // In case the host needs to show UI that needs to take the focus.
       ::AllowSetForegroundWindow(ASFW_ANY);
 
-      BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-          NewRunnableMethod(automation_resource_message_filter_.get(),
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          base::Bind(
               &AutomationResourceMessageFilter::SendDownloadRequestToHost,
-              0, tab_handle_, request_id));
+              automation_resource_message_filter_.get(), 0, tab_handle_,
+              request_id));
     }
   } else {
     DLOG(WARNING) << "Downloads are only supported with host browser network "
                      "stack enabled.";
   }
 
   // Never allow downloads.
   return false;
 }
 
@@ skipping 616 matching lines @@
   if (params.disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     forward_params.disposition = NEW_FOREGROUND_TAB;
   }
   TabContents* new_contents =
       ExternalTabContainer::OpenURLFromTab(source, forward_params);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
   return new_contents;
 }