Eliminate wstring from base/utf_offset_string_conversions.h, net/base/escape.h, and net/base/net_...

net/base/registry_controlled_domain.cc

 //* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 24 matching lines @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "net/base/registry_controlled_domain.h"
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_parse.h"
 #include "net/base/net_module.h"
 #include "net/base/net_util.h"
 
 #include "effective_tld_names.cc"
 
 namespace net {
 
 namespace {
@@ skipping 20 matching lines @@
 std::string RegistryControlledDomainService::GetDomainAndRegistry(
     const std::string& host) {
   url_canon::CanonHostInfo host_info;
   const std::string canon_host(CanonicalizeHost(host, &host_info));
   if (canon_host.empty() || host_info.IsIPAddress())
     return std::string();
   return GetDomainAndRegistryImpl(canon_host);
 }
 
 // static
-std::string RegistryControlledDomainService::GetDomainAndRegistry(
-    const std::wstring& host) {
-  url_canon::CanonHostInfo host_info;
-  const std::string canon_host(CanonicalizeHost(host, &host_info));
-  if (canon_host.empty() || host_info.IsIPAddress())
-    return std::string();
-  return GetDomainAndRegistryImpl(canon_host);
-}
-
-// static
 bool RegistryControlledDomainService::SameDomainOrHost(const GURL& gurl1,
                                                        const GURL& gurl2) {
   // See if both URLs have a known domain + registry, and those values are the
   // same.
   const std::string domain1(GetDomainAndRegistry(gurl1));
   const std::string domain2(GetDomainAndRegistry(gurl2));
   if (!domain1.empty() || !domain2.empty())
     return domain1 == domain2;
 
   // No domains.  See if the hosts are identical.
@@ skipping 31 matching lines @@
   const std::string canon_host(CanonicalizeHost(host, &host_info));
   if (canon_host.empty())
     return std::string::npos;
   if (host_info.IsIPAddress())
     return 0;
   return GetInstance()->GetRegistryLengthImpl(canon_host,
                                               allow_unknown_registries);
 }
 
 // static
-size_t RegistryControlledDomainService::GetRegistryLength(
-    const std::wstring& host,
-    bool allow_unknown_registries) {
-  url_canon::CanonHostInfo host_info;
-  const std::string canon_host(CanonicalizeHost(host, &host_info));
-  if (canon_host.empty())
-    return std::string::npos;
-  if (host_info.IsIPAddress())
-    return 0;
-  return GetInstance()->GetRegistryLengthImpl(canon_host,
-                                              allow_unknown_registries);
-}
-
-// static
 RegistryControlledDomainService* RegistryControlledDomainService::GetInstance()
 {
   if (test_instance_)
     return test_instance_;
 
   return Singleton<RegistryControlledDomainService>::get();
 }
 
 RegistryControlledDomainService::RegistryControlledDomainService()
     : find_domain_function_(Perfect_Hash::FindDomain) {
@@ skipping 115 matching lines @@
     next_dot = host.find('.', curr_start);
   }
 
   // No rule found in the registry.  curr_start now points to the first
   // character of the last subcomponent of the host, so if we allow unknown
   // registries, return the length of this subcomponent.
   return allow_unknown_registries ? (host.length() - curr_start) : 0;
 }
 
 }  // namespace net