Fixing reporting of AMP page load information

chrome/browser/page_load_metrics/observers/amp_page_load_metrics_observer_unittest.cc

 // Copyright 2016 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/page_load_metrics/observers/amp_page_load_metrics_observer.h"
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/optional.h"
@@ skipping 23 matching lines @@
     NavigateAndCommit(url);
     SimulateTimingUpdate(timing_);
 
     // Navigate again to force OnComplete, which happens when a new navigation
     // occurs.
     NavigateAndCommit(GURL("http://otherurl.com"));
   }
 
   void ValidateHistograms(bool expect_histograms) {
     ValidateHistogramsFor(
-        "PageLoad.Clients.AMPCache.DocumentTiming."
+        "PageLoad.Clients.AMPCache2.DocumentTiming."
         "NavigationToDOMContentLoadedEventFired",
         timing_.dom_content_loaded_event_start, expect_histograms);
     ValidateHistogramsFor(
-        "PageLoad.Clients.AMPCache.DocumentTiming.NavigationToFirstLayout",
+        "PageLoad.Clients.AMPCache2.DocumentTiming.NavigationToFirstLayout",
         timing_.first_layout, expect_histograms);
     ValidateHistogramsFor(
-        "PageLoad.Clients.AMPCache.DocumentTiming.NavigationToLoadEventFired",
+        "PageLoad.Clients.AMPCache2.DocumentTiming."
+        "NavigationToLoadEventFired",
         timing_.load_event_start, expect_histograms);
     ValidateHistogramsFor(
-        "PageLoad.Clients.AMPCache.PaintTiming."
+        "PageLoad.Clients.AMPCache2.PaintTiming."
         "NavigationToFirstContentfulPaint",
         timing_.first_contentful_paint, expect_histograms);
     ValidateHistogramsFor(
-        "PageLoad.Clients.AMPCache.ParseTiming.NavigationToParseStart",
+        "PageLoad.Clients.AMPCache2.ParseTiming.NavigationToParseStart",
         timing_.parse_start, expect_histograms);
   }
 
   void ValidateHistogramsFor(const std::string& histogram_,
                              const base::Optional<base::TimeDelta>& event,
                              bool expect_histograms) {
     histogram_tester().ExpectTotalCount(histogram_, expect_histograms ? 1 : 0);
     if (!expect_histograms)
       return;
     histogram_tester().ExpectUniqueSample(
@@ skipping 23 matching lines @@
   ResetTest();
   RunTest(GURL("https://www.google.com/amp/page"));
   ValidateHistograms(true);
 }
 
 TEST_F(AMPPageLoadMetricsObserverTest, NonAMPPage) {
   ResetTest();
   RunTest(GURL("https://www.google.com/not-amp/page"));
   ValidateHistograms(false);
 }