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

chrome/browser/extensions/extension_webrequest_api_unittest.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 <queue>
 #include <map>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/json/json_value_serializer.h"
+#include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
 #include "chrome/browser/extensions/extension_webrequest_api.h"
 #include "chrome/browser/extensions/extension_webrequest_api_constants.h"
 #include "chrome/browser/extensions/extension_webrequest_api_helpers.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/common/extensions/extension_messages.h"
@@ skipping 33 matching lines @@
 }  // namespace
 
 // A mock event router that responds to events with a pre-arranged queue of
 // Tasks.
 class TestIPCSender : public IPC::Message::Sender {
  public:
   typedef std::list<linked_ptr<IPC::Message> > SentMessages;
 
   // Adds a Task to the queue. We will fire these in order as events are
   // dispatched.
-  void PushTask(base::Closure task) {
+  void PushTask(const base::Closure& task) {
     task_queue_.push(task);
   }
 
   size_t GetNumTasks() { return task_queue_.size(); }
 
   SentMessages::const_iterator sent_begin() const {
     return sent_messages_.begin();
   }
 
   SentMessages::const_iterator sent_end() const {
@@ skipping 278 matching lines @@
   TestingProfile profile_;
   TestDelegate delegate_;
   BooleanPrefMember enable_referrers_;
   TestIPCSender ipc_sender_;
   scoped_refptr<ExtensionEventRouterForwarder> event_router_;
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
   scoped_ptr<ChromeNetworkDelegate> network_delegate_;
   scoped_refptr<TestURLRequestContext> context_;
 };
 
-static void DoNothing() {
-}
-
 TEST_P(ExtensionWebRequestHeaderModificationTest, TestModifications) {
   std::string extension1_id("1");
   std::string extension2_id("2");
   std::string extension3_id("3");
   ExtensionWebRequestEventRouter::RequestFilter filter;
   const std::string kEventName(keys::kOnBeforeSendHeaders);
   base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_);
 
   // Install two extensions that can modify headers. Extension 2 has
   // higher precedence than extension 1.
@@ skipping 55 matching lines @@
       ipc_sender_.PushTask(
           base::Bind(&EventHandledOnIOThread,
               &profile_, mod.extension_id == 1 ? extension1_id : extension2_id,
               kEventName, kEventName + (mod.extension_id == 1 ? "/1" : "/2"),
               request.identifier(), response));
       response = NULL;
     }
   }
 
   // Don't do anything for the onSendHeaders message.
-  ipc_sender_.PushTask(base::Bind(&DoNothing));
+  ipc_sender_.PushTask(base::Bind(&base::DoNothing));
 
   // Note that we mess up the headers slightly:
   // request.Start() will first add additional headers (e.g. the User-Agent)
   // and then send an event to the extension. When we have prepared our
   // answers to the onBeforeSendHeaders events above, these headers did not
   // exists and are therefore not listed in the responses. This makes
   // them seem deleted.
   request.Start();
   MessageLoop::current()->Run();
 
@@ skipping 898 matching lines @@
   credentials_set = MergeOnAuthRequiredResponses(
         deltas, &auth3, &conflicting_extensions, &event_log);
   EXPECT_TRUE(credentials_set);
   EXPECT_FALSE(auth3.Empty());
   EXPECT_EQ(username, auth1.username());
   EXPECT_EQ(password, auth1.password());
   EXPECT_EQ(1u, conflicting_extensions.size());
   EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2"));
   EXPECT_EQ(3u, event_log.size());
 }