PlzNavigate support in data use ascriber

chrome/browser/data_use_measurement/chrome_data_use_ascriber_unittest.cc

Index: chrome/browser/data_use_measurement/chrome_data_use_ascriber_unittest.cc
diff --git a/chrome/browser/data_use_measurement/chrome_data_use_ascriber_unittest.cc b/chrome/browser/data_use_measurement/chrome_data_use_ascriber_unittest.cc
index 00be665487ef0947d00d2f479daf1b7323f64193..612a34da747f848f6c47b56d4470bea036086fdb 100644
--- a/chrome/browser/data_use_measurement/chrome_data_use_ascriber_unittest.cc
+++ b/chrome/browser/data_use_measurement/chrome_data_use_ascriber_unittest.cc
@@ -92,32 +92,28 @@ class ChromeDataUseAscriberTest : public testing::Test {
 };
 
 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);
 
@@ -141,9 +137,6 @@ TEST_F(ChromeDataUseAscriberTest, RenderFrameShownAndHidden) {
 }
 
 TEST_F(ChromeDataUseAscriberTest, RenderFrameHiddenAndShown) {
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
   std::unique_ptr<net::URLRequest> request = CreateNewRequest(
       "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
 
@@ -167,9 +160,6 @@ TEST_F(ChromeDataUseAscriberTest, RenderFrameHiddenAndShown) {
 }
 
 TEST_F(ChromeDataUseAscriberTest, RenderFrameHostChanged) {
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
   std::unique_ptr<net::URLRequest> request = CreateNewRequest(
       "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
 
@@ -197,9 +187,6 @@ TEST_F(ChromeDataUseAscriberTest, RenderFrameHostChanged) {
 }
 
 TEST_F(ChromeDataUseAscriberTest, MainFrameNavigation) {
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
   std::unique_ptr<net::URLRequest> request = CreateNewRequest(
       "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
 
@@ -241,9 +228,6 @@ TEST_F(ChromeDataUseAscriberTest, MainFrameNavigation) {
 }
 
 TEST_F(ChromeDataUseAscriberTest, FailedMainFrameNavigation) {
-  if (content::IsBrowserSideNavigationEnabled())
-    return;
-
   std::unique_ptr<net::URLRequest> request = CreateNewRequest(
       "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);