base::Bind: Cleanup in automation.

chrome/browser/automation/automation_util.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/automation/automation_util.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 134 matching lines @@
                 TabContents* contents,
                 int* value_size,
                 std::string* value) {
   *value_size = -1;
   if (url.is_valid() && contents) {
     scoped_refptr<net::URLRequestContextGetter> context_getter =
         GetRequestContext(contents);
     base::WaitableEvent event(true /* manual reset */,
                               false /* not initially signaled */);
     CHECK(BrowserThread::PostTask(
-              BrowserThread::IO, FROM_HERE,
-              NewRunnableFunction(&GetCookiesOnIOThread,
-                                  url, context_getter, &event, value)));
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&GetCookiesOnIOThread, url, context_getter, &event, value)));
     event.Wait();
 
     *value_size = static_cast<int>(value->size());
   }
 }
 
 void SetCookie(const GURL& url,
                const std::string& value,
                TabContents* contents,
                int* response_value) {
   *response_value = -1;
 
   if (url.is_valid() && contents) {
     scoped_refptr<net::URLRequestContextGetter> context_getter =
         GetRequestContext(contents);
     base::WaitableEvent event(true /* manual reset */,
                               false /* not initially signaled */);
     bool success = false;
     CHECK(BrowserThread::PostTask(
-              BrowserThread::IO, FROM_HERE,
-              NewRunnableFunction(&SetCookieOnIOThread,
-                                  url, value, context_getter, &event,
-                                  &success)));
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&SetCookieOnIOThread, url, value, context_getter, &event,
+                   &success)));
     event.Wait();
     if (success)
       *response_value = 1;
   }
 }
 
 void DeleteCookie(const GURL& url,
                   const std::string& cookie_name,
                   TabContents* contents,
                   bool* success) {
   *success = false;
   if (url.is_valid() && contents) {
     scoped_refptr<net::URLRequestContextGetter> context_getter =
         GetRequestContext(contents);
     base::WaitableEvent event(true /* manual reset */,
                               false /* not initially signaled */);
     CHECK(BrowserThread::PostTask(
-              BrowserThread::IO, FROM_HERE,
-              NewRunnableFunction(&DeleteCookieOnIOThread,
-                                  url, cookie_name, context_getter, &event)));
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&DeleteCookieOnIOThread, url, cookie_name, context_getter,
+                   &event)));
     event.Wait();
     *success = true;
   }
 }
 
 void GetCookiesJSON(AutomationProvider* provider,
                     DictionaryValue* args,
                     IPC::Message* reply_message) {
   AutomationJSONReply reply(provider, reply_message);
   std::string url;
   if (!args->GetString("url", &url)) {
     reply.SendError("'url' missing or invalid");
     return;
   }
 
   // Since we may be on the UI thread don't call GetURLRequestContext().
   scoped_refptr<net::URLRequestContextGetter> context_getter =
       provider->profile()->GetRequestContext();
 
   net::CookieList cookie_list;
   base::WaitableEvent event(true /* manual reset */,
                             false /* not initially signaled */);
-  Task* task = NewRunnableFunction(
-      &GetCanonicalCookiesOnIOThread,
-      GURL(url), context_getter, &event, &cookie_list);
+  base::Closure task = base::Bind(&GetCanonicalCookiesOnIOThread, GURL(url),
+                                  context_getter, &event, &cookie_list);
   if (!BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, task)) {
     reply.SendError("Couldn't post task to get the cookies");
     return;
   }
   event.Wait();
 
   ListValue* list = new ListValue();
   for (size_t i = 0; i < cookie_list.size(); ++i) {
     const net::CookieMonster::CanonicalCookie& cookie = cookie_list[i];
     DictionaryValue* cookie_dict = new DictionaryValue();
@@ skipping 25 matching lines @@
     reply.SendError("'name' missing or invalid");
     return;
   }
 
   // Since we may be on the UI thread don't call GetURLRequestContext().
   scoped_refptr<net::URLRequestContextGetter> context_getter =
       provider->profile()->GetRequestContext();
 
   base::WaitableEvent event(true /* manual reset */,
                             false /* not initially signaled */);
-  Task* task = NewRunnableFunction(
-      &DeleteCookieOnIOThread,
-      GURL(url), name, context_getter, &event);
+  base::Closure task = base::Bind(&DeleteCookieOnIOThread, GURL(url), name,
+                                  context_getter, &event);
   if (!BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, task)) {
     reply.SendError("Couldn't post task to delete the cookie");
     return;
   }
   event.Wait();
   reply.SendSuccess(NULL);
 }
 
 void SetCookieJSON(AutomationProvider* provider,
                    DictionaryValue* args,
@@ skipping 67 matching lines @@
     return;
   }
 
   // Since we may be on the UI thread don't call GetURLRequestContext().
   scoped_refptr<net::URLRequestContextGetter> context_getter =
       provider->profile()->GetRequestContext();
 
   base::WaitableEvent event(true /* manual reset */,
                             false /* not initially signaled */);
   bool success = false;
-  Task* task = NewRunnableFunction(
-      &SetCookieWithDetailsOnIOThread,
-      GURL(url), *cookie.get(), domain, context_getter, &event, &success);
+  base::Closure task = base::Bind(
+      &SetCookieWithDetailsOnIOThread, GURL(url), *cookie.get(), domain,
+      context_getter, &event, &success);
   if (!BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, task)) {
     reply.SendError("Couldn't post task to set the cookie");
     return;
   }
   event.Wait();
 
   if (!success) {
     reply.SendError("Could not set the cookie");
     return;
   }
   reply.SendSuccess(NULL);
 }
 
 bool SendErrorIfModalDialogActive(AutomationProvider* provider,
                                   IPC::Message* message) {
   bool active = AppModalDialogQueue::GetInstance()->HasActiveDialog();
   if (active) {
     AutomationJSONReply(provider, message).SendError(
         "Command cannot be performed because a modal dialog is active");
   }
   return active;
 }
 
 }  // namespace automation_util