Tab.NewTabOnload histogram: Remove .LocalGoogle vs .LocalOther split

This essentially reverts crrev.com/2897523004. The split introduced
there doesn't work: The "Google vs. non-Google" check is based on the
URL, but the local NTP URL is always the same.

Bug: 583292
Change-Id: Ia7854a0c694c11d86ebaa853849a29e04dd81dde
Reviewed-on: https://chromium-review.googlesource.com/527794Reviewed-by: Chris Pickel <sfiera@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#478632}

chrome/browser/ui/search/search_tab_helper.cc

@@ -93,22 +93,17 @@ void RecordNewTabLoadTime(content::WebContents* contents) {
 
   base::TimeDelta duration =
       base::TimeTicks::Now() - core_tab_helper->new_tab_start_time();
-  bool is_google = google_util::IsGoogleDomainUrl(
-      contents->GetController().GetLastCommittedEntry()->GetURL(),
-      google_util::ALLOW_SUBDOMAIN, google_util::DISALLOW_NON_STANDARD_PORTS);
   if (IsCacheableNTP(contents)) {
-    if (is_google) {
+    if (google_util::IsGoogleDomainUrl(
+            contents->GetController().GetLastCommittedEntry()->GetURL(),
+            google_util::ALLOW_SUBDOMAIN,
+            google_util::DISALLOW_NON_STANDARD_PORTS)) {
       UMA_HISTOGRAM_TIMES("Tab.NewTabOnload.Google", duration);
     } else {
       UMA_HISTOGRAM_TIMES("Tab.NewTabOnload.Other", duration);
     }
   } else {
     UMA_HISTOGRAM_TIMES("Tab.NewTabOnload.Local", duration);
-    if (is_google) {
-      UMA_HISTOGRAM_TIMES("Tab.NewTabOnload.LocalGoogle", duration);
-    } else {
-      UMA_HISTOGRAM_TIMES("Tab.NewTabOnload.LocalOther", duration);
-    }
   }
   core_tab_helper->set_new_tab_start_time(base::TimeTicks());
 }

tools/metrics/histograms/histograms.xml

@@ -76339,10 +76339,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <owner>treib@chromium.org</owner>
   <summary>
     The time for the new tab page to fire the &quot;load&quot; event. Note: This
-    is usually recorded with a suffix (.Local*/Google/Other). The base version
-    is recorded only on Android, as well as for the old NTP (&quot;NTP4&quot;)
-    on other platforms. Recorded only once per tab, i.e. excluding back/forward
-    navigations.
+    is usually recorded with a suffix (.Local/Google/Other). The base version
+    is recorded only on Android. Recorded only once per tab, i.e. excluding
+    back/forward navigations.
   </summary>
 </histogram>
 
@@ -95173,9 +95172,17 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram_suffixes name="TabNewTabOnload" separator=".">
   <suffix name="Local" label="Local New Tab page."/>
-  <suffix name="LocalGoogle" label="Local New Tab page for Google."/>
+  <suffix name="LocalGoogle" label="Local New Tab page for Google.">
+    <obsolete>
+      Removed 06/2017, never worked correctly.
+    </obsolete>
+  </suffix>
   <suffix name="LocalOther"
-      label="Local New Tab page for a non-Google provider."/>
+      label="Local New Tab page for a non-Google provider.">
+    <obsolete>
+      Removed 06/2017, never worked correctly.
+    </obsolete>
+  </suffix>
   <suffix name="Google" label="New Tab page for Google."/>
   <suffix name="Other" label="New Tab page for a non-Google provider."/>
   <affected-histogram name="Tab.NewTabOnload"/>