Back out r1154 due to test failures

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

1 files changed, 7 insertions, 13 deletions

diff --git a/net/base/cookie_monster_unittest.cc b/net/base/cookie_monster_unittest.cc
index 47eb90c..9de1464 100644
--- a/net/base/cookie_monster_unittest.cc
+++ b/net/base/cookie_monster_unittest.cc
@@ -495,18 +495,12 @@ TEST(CookieMonsterTest, HttpOnlyTest) {
       url_google, net::CookieMonster::INCLUDE_HTTPONLY), "A=B");
 }
 
-namespace {
-
-struct CookieDateParsingCase {
-  const char* str;
-  const bool valid;
-  const time_t epoch;
-};
-
-}  // namespace
-
 TEST(CookieMonsterTest, TestCookieDateParsing) {
-  const CookieDateParsingCase tests[] = {
+  const struct {
+    const char* str;
+    const bool valid;
+    const time_t epoch;
+  } tests[] = {
     { "Sat, 15-Apr-17 21:01:22 GMT",           true, 1492290082 },
     { "Thu, 19-Apr-2007 16:00:00 GMT",         true, 1176998400 },
     { "Wed, 25 Apr 2007 21:02:13 GMT",         true, 1177534933 },
@@ -578,7 +572,7 @@ TEST(CookieMonsterTest, TestCookieDateParsing) {
   };
 
   Time parsed_time;
-  for (size_t i = 0; i < arraysize(tests); ++i) {
+  for (int i = 0; i < arraysize(tests); ++i) {
     parsed_time = net::CookieMonster::ParseCookieTime(tests[i].str);
     if (!tests[i].valid) {
       EXPECT_FALSE(!parsed_time.is_null()) << tests[i].str;
@@ -789,7 +783,7 @@ TEST(CookieMonsterTest, TestTotalGarbageCollection) {
 
 // Formerly NetUtilTest.CookieTest back when we used wininet's cookie handling.
 TEST(CookieMonsterTest, NetUtilCookieTest) {
-  const GURL test_url("http://mojo.jojo.google.izzle/");
+  const GURL test_url(L"http://mojo.jojo.google.izzle/");
 
   net::CookieMonster cm;