base::Bind: Convert chrome_frame/.

chrome_frame/test/mock_ie_event_sink_actions.h

 // 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.
 
 #ifndef CHROME_FRAME_TEST_MOCK_IE_EVENT_SINK_ACTIONS_H_
 #define CHROME_FRAME_TEST_MOCK_IE_EVENT_SINK_ACTIONS_H_
 
 #include <windows.h>
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/bind.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/chrome_frame_ui_test_utils.h"
 #include "chrome_frame/test/ie_event_sink.h"
 #include "chrome_frame/test/mock_ie_event_sink_test.h"
 #include "chrome_frame/test/simulate_input.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
 namespace chrome_frame_test {
 
 MATCHER_P(UrlPathEq, url, "equals the path and query portion of the url") {
   return arg == chrome_frame_test::GetPathAndQueryFromUrl(url);
 }
 
 MATCHER_P(AccSatisfies, matcher, "satisfies the given AccObjectMatcher") {
   return matcher.DoesMatch(arg);
 }
 
 // IWebBrowser2 actions
 
 ACTION_P2(Navigate, mock, navigate_url) {
   mock->event_sink()->Navigate(navigate_url);
 }
 
 ACTION_P3(DelayNavigateToCurrentUrl, mock, loop, delay) {
-  loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(&NavigateToCurrentUrl,
-      mock), delay);
+  loop->PostDelayedTask(FROM_HERE,
+                        base::Bind(&NavigateToCurrentUrl, mock), delay);
 }
 
 ACTION_P(CloseBrowserMock, mock) {
   mock->event_sink()->CloseWebBrowser();
 }
 
 ACTION_P3(DelayCloseBrowserMock, loop, delay, mock) {
-  loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mock->event_sink(),
-      &IEEventSink::CloseWebBrowser), delay);
+  loop->PostDelayedTask(
+      FROM_HERE,
+      base::IgnoreReturn<HRESULT>(
+          base::Bind(&IEEventSink::CloseWebBrowser, mock->event_sink())),
+      delay);
 }
 
 ACTION_P2(ConnectDocPropNotifySink, mock, sink) {
   base::win::ScopedComPtr<IDispatch> document;
   mock->event_sink()->web_browser2()->get_Document(document.Receive());
   EXPECT_TRUE(document != NULL);  // NOLINT
   if (document) {
     sink->Attach(document);
   }
 }
 
 ACTION_P(DisconnectDocPropNotifySink, sink) {
   sink->Detach();
 }
 
 ACTION_P8(DelayExecCommand, mock, loop, delay, cmd_group_guid, cmd_id,
           cmd_exec_opt, in_args, out_args) {
-  loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mock->event_sink(),
-      &IEEventSink::Exec, cmd_group_guid, cmd_id, cmd_exec_opt, in_args,
-          out_args), delay);
+  loop->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(&IEEventSink::Exec, mock->event_sink(), cmd_group_guid, cmd_id,
+                 cmd_exec_opt, in_args, out_args),
+      delay);
 }
 
 ACTION_P3(DelayGoBack, mock, loop, delay) {
-  loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mock->event_sink(),
-      &IEEventSink::GoBack), delay);
+  loop->PostDelayedTask(
+      FROM_HERE, base::Bind(&IEEventSink::GoBack, mock->event_sink()), delay);
 }
 
 ACTION_P3(DelayGoForward, mock, loop, delay) {
-  loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mock->event_sink(),
-      &IEEventSink::GoForward), delay);
+  loop->PostDelayedTask(
+      FROM_HERE, base::Bind(&IEEventSink::GoForward, mock->event_sink()),
+      delay);
 }
 
 ACTION_P3(DelayRefresh, mock, loop, delay) {
-  loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mock->event_sink(),
-      &IEEventSink::Refresh), delay);
+  loop->PostDelayedTask(
+      FROM_HERE, base::Bind(&IEEventSink::Refresh, mock->event_sink()), delay);
 }
 
 ACTION_P2(PostMessageToCF, mock, message) {
   mock->event_sink()->PostMessageToCF(message, L"*");
 }
 
 // Accessibility-related actions
 
 ACTION_P(AccDoDefaultAction, matcher) {
   scoped_refptr<AccObject> object;
@@ skipping 165 matching lines @@
 
 }  // namespace
 
 ACTION(DoCloseWindow) {
   DoCloseWindowNow(arg0);
 }
 
 ACTION_P(DelayDoCloseWindow, delay) {
   DCHECK(MessageLoop::current());
   MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      NewRunnableFunction(DoCloseWindowNow, arg0),
-      delay);
+      FROM_HERE, base::Bind(DoCloseWindowNow, arg0), delay);
 }
 
 ACTION(KillChromeFrameProcesses) {
   KillAllNamedProcessesWithArgument(
       UTF8ToWide(chrome_frame_test::kChromeImageName),
       UTF8ToWide(switches::kChromeFrame));
 }
 
 // Verifying actions
 ACTION_P(AccExpect, matcher) {
@@ skipping 83 matching lines @@
 }
 
 // Flaky actions
 
 ACTION_P(SetFocusToRenderer, mock) {
   simulate_input::SetKeyboardFocusToWindow(
       mock->event_sink()->GetRendererWindow());
 }
 
 ACTION_P4(DelaySendChar, loop, delay, c, mod) {
-  loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
-      simulate_input::SendCharA, c, mod), delay);
+  loop->PostDelayedTask(
+      FROM_HERE, base::Bind(simulate_input::SendCharA, c, mod), delay);
 }
 
 ACTION_P4(DelaySendScanCode, loop, delay, c, mod) {
-  loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
-        simulate_input::SendScanCode, c, mod), delay);
+  loop->PostDelayedTask(
+      FROM_HERE, base::Bind(simulate_input::SendScanCode, c, mod), delay);
 }
 
 // This function selects the address bar via the Alt+d shortcut.
 ACTION_P3(TypeUrlInAddressBar, loop, url, delay) {
-  loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
-      simulate_input::SendCharA, 'd', simulate_input::ALT),
-      delay);
+  loop->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(simulate_input::SendCharA, 'd', simulate_input::ALT), delay);
 
   const unsigned int kInterval = 500;
   int next_delay = delay + kInterval;
 
-  loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
-      simulate_input::SendStringW, url), next_delay);
+  loop->PostDelayedTask(
+      FROM_HERE, base::Bind(simulate_input::SendStringW, url), next_delay);
 
   next_delay = next_delay + kInterval;
 
-  loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
-      simulate_input::SendCharA, VK_RETURN, simulate_input::NONE),
+  loop->PostDelayedTask(
+      FROM_HERE,
+      base::Bind(simulate_input::SendCharA, VK_RETURN, simulate_input::NONE),
       next_delay);
 }
 
 }  // namespace chrome_frame_test
 
 #endif  // CHROME_FRAME_TEST_MOCK_IE_EVENT_SINK_ACTIONS_H_