Get rid of net::CookiePolicy, now that all code that uses it (except WebSocketJob, which appears to be unused and which I updated in this cl) is switched over to use ContentBrowserClient.

BUG=76793
Review URL: http://codereview.chromium.org/6973011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85136 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 13 deletions

diff --git a/net/base/static_cookie_policy.h b/net/base/static_cookie_policy.h
index 77a62e8..12a78cd 100644
--- a/net/base/static_cookie_policy.h
+++ b/net/base/static_cookie_policy.h
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "net/base/cookie_policy.h"
 
 class GURL;
 
@@ -17,11 +16,7 @@ namespace net {
 
 // The StaticCookiePolicy class implements a static cookie policy that supports
 // three modes: allow all, deny all, or block third-party cookies.
-//
-// NOTE: This CookiePolicy implementation always completes synchronously.  The
-// callback parameter will be ignored if specified.  Just pass NULL.
-//
-class StaticCookiePolicy : public CookiePolicy {
+class StaticCookiePolicy {
  public:
   // Do not change the order of these types as they are persisted in
   // preferences.
@@ -49,18 +44,15 @@ class StaticCookiePolicy : public CookiePolicy {
   void set_type(Type type) { type_ = type; }
   Type type() const { return type_; }
 
-  // CookiePolicy methods:
-
   // Consults the user's third-party cookie blocking preferences to determine
   // whether the URL's cookies can be read.
-  virtual int CanGetCookies(const GURL& url,
-                            const GURL& first_party_for_cookies) const;
+  int CanGetCookies(const GURL& url, const GURL& first_party_for_cookies) const;
 
   // Consults the user's third-party cookie blocking preferences to determine
   // whether the URL's cookies can be set.
-  virtual int CanSetCookie(const GURL& url,
-                           const GURL& first_party_for_cookies,
-                           const std::string& cookie_line) const;
+  int CanSetCookie(const GURL& url,
+                   const GURL& first_party_for_cookies,
+                   const std::string& cookie_line) const;
 
  private:
   Type type_;