[Prerender] Cleanup prerender_util

chrome/browser/prerender/prerender_histograms.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/prerender/prerender_histograms.h"
 
 #include <string>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/prerender/prerender_manager.h"
-#include "chrome/browser/prerender/prerender_util.h"
+#include "components/google/core/browser/google_util.h"
 #include "net/http/http_cache.h"
 
 namespace prerender {
 
 namespace {
 
 // This enum is used to define the buckets for the
 // "Prerender.NoStatePrefetchResourceCount" histogram family.
 // Hence, existing enumerated constants should never be deleted or reordered,
 // and new constants should only be appended at the end of the enumeration.
@@ skipping 232 matching lines @@
 // FirstAfterMissNonOverlapping but NOT FirstAfterMiss
 
 void PrerenderHistograms::RecordPerceivedPageLoadTime(
     Origin origin,
     base::TimeDelta perceived_page_load_time,
     NavigationType navigation_type,
     const GURL& url) {
   if (!url.SchemeIsHTTPOrHTTPS())
     return;
   bool within_window = WithinWindow();
-  bool is_google_url = IsGoogleDomain(url);
+  bool is_google_url =
+      google_util::IsGoogleDomainUrl(url, google_util::DISALLOW_SUBDOMAIN,
+                                     google_util::ALLOW_NON_STANDARD_PORTS);
   RECORD_PLT("PerceivedPLT", perceived_page_load_time);
   if (within_window)
     RECORD_PLT("PerceivedPLTWindowed", perceived_page_load_time);
   if (navigation_type != NAVIGATION_TYPE_NORMAL) {
     DCHECK(navigation_type == NAVIGATION_TYPE_PRERENDERED);
     seen_any_pageload_ = true;
     seen_pageload_started_after_prerender_ = true;
   } else if (within_window) {
     if (!is_google_url) {
       bool recorded_any = false;
@@ skipping 35 matching lines @@
           FirstContentfulPaintHiddenName(was_hidden),
       successful);
 }
 
 void PrerenderHistograms::RecordPageLoadTimeNotSwappedIn(
     Origin origin,
     base::TimeDelta page_load_time,
     const GURL& url) const {
   // If the URL to be prerendered is not a http[s] URL, or is a Google URL,
   // do not record.
-  if (!url.SchemeIsHTTPOrHTTPS() || IsGoogleDomain(url))
+  if (!url.SchemeIsHTTPOrHTTPS() ||
+      google_util::IsGoogleDomainUrl(url, google_util::DISALLOW_SUBDOMAIN,
+                                     google_util::ALLOW_NON_STANDARD_PORTS)) {
     return;
+  }
   RECORD_PLT("PrerenderNotSwappedInPLT", page_load_time);
 }
 
 void PrerenderHistograms::RecordPercentLoadDoneAtSwapin(Origin origin,
                                                         double fraction) const {
   if (fraction < 0.0 || fraction > 1.0)
     return;
   int percentage = static_cast<int>(fraction * 100);
   if (percentage < 0 || percentage > 100)
     return;
@@ skipping 155 matching lines @@
                       base::TimeDelta::FromMinutes(2), time, 50);
 }
 
 bool PrerenderHistograms::IsOriginWash() const {
   if (!WithinWindow())
     return false;
   return origin_wash_;
 }
 
 }  // namespace prerender