Fix cookie test that's been broken for a couple of years.

net/cookies/cookie_store_unittest.h

 // Copyright (c) 2012 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_COOKIES_COOKIE_STORE_UNITTEST_H_
 #define NET_COOKIES_COOKIE_STORE_UNITTEST_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 569 matching lines @@
       this->GetCookies(
           cs, GURL(this->http_www_google_.Format("http://bla.www.%D"))));
   this->MatchCookieLines("A=B; C=D; E=F; G=H",
                          this->GetCookies(cs, this->http_www_google_.url()));
 }
 
 // FireFox recognizes domains containing trailing periods as valid.
 // IE and Safari do not. Assert the expected policy here.
 TYPED_TEST_P(CookieStoreTest, DomainWithTrailingDotTest) {
   CookieStore* cs = this->GetCookieStore();
-  EXPECT_FALSE(this->SetCookie(cs, this->http_www_google_.url(),
-                               "a=1; domain=.www.google.com."));
-  EXPECT_FALSE(this->SetCookie(cs, this->http_www_google_.url(),
-                               "b=2; domain=.www.google.com.."));
-  this->MatchCookieLines(std::string(),
-                         this->GetCookies(cs, this->http_www_google_.url()));
+  if (TypeParam::preserves_trailing_dots) {
+    EXPECT_FALSE(this->SetCookie(cs, this->http_www_google_.url(),
+                                 "a=1; domain=.www.google.izzle."));
+    EXPECT_FALSE(this->SetCookie(cs, this->http_www_google_.url(),
+                                 "b=2; domain=.www.google.izzle.."));
+    this->MatchCookieLines(std::string(),
+                           this->GetCookies(cs, this->http_www_google_.url()));
+  } else {
+    EXPECT_TRUE(this->SetCookie(cs, this->http_www_google_.url(),
+                                "a=1; domain=.www.google.izzle."));
+    EXPECT_FALSE(this->SetCookie(cs, this->http_www_google_.url(),
+                                 "b=2; domain=.www.google.izzle.."));
+    this->MatchCookieLines("a=1",
+                           this->GetCookies(cs, this->http_www_google_.url()));
+  }
 }
 
 // Test that cookies can bet set on higher level domains.
 TYPED_TEST_P(CookieStoreTest, ValidSubdomainTest) {
   CookieStore* cs = this->GetCookieStore();
   GURL url_abcd("http://a.b.c.d.com");
   GURL url_bcd("http://b.c.d.com");
   GURL url_cd("http://c.d.com");
   GURL url_d("http://d.com");
 
@@ skipping 879 matching lines @@
                            OverwritePersistentCookie,
                            CookieOrdering,
                            GetAllCookiesAsync,
                            DeleteCookieAsync,
                            DeleteCanonicalCookieAsync,
                            DeleteSessionCookie);
 
 }  // namespace net
 
 #endif  // NET_COOKIES_COOKIE_STORE_UNITTEST_H_