Third-party iframe logging: Separate AboveAndLeft from Above

third_party/WebKit/Source/web/tests/DeferredLoadingTest.cpp

 // 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 "platform/testing/HistogramTester.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/sim/SimCompositor.h"
 #include "web/tests/sim/SimDisplayItemList.h"
 #include "web/tests/sim/SimRequest.h"
 #include "web/tests/sim/SimTest.h"
 
 namespace blink {
 
 static const char* kHistogramName =
-    "Navigation.DeferredDocumentLoading.StatesV2";
+    "Navigation.DeferredDocumentLoading.StatesV3";
 
 class DeferredLoadingTest : public SimTest {
  protected:
   DeferredLoadingTest() { webView().resize(WebSize(640, 480)); }
   void compositeFrame() {
     compositor().beginFrame();
     testing::runPendingTasks();
     if (compositor().needsBeginFrame())
       compositor().beginFrame();  // VisibleNestedInRight doesn't need this.
     ASSERT_FALSE(compositor().needsBeginFrame());
@@ skipping 74 matching lines @@
 TEST_F(DeferredLoadingTest, AboveAndLeft) {
   HistogramTester histogramTester;
   std::unique_ptr<SimRequest> mainResource = createMainResource();
 
   mainResource->complete(
       "<iframe style='position:absolute; left:-10000px; top:-10000px' sandbox>"
       "</iframe>");
 
   compositeFrame();
 
-  // Don't log WouldLoadAbove AND WouldLoadLeft.
   histogramTester.expectBucketCount(kHistogramName, Created, 1);
-  histogramTester.expectBucketCount(kHistogramName, WouldLoadAbove, 1);
+  histogramTester.expectBucketCount(kHistogramName, WouldLoadAboveAndLeft, 1);
   histogramTester.expectTotalCount(kHistogramName, 2);
 }
 
 TEST_F(DeferredLoadingTest, ZeroByZero) {
   HistogramTester histogramTester;
   std::unique_ptr<SimRequest> mainResource = createMainResource();
 
   mainResource->complete(
       "<iframe style='height:0px;width:0px;' sandbox></iframe>");
 
@@ skipping 54 matching lines @@
   SimRequest frameResource("https://example.com/iframe.html", "text/html");
 
   mainResource->complete("<iframe src='iframe.html'></iframe>");
   frameResource.complete("<iframe></iframe>");
   compositeFrame();
 
   histogramTester.expectTotalCount(kHistogramName, 0);
 }
 
 }  // namespace blink