Remove async functionality from net::CookiePolicy.

net/url_request/url_request_test_util.h

Index: net/url_request/url_request_test_util.h
diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h
index 789c82aa61b1ee348a6348a2e9e93c13c22c6885..4d77d80eb6d2bdb22adfac4848f9af41d1cceedb 100644
--- a/net/url_request/url_request_test_util.h
+++ b/net/url_request/url_request_test_util.h
@@ -47,28 +47,20 @@ class TestCookiePolicy : public net::CookiePolicy {
   enum Options {
     NO_GET_COOKIES = 1 << 0,
     NO_SET_COOKIE  = 1 << 1,
-    ASYNC          = 1 << 2,
-    FORCE_SESSION  = 1 << 3,
+    FORCE_SESSION  = 1 << 2,
   };
 
   explicit TestCookiePolicy(int options_bit_mask);
   virtual ~TestCookiePolicy();
 
   // net::CookiePolicy:
-  virtual int CanGetCookies(const GURL& url, const GURL& first_party,
-                            net::CompletionCallback* callback);
-  virtual int CanSetCookie(const GURL& url, const GURL& first_party,
-                           const std::string& cookie_line,
-                           net::CompletionCallback* callback);
+  virtual int CanGetCookies(const GURL& url, const GURL& first_party) const;
+  virtual int CanSetCookie(const GURL& url,
+                           const GURL& first_party,
+                           const std::string& cookie_line) const;
 
  private:
-  void DoGetCookiesPolicy(const GURL& url, const GURL& first_party);
-  void DoSetCookiePolicy(const GURL& url, const GURL& first_party,
-                         const std::string& cookie_line);
-
-  ScopedRunnableMethodFactory<TestCookiePolicy> method_factory_;
   int options_;
-  net::CompletionCallback* callback_;
 };
 
 //-----------------------------------------------------------------------------