PlzNavigate support in data use ascriber

chrome/browser/data_use_measurement/chrome_data_use_ascriber_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/data_use_measurement/chrome_data_use_ascriber.h"
 
 #include <list>
 #include <memory>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 59 matching lines @@
   }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   ChromeDataUseAscriber ascriber_;
   net::TestURLRequestContext context_;
   std::unique_ptr<content::MockResourceContext> resource_context_;
 };
 
 TEST_F(ChromeDataUseAscriberTest, NoRecorderWithoutFrame) {
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
   std::unique_ptr<net::URLRequest> request = CreateNewRequest(
       "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
 
-  // Main frame request should not cause a recorder to be created, since the
-  // frame does not exist.
+  // Main frame request causes a recorder to be created.
   ascriber()->OnBeforeUrlRequest(request.get());
-  EXPECT_EQ(0u, recorders().size());
+  EXPECT_EQ(1u, recorders().size());
 
   // Frame is created.
   ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1);
-  EXPECT_EQ(1u, recorders().size());
+  EXPECT_EQ(2u, recorders().size());
 
-  // Request should cause a recorder to be created.
+  // Same mainframe request should not cause another recorder to be created.
   ascriber()->OnBeforeUrlRequest(request.get());
   EXPECT_EQ(2u, recorders().size());
 
   ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1);
+  ascriber()->OnUrlRequestDestroyed(request.get());
+
+  EXPECT_EQ(1u, recorders().size());
 }
 
 TEST_F(ChromeDataUseAscriberTest, RenderFrameShownAndHidden) {
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
   std::unique_ptr<net::URLRequest> request = CreateNewRequest(
       "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
 
   ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1);
   ascriber()->OnBeforeUrlRequest(request.get());
   ascriber()->ReadyToCommitMainFrameNavigation(
       GURL("http://test.com"), content::GlobalRequestID(kRenderProcessId, 0),
       kRenderProcessId, kRenderFrameId, true, (void*)request.get());
   ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true);
 
   EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible());
 
   // Hide the frame, and the visibility should be updated.
   ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, false);
   EXPECT_FALSE(ascriber()->GetDataUseRecorder(*request)->is_visible());
 
   ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1);
 }
 
 TEST_F(ChromeDataUseAscriberTest, RenderFrameHiddenAndShown) {
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
   std::unique_ptr<net::URLRequest> request = CreateNewRequest(
       "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
 
   ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1);
   ascriber()->OnBeforeUrlRequest(request.get());
   ascriber()->ReadyToCommitMainFrameNavigation(
       GURL("http://test.com"), content::GlobalRequestID(kRenderProcessId, 0),
       kRenderProcessId, kRenderFrameId, true, (void*)request.get());
   ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, false);
 
   EXPECT_FALSE(ascriber()->GetDataUseRecorder(*request)->is_visible());
 
   // Show the frame, and the visibility should be updated.
   ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true);
   EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible());
 
   ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1);
 }
 
 TEST_F(ChromeDataUseAscriberTest, RenderFrameHostChanged) {
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
   std::unique_ptr<net::URLRequest> request = CreateNewRequest(
       "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
 
   ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1);
   ascriber()->OnBeforeUrlRequest(request.get());
   ascriber()->ReadyToCommitMainFrameNavigation(
       GURL("http://test.com"), content::GlobalRequestID(kRenderProcessId, 0),
       kRenderProcessId, kRenderFrameId, true, (void*)request.get());
   ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true);
   EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible());
 
   // Create a new render frame and swap it.
   ascriber()->RenderFrameCreated(kRenderProcessId + 1, kRenderFrameId + 1, -1,
                                  -1);
   ascriber()->RenderFrameHostChanged(kRenderProcessId, kRenderFrameId,
                                      kRenderProcessId + 1, kRenderFrameId + 1);
   ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1);
 
   ascriber()->WasShownOrHidden(kRenderProcessId + 1, kRenderFrameId + 1, true);
   ascriber()->RenderFrameDeleted(kRenderProcessId + 1, kRenderFrameId + 1, -1,
                                  -1);
 }
 
 TEST_F(ChromeDataUseAscriberTest, MainFrameNavigation) {
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
   std::unique_ptr<net::URLRequest> request = CreateNewRequest(
       "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
 
   // Mainframe is created.
   ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1);
   EXPECT_EQ(1u, recorders().size());
 
   // Request should cause a recorder to be created.
   ascriber()->OnBeforeUrlRequest(request.get());
   EXPECT_EQ(2u, recorders().size());
@@ skipping 19 matching lines @@
   EXPECT_EQ(DataUse::TrafficType::USER_TRAFFIC,
             recorder_entry.data_use().traffic_type());
 
   ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1);
   ascriber()->OnUrlRequestDestroyed(request.get());
 
   EXPECT_EQ(0u, recorders().size());
 }
 
 TEST_F(ChromeDataUseAscriberTest, FailedMainFrameNavigation) {
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
   std::unique_ptr<net::URLRequest> request = CreateNewRequest(
       "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
 
   // Mainframe is created.
   ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1);
   EXPECT_EQ(1u, recorders().size());
 
   // Request should cause a recorder to be created.
   ascriber()->OnBeforeUrlRequest(request.get());
   EXPECT_EQ(2u, recorders().size());
 
   // Failed request will remove the pending entry.
   request->Cancel();
   ascriber()->OnUrlRequestCompleted(*request, false);
 
   ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1);
   ascriber()->OnUrlRequestDestroyed(request.get());
 
   EXPECT_EQ(0u, recorders().size());
 }
 
 }  // namespace data_use_measurement