Reland - Notify paint for each frame

chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc

 // Copyright 2015 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 "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/test/histogram_tester.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 172 matching lines @@
   }
 
   std::unique_ptr<base::RunLoop> run_loop_;
 
   TimingFieldBitSet child_frame_expected_fields_;
   TimingFieldBitSet main_frame_expected_fields_;
 
   TimingFieldBitSet observed_main_frame_fields_;
 };
 
-// Due to crbug/705315, paints in subframes are associated with the main frame,
-// unless the subframe is cross-origin and Chrome is running with out of process
-// cross-origin subframes. As a result, some tests wait for different behavior
-// to be observed depending on which mode we are in.  TODO(crbug/705315): remove
-// this method once the bug is addressed.
-static bool AreCrossOriginSubFramesOutOfProcess() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-             switches::kSitePerProcess) ||
-         base::FeatureList::IsEnabled(features::kTopDocumentIsolation);
-}
-
 using TimingField = PageLoadMetricsWaiter::TimingField;
 
 }  // namespace
 
 class PageLoadMetricsBrowserTest : public InProcessBrowserTest {
  public:
   PageLoadMetricsBrowserTest() {}
   ~PageLoadMetricsBrowserTest() override {}
 
  protected:
   // Force navigation to a new page, so the currently tracked page load runs its
   // OnComplete callback. You should prefer to use PageLoadMetricsWaiter, and
   // only use NavigateToUntrackedUrl for cases where the waiter isn't
   // sufficient.
   void NavigateToUntrackedUrl() {
     ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL));
   }
 
-  // TODO(crbug/705315): remove this method once the bug is addressed.
-  void SetUpOnMainThread() override {
-    InProcessBrowserTest::SetUpOnMainThread();
-    host_resolver()->AddRule("a.com", "127.0.0.1");
-    host_resolver()->AddRule("b.com", "127.0.0.1");
-    host_resolver()->AddRule("c.com", "127.0.0.1");
-    content::SetupCrossSiteRedirector(embedded_test_server());
-  }
-
   bool NoPageLoadMetricsRecorded() {
     // Determine whether any 'public' page load metrics are recorded. We exclude
     // 'internal' metrics as these may be recorded for debugging purposes.
     size_t total_pageload_histograms =
         histogram_tester_.GetTotalCountsForPrefix("PageLoad.").size();
     size_t total_internal_histograms =
         histogram_tester_.GetTotalCountsForPrefix("PageLoad.Internal.").size();
     DCHECK_GE(total_pageload_histograms, total_internal_histograms);
     return total_pageload_histograms - total_internal_histograms == 0;
   }
@@ skipping 61 matching lines @@
   histogram_tester_.ExpectTotalCount(internal::kHistogramLoad, 1);
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstPaint, 0);
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstContentfulPaint,
                                      0);
 }
 
 IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest,
                        NoPaintForEmptyDocumentInChildFrame) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
-  // TODO(crbug/705315): remove the a.com domain once the bug is addressed.
-  GURL a_url(embedded_test_server()->GetURL(
-      "a.com", "/page_load_metrics/empty_iframe.html"));
+  GURL a_url(
+      embedded_test_server()->GetURL("/page_load_metrics/empty_iframe.html"));
 
   auto waiter = CreatePageLoadMetricsWaiter();
   waiter->AddMainFrameExpectation(TimingField::FIRST_LAYOUT);
   waiter->AddMainFrameExpectation(TimingField::LOAD_EVENT);
   waiter->AddSubFrameExpectation(TimingField::FIRST_LAYOUT);
   waiter->AddSubFrameExpectation(TimingField::LOAD_EVENT);
   ui_test_utils::NavigateToURL(browser(), a_url);
   waiter->Wait();
   EXPECT_FALSE(waiter->DidObserveInMainFrame(TimingField::FIRST_PAINT));
 
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstLayout, 1);
   histogram_tester_.ExpectTotalCount(internal::kHistogramLoad, 1);
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstPaint, 0);
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstContentfulPaint,
                                      0);
 }
 
 IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PaintInChildFrame) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
-  // TODO(crbug/705315): remove the a.com domain once the bug is addressed.
-  GURL a_url(embedded_test_server()->GetURL("a.com",
-                                            "/page_load_metrics/iframe.html"));
+  GURL a_url(embedded_test_server()->GetURL("/page_load_metrics/iframe.html"));
   auto waiter = CreatePageLoadMetricsWaiter();
   waiter->AddMainFrameExpectation(TimingField::FIRST_LAYOUT);
   waiter->AddMainFrameExpectation(TimingField::LOAD_EVENT);
-  // TODO(crbug/705315): Once the bug is fixed, remove the else case and make
-  // the if case the default behavior.
-  if (AreCrossOriginSubFramesOutOfProcess()) {
-    waiter->AddSubFrameExpectation(TimingField::FIRST_PAINT);
-    waiter->AddSubFrameExpectation(TimingField::FIRST_CONTENTFUL_PAINT);
-  } else {
-    waiter->AddMainFrameExpectation(TimingField::FIRST_PAINT);
-    waiter->AddMainFrameExpectation(TimingField::FIRST_CONTENTFUL_PAINT);
-  }
+  waiter->AddSubFrameExpectation(TimingField::FIRST_PAINT);
+  waiter->AddSubFrameExpectation(TimingField::FIRST_CONTENTFUL_PAINT);
   ui_test_utils::NavigateToURL(browser(), a_url);
   waiter->Wait();
 
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstLayout, 1);
   histogram_tester_.ExpectTotalCount(internal::kHistogramLoad, 1);
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstPaint, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PaintInMultipleChildFrames) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
-  // TODO(crbug/705315): remove the a.com domain once the bug is addressed.
-  GURL a_url(embedded_test_server()->GetURL("a.com",
-                                            "/page_load_metrics/iframes.html"));
+  GURL a_url(embedded_test_server()->GetURL("/page_load_metrics/iframes.html"));
 
   auto waiter = CreatePageLoadMetricsWaiter();
   waiter->AddMainFrameExpectation(TimingField::FIRST_LAYOUT);
   waiter->AddMainFrameExpectation(TimingField::LOAD_EVENT);
-  // TODO(crbug/705315): Once the bug is fixed, remove the else case and make
-  // the if case the default behavior.
-  if (AreCrossOriginSubFramesOutOfProcess()) {
-    waiter->AddSubFrameExpectation(TimingField::FIRST_PAINT);
-    waiter->AddSubFrameExpectation(TimingField::FIRST_CONTENTFUL_PAINT);
-  } else {
-    waiter->AddMainFrameExpectation(TimingField::FIRST_PAINT);
-    waiter->AddMainFrameExpectation(TimingField::FIRST_CONTENTFUL_PAINT);
-  }
+  waiter->AddSubFrameExpectation(TimingField::FIRST_PAINT);
+  waiter->AddSubFrameExpectation(TimingField::FIRST_CONTENTFUL_PAINT);
   ui_test_utils::NavigateToURL(browser(), a_url);
   waiter->Wait();
 
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstLayout, 1);
   histogram_tester_.ExpectTotalCount(internal::kHistogramLoad, 1);
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstPaint, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, PaintInMainAndChildFrame) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
-  // TODO(crbug/705315): remove the a.com domain once the bug is addressed.
   GURL a_url(embedded_test_server()->GetURL(
-      "a.com", "/page_load_metrics/main_frame_with_iframe.html"));
+      "/page_load_metrics/main_frame_with_iframe.html"));
 
   auto waiter = CreatePageLoadMetricsWaiter();
   waiter->AddMainFrameExpectation(TimingField::FIRST_LAYOUT);
   waiter->AddMainFrameExpectation(TimingField::LOAD_EVENT);
   waiter->AddMainFrameExpectation(TimingField::FIRST_PAINT);
   waiter->AddMainFrameExpectation(TimingField::FIRST_CONTENTFUL_PAINT);
-  // TODO(crbug/705315): Once the bug is fixed, make the if case the default
-  // behavior.
-  if (AreCrossOriginSubFramesOutOfProcess()) {
-    waiter->AddSubFrameExpectation(TimingField::FIRST_PAINT);
-    waiter->AddSubFrameExpectation(TimingField::FIRST_CONTENTFUL_PAINT);
-  }
+  waiter->AddSubFrameExpectation(TimingField::FIRST_PAINT);
+  waiter->AddSubFrameExpectation(TimingField::FIRST_CONTENTFUL_PAINT);
   ui_test_utils::NavigateToURL(browser(), a_url);
   waiter->Wait();
 
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstLayout, 1);
   histogram_tester_.ExpectTotalCount(internal::kHistogramLoad, 1);
   histogram_tester_.ExpectTotalCount(internal::kHistogramFirstPaint, 1);
 }
 
 IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, SameDocumentNavigation) {
   ASSERT_TRUE(embedded_test_server()->Start());
@@ skipping 577 matching lines @@
   // Payload histograms are only logged when a page load terminates, so force
   // navigation to another page.
   NavigateToUntrackedUrl();
 
   histogram_tester_.ExpectTotalCount(internal::kHistogramTotalBytes, 1);
 
   // Verify that there is a single sample recorded in the 10kB bucket (the size
   // of the main HTML response).
   histogram_tester_.ExpectBucketCount(internal::kHistogramTotalBytes, 10, 1);
 }