Revert 110099 - Creation of cookie_utils.

net/base/cookie_monster_unittest.cc

 // Copyright (c) 2011 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 <time.h>
 
 #include <algorithm>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_monster_store_test.h"  // For CookieStore mock
-#include "net/base/cookie_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 using base::Time;
 using base::TimeDelta;
 using base::Thread;
 
 namespace {
@@ skipping 1811 matching lines @@
 
 TEST_F(CookieMonsterTest, TestDomainIsHostOnly) {
   const DomainIsHostOnlyCase tests[] = {
     { "",               true },
     { "www.google.com", true },
     { ".google.com",    false }
   };
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     EXPECT_EQ(tests[i].is_host_only,
-              cookie_utils::DomainIsHostOnly(tests[i].str));
+              CookieMonster::DomainIsHostOnly(tests[i].str));
   }
 }
 
 TEST_F(CookieMonsterTest, TestCookieDeletion) {
   scoped_refptr<MockPersistentCookieStore> store(
       new MockPersistentCookieStore);
   scoped_refptr<CookieMonster> cm(new CookieMonster(store, NULL));
 
   // Create a session cookie.
   EXPECT_TRUE(SetCookie(cm, url_google_, kValidCookieLine));
@@ skipping 1697 matching lines @@
 
   // Get cookies after the cookie has expired.
   cookies.clear();
   cm->FindCookiesForKey(cm->GetKey(url_google_.host()), url_google_,
                         CookieOptions(), current + TimeDelta::FromSeconds(20),
                         false, &cookies);
   EXPECT_EQ(0U, cookies.size());
 }
 
 }  // namespace net