Add support for split Public Suffix List distinctions.

chrome/browser/ui/toolbar/back_forward_menu_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 "build/build_config.h"
 
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 352 matching lines @@
     }
   }
 
   NavigationEntry* start_entry = controller.GetEntryAtIndex(start_from);
   const GURL& url = start_entry->GetURL();
 
   if (!forward) {
     // When going backwards we return the first entry we find that has a
     // different domain.
     for (int i = start_from - 1; i >= 0; --i) {
-      if (!net::RegistryControlledDomainService::SameDomainOrHost(url,
-              controller.GetEntryAtIndex(i)->GetURL()))
+      if (!net::registry_controlled_domains::SameDomainOrHost(url,
+              controller.GetEntryAtIndex(i)->GetURL(),
+              net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES))
         return i;
     }
     // We have reached the beginning without finding a chapter stop.
     return -1;
   } else {
     // When going forwards we return the entry before the entry that has a
     // different domain.
     for (int i = start_from + 1; i < max_count; ++i) {
-      if (!net::RegistryControlledDomainService::SameDomainOrHost(url,
-              controller.GetEntryAtIndex(i)->GetURL()))
+      if (!net::registry_controlled_domains::SameDomainOrHost(url,
+              controller.GetEntryAtIndex(i)->GetURL(),
+              net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES))
         return i - 1;
     }
     // Last entry is always considered a chapter stop.
     return max_count - 1;
   }
 }
 
 int BackForwardMenuModel::FindChapterStop(int offset,
                                           bool forward,
                                           int skip) const {
@@ skipping 79 matching lines @@
     metric_string += "ForwardMenu_";
   else
     metric_string += "BackMenu_";
   metric_string += action;
   if (index != -1) {
     // +1 is for historical reasons (indices used to start at 1).
     metric_string += base::IntToString(index + 1);
   }
   return metric_string;
 }