Remove the last traces of experimental support for MAC cookies

Support for MAC cookies was mostly removed in r126928.
However, changes to the cookie store were not fully
reverted, and new callsites were introduced due to the
interface changes. This fully removes the interfaces
introduced for MAC cookies, including the
CookieMonster::CookieInfo class.

BUG=none
TBR=willchan

Review URL: https://chromiumcodereview.appspot.com/12326056

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

1 files changed, 10 insertions, 17 deletions

diff --git a/chrome/browser/extensions/api/cookies/cookies_unittest.cc b/chrome/browser/extensions/api/cookies/cookies_unittest.cc
index b9e6ad5..f1bd93d 100644
--- a/chrome/browser/extensions/api/cookies/cookies_unittest.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_unittest.cc
@@ -113,7 +113,6 @@ TEST_F(ExtensionCookiesTest, StoreIdProfileConversion) {
 TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) {
   net::CanonicalCookie canonical_cookie1(
       GURL(), "ABC", "DEF", "www.foobar.com", "/",
-      std::string(), std::string(),
       base::Time(), base::Time(), base::Time(),
       false, false);
   scoped_ptr<Cookie> cookie1(
@@ -131,9 +130,8 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) {
   EXPECT_EQ("some cookie store", cookie1->store_id);
 
   net::CanonicalCookie canonical_cookie2(
-      GURL(), "ABC", "DEF", ".foobar.com", "/", std::string(), std::string(),
-      base::Time(), base::Time::FromDoubleT(10000), base::Time(),
-      false, false);
+      GURL(), "ABC", "DEF", ".foobar.com", "/", base::Time(),
+      base::Time::FromDoubleT(10000), base::Time(), false, false);
   scoped_ptr<Cookie> cookie2(
       cookies_helpers::CreateCookie(
           canonical_cookie2, "some cookie store"));
@@ -153,19 +151,15 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) {
 
 TEST_F(ExtensionCookiesTest, GetURLFromCanonicalCookie) {
   net::CanonicalCookie cookie1(
-      GURL(), "ABC", "DEF", "www.foobar.com", "/",
-      std::string(), std::string(),
-      base::Time(), base::Time(), base::Time(),
-      false, false);
+      GURL(), "ABC", "DEF", "www.foobar.com", "/", base::Time(), base::Time(),
+      base::Time(), false, false);
   EXPECT_EQ("http://www.foobar.com/",
             cookies_helpers::GetURLFromCanonicalCookie(
                 cookie1).spec());
 
   net::CanonicalCookie cookie2(
-      GURL(), "ABC", "DEF", ".helloworld.com", "/",
-      std::string(), std::string(),
-      base::Time(), base::Time(), base::Time(),
-      true, false);
+      GURL(), "ABC", "DEF", ".helloworld.com", "/", base::Time(), base::Time(),
+      base::Time(), true, false);
   EXPECT_EQ("https://helloworld.com/",
             cookies_helpers::GetURLFromCanonicalCookie(
                 cookie2).spec());
@@ -201,17 +195,16 @@ TEST_F(ExtensionCookiesTest, DomainMatching) {
     scoped_ptr<GetAll::Params> params(GetAll::Params::Create(args));
 
     cookies_helpers::MatchFilter filter(&params->details);
-    net::CanonicalCookie cookie(GURL(), "", "", tests[i].domain,
-                                               "", "", "", base::Time(),
-                                               base::Time(), base::Time(),
-                                               false, false);
+    net::CanonicalCookie cookie(GURL(), "", "", tests[i].domain,"",
+                                base::Time(), base::Time(), base::Time(),
+                                false, false);
     EXPECT_EQ(tests[i].matches, filter.MatchesCookie(cookie));
   }
 }
 
 TEST_F(ExtensionCookiesTest, DecodeUTF8WithErrorHandling) {
   net::CanonicalCookie canonical_cookie(
-      GURL(), "", "011Q255bNX_1!yd\203e+", "test.com", "/path\203", "", "",
+      GURL(), "", "011Q255bNX_1!yd\203e+", "test.com", "/path\203",
       base::Time(), base::Time(), base::Time(), false, false);
   scoped_ptr<Cookie> cookie(
       cookies_helpers::CreateCookie(