Add support for split Public Suffix List distinctions.

chrome/browser/browsing_data/cookies_tree_model.cc

 // 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.
 
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
@@ skipping 58 matching lines @@
   // string comparison works to order hosts by registry controlled domain
   // first. Leading dots are ignored, ".google.com" is the same as
   // "google.com".
 
   if (url.SchemeIsFile()) {
     return std::string(chrome::kFileScheme) +
            content::kStandardSchemeSeparator;
   }
 
   std::string host = url.host();
-  std::string retval = net::RegistryControlledDomainService::
-      GetDomainAndRegistry(host);
+  std::string retval =
+      net::registry_controlled_domains::GetDomainAndRegistry(
+          host,
+          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
   if (!retval.length())  // Is an IP address or other special origin.
     return host;
 
   std::string::size_type position = host.rfind(retval);
 
   // The host may be the registry controlled domain, in which case fail fast.
   if (position == 0 || position == std::string::npos)
     return host;
 
   // If host is www.google.com, retval will contain google.com at this point.
@@ skipping 1235 matching lines @@
 
 void CookiesTreeModel::NotifyObserverEndBatch() {
   // Only notify the observers if this is the outermost call to EndBatch() if
   // called in a nested manner.
   if (--batch_update_ == 0) {
     FOR_EACH_OBSERVER(Observer,
                       cookies_observer_list_,
                       TreeModelEndBatch(this));
   }
 }