Remove task.h and finish base::Bind() migration.

content/browser/plugin_service_impl_browsertest.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 "content/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/resource_context.h"
 #include "content/public/common/content_switches.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 123 matching lines @@
     return get_resource_context_called_;
   }
 
  private:
   const content::ResourceContext& context_;
   bool get_resource_context_called_;
 
   DISALLOW_COPY_AND_ASSIGN(MockCanceledPluginServiceClient);
 };
 
-void DoNothing() {}
-
 void QuitUIMessageLoopFromIOThread() {
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           MessageLoop::QuitClosure());
 }
 
 void OpenChannelAndThenCancel(PluginProcessHost::Client* client) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Start opening the channel
   PluginServiceImpl::GetInstance()->OpenChannelToNpapiPlugin(
       0, 0, GURL(), GURL(), kNPAPITestPluginMimeType, client);
   // Immediately cancel it. This is guaranteed to work since PluginService needs
   // to consult its filter on the FILE thread.
   PluginServiceImpl::GetInstance()->CancelOpenChannelToNpapiPlugin(client);
   // Before we terminate the test, add a roundtrip through the FILE thread to
   // make sure that it's had a chance to post back to the IO thread. Then signal
   // the UI thread to stop and exit the test.
   BrowserThread::PostTaskAndReply(
       BrowserThread::FILE, FROM_HERE,
-      base::Bind(&DoNothing),
+      base::Bind(&base::DoNothing),
       base::Bind(&QuitUIMessageLoopFromIOThread));
 }
 
 // Should not attempt to open a channel, since it should be canceled early on.
 IN_PROC_BROWSER_TEST_F(PluginServiceTest, CancelOpenChannelToPluginService) {
   ::testing::StrictMock<MockCanceledPluginServiceClient> mock_client(
       browser()->profile()->GetResourceContext());
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(OpenChannelAndThenCancel, &mock_client));
   ui_test_utils::RunMessageLoop();
@@ skipping 120 matching lines @@
       BrowserThread::IO, FROM_HERE,
       base::Bind(&OpenChannel, &mock_client));
   ui_test_utils::RunMessageLoop();
   EXPECT_TRUE(mock_client.get_resource_context_called());
   EXPECT_TRUE(mock_client.set_plugin_info_called());
   EXPECT_TRUE(mock_client.on_found_plugin_process_host_called());
   EXPECT_TRUE(mock_client.on_sent_plugin_channel_request_called());
 }
 
 }  // namespace