Revert 110099 - Creation of cookie_utils.

chrome/browser/extensions/extension_cookies_helpers.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.
 
 // Implements common functionality for the Chrome Extensions Cookies API.
 
 #include "chrome/browser/extensions/extension_cookies_helpers.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_cookies_api_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/cookie_utils.h"
 
 namespace keys = extension_cookies_api_constants;
 
 namespace extension_cookies_helpers {
 
 static const char kOriginalProfileStoreId[] = "0";
 static const char kOffTheRecordProfileStoreId[] = "1";
 
 Profile* ChooseProfileFromStoreId(const std::string& store_id,
                                   Profile* profile,
@@ skipping 20 matching lines @@
     const std::string& store_id) {
   DictionaryValue* result = new DictionaryValue();
 
   // A cookie is a raw byte sequence. By explicitly parsing it as UTF8, we
   // apply error correction, so the string can be safely passed to the
   // renderer.
   result->SetString(keys::kNameKey, UTF8ToUTF16(cookie.Name()));
   result->SetString(keys::kValueKey, UTF8ToUTF16(cookie.Value()));
   result->SetString(keys::kDomainKey, cookie.Domain());
   result->SetBoolean(keys::kHostOnlyKey,
-                     net::cookie_utils::DomainIsHostOnly(cookie.Domain()));
+                     net::CookieMonster::DomainIsHostOnly(cookie.Domain()));
 
   // A non-UTF8 path is invalid, so we just replace it with an empty string.
   result->SetString(keys::kPathKey,
                     IsStringUTF8(cookie.Path()) ? cookie.Path() : "");
   result->SetBoolean(keys::kSecureKey, cookie.IsSecure());
   result->SetBoolean(keys::kHttpOnlyKey, cookie.IsHttpOnly());
   result->SetBoolean(keys::kSessionKey, !cookie.DoesExpire());
   if (cookie.DoesExpire()) {
     result->SetDouble(keys::kExpirationDateKey,
                       cookie.ExpiryDate().ToDoubleT());
@@ skipping 98 matching lines @@
 }
 
 bool MatchFilter::MatchesDomain(const std::string& domain) {
   if (!details_->HasKey(keys::kDomainKey))
     return true;
 
   std::string filter_value;
   if (!details_->GetString(keys::kDomainKey, &filter_value))
     return false;
   // Add a leading '.' character to the filter domain if it doesn't exist.
-  if (net::cookie_utils::DomainIsHostOnly(filter_value))
+  if (net::CookieMonster::DomainIsHostOnly(filter_value))
     filter_value.insert(0, ".");
 
   std::string sub_domain(domain);
   // Strip any leading '.' character from the input cookie domain.
-  if (!net::cookie_utils::DomainIsHostOnly(sub_domain))
+  if (!net::CookieMonster::DomainIsHostOnly(sub_domain))
     sub_domain = sub_domain.substr(1);
 
   // Now check whether the domain argument is a subdomain of the filter domain.
   for (sub_domain.insert(0, ".");
        sub_domain.length() >= filter_value.length();) {
     if (sub_domain == filter_value)
       return true;
     const size_t next_dot = sub_domain.find('.', 1);  // Skip over leading dot.
     sub_domain.erase(0, next_dot);
   }
   return false;
 }
 
 }  // namespace extension_cookies_helpers