Changes to support new cookie policy....

net/base/static_cookie_policy.h

Index: net/base/static_cookie_policy.h
===================================================================
--- net/base/static_cookie_policy.h	(revision 37557)
+++ net/base/static_cookie_policy.h	(working copy)
@@ -1,18 +1,20 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
-#ifndef NET_BASE_COOKIE_POLICY_H_
-#define NET_BASE_COOKIE_POLICY_H_
+#ifndef NET_BASE_STATIC_COOKIE_POLICY_H_
+#define NET_BASE_STATIC_COOKIE_POLICY_H_
 
 #include "base/basictypes.h"
+#include "net/base/cookie_policy.h"
 
 class GURL;
 
 namespace net {
 
-// The CookiePolicy class implements third-party cookie blocking.
-class CookiePolicy {
+// The StaticCookiePolicy class implements a static cookie policy that supports
+// three modes: allow all, deny all, or block third-party cookies.
+class StaticCookiePolicy : public CookiePolicy {
  public:
   // Consult the user's third-party cookie blocking preferences to determine
   // whether the URL's cookies can be read.
@@ -28,14 +30,6 @@
     BLOCK_ALL_COOKIES           // Disable cookies.
   };
 
-  static bool ValidType(int32 type) {
-    return type >= ALLOW_ALL_COOKIES && type <= BLOCK_ALL_COOKIES;
-  }
-
-  static Type FromInt(int32 type) {
-    return static_cast<Type>(type);
-  }
-
   // Sets the current policy to enforce. This should be called when the user's
   // preferences change.
   void set_type(Type type) { type_ = type; }
@@ -44,14 +38,20 @@
     return type_;
   }
 
-  CookiePolicy();
+  StaticCookiePolicy()
+      : type_(StaticCookiePolicy::ALLOW_ALL_COOKIES) {
+  }
 
+  explicit StaticCookiePolicy(Type type)
+      : type_(type) {
+  }
+
  private:
   Type type_;
 
-  DISALLOW_COPY_AND_ASSIGN(CookiePolicy);
+  DISALLOW_COPY_AND_ASSIGN(StaticCookiePolicy);
 };
 
 }  // namespace net
 
-#endif // NET_BASE_COOKIE_POLICY_H_
+#endif  // NET_BASE_STATIC_COOKIE_POLICY_H_