Changes to support new cookie policy....

net/base/static_cookie_policy_unittest.cc

Index: net/base/static_cookie_policy_unittest.cc
===================================================================
--- net/base/static_cookie_policy_unittest.cc	(revision 37557)
+++ net/base/static_cookie_policy_unittest.cc	(working copy)
@@ -1,14 +1,14 @@
-// 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.
 
-#include "net/base/cookie_policy.h"
+#include "net/base/static_cookie_policy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "googleurl/src/gurl.h"
 
-class CookiePolicyTest : public testing::Test {
+class StaticCookiePolicyTest : public testing::Test {
  public:
-  CookiePolicyTest()
+  StaticCookiePolicyTest()
       : url_google_("http://www.google.izzle"),
         url_google_secure_("https://www.google.izzle"),
         url_google_mail_("http://mail.google.izzle"),
@@ -20,8 +20,8 @@
   GURL url_google_analytics_;
 };
 
-TEST_F(CookiePolicyTest, DefaultPolicyTest) {
-  net::CookiePolicy cp;
+TEST_F(StaticCookiePolicyTest, DefaultPolicyTest) {
+  net::StaticCookiePolicy cp;
   EXPECT_TRUE(cp.CanGetCookies(url_google_, url_google_));
   EXPECT_TRUE(cp.CanGetCookies(url_google_, url_google_secure_));
   EXPECT_TRUE(cp.CanGetCookies(url_google_, url_google_mail_));
@@ -35,9 +35,9 @@
   EXPECT_TRUE(cp.CanSetCookie(url_google_, GURL()));
 }
 
-TEST_F(CookiePolicyTest, AllowAllCookiesTest) {
-  net::CookiePolicy cp;
-  cp.set_type(net::CookiePolicy::ALLOW_ALL_COOKIES);
+TEST_F(StaticCookiePolicyTest, AllowAllCookiesTest) {
+  net::StaticCookiePolicy cp;
+  cp.set_type(net::StaticCookiePolicy::ALLOW_ALL_COOKIES);
 
   EXPECT_TRUE(cp.CanGetCookies(url_google_, url_google_));
   EXPECT_TRUE(cp.CanGetCookies(url_google_, url_google_secure_));
@@ -52,9 +52,9 @@
   EXPECT_TRUE(cp.CanSetCookie(url_google_, GURL()));
 }
 
-TEST_F(CookiePolicyTest, BlockThirdPartyCookiesTest) {
-  net::CookiePolicy cp;
-  cp.set_type(net::CookiePolicy::BLOCK_THIRD_PARTY_COOKIES);
+TEST_F(StaticCookiePolicyTest, BlockThirdPartyCookiesTest) {
+  net::StaticCookiePolicy cp;
+  cp.set_type(net::StaticCookiePolicy::BLOCK_THIRD_PARTY_COOKIES);
 
   EXPECT_TRUE(cp.CanGetCookies(url_google_, url_google_));
   EXPECT_TRUE(cp.CanGetCookies(url_google_, url_google_secure_));
@@ -69,9 +69,9 @@
   EXPECT_TRUE(cp.CanSetCookie(url_google_, GURL()));
 }
 
-TEST_F(CookiePolicyTest, BlockAllCookiesTest) {
-  net::CookiePolicy cp;
-  cp.set_type(net::CookiePolicy::BLOCK_ALL_COOKIES);
+TEST_F(StaticCookiePolicyTest, BlockAllCookiesTest) {
+  net::StaticCookiePolicy cp;
+  cp.set_type(net::StaticCookiePolicy::BLOCK_ALL_COOKIES);
 
   EXPECT_FALSE(cp.CanGetCookies(url_google_, url_google_));
   EXPECT_FALSE(cp.CanGetCookies(url_google_, url_google_secure_));