Support for transfer navigations 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"
 #include "base/run_loop.h"
 #include "components/data_use_measurement/core/data_use_recorder.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/previews_state.h"
 #include "content/public/common/process_type.h"
 #include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 int kRenderProcessId = 1;
 int kRenderFrameId = 2;
 int kRequestId = 3;
-uint32_t kPageTransition = 1;
+uint32_t kPageTransition = 5;
 void* kNavigationHandle = &kNavigationHandle;
 
 class MockPageLoadObserver
     : public data_use_measurement::DataUseAscriber::PageLoadObserver {
  public:
   MOCK_METHOD1(OnPageLoadCommit, void(data_use_measurement::DataUse* data_use));
   MOCK_METHOD2(OnPageResourceLoad,
                void(const net::URLRequest& request,
                     data_use_measurement::DataUse* data_use));
   MOCK_METHOD1(OnPageLoadComplete,
@@ skipping 77 matching lines @@
 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());
+      content::GlobalRequestID(kRenderProcessId, 0), kRenderProcessId,
+      kRenderFrameId);
+  ascriber()->DidFinishNavigation(kRenderProcessId, kRenderFrameId,
+                                  GURL("http://test.com"), true,
+                                  kPageTransition);
   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());
+      content::GlobalRequestID(kRenderProcessId, 0), kRenderProcessId,
+      kRenderFrameId);
+  ascriber()->DidFinishNavigation(kRenderProcessId, kRenderFrameId,
+                                  GURL("http://test.com"), true,
+                                  kPageTransition);
   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());
+      content::GlobalRequestID(kRenderProcessId, 0), kRenderProcessId,
+      kRenderFrameId);
+  ascriber()->DidFinishNavigation(kRenderProcessId, kRenderFrameId,
+                                  GURL("http://test.com"), true,
+                                  kPageTransition);
   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);
 
@@ skipping 16 matching lines @@
   // Request should cause a recorder to be created.
   ascriber()->OnBeforeUrlRequest(request.get());
   EXPECT_EQ(2u, recorders().size());
 
   // Navigation starts.
   ascriber()->DidStartMainFrameNavigation(GURL("http://test.com"),
                                           kRenderProcessId, kRenderFrameId,
                                           kNavigationHandle);
 
   ascriber()->ReadyToCommitMainFrameNavigation(
-      GURL("http://mobile.test.com"),
       content::GlobalRequestID(kRenderProcessId, 0), kRenderProcessId,
-      kRenderFrameId, false, kNavigationHandle);
+      kRenderFrameId);
+  ascriber()->DidFinishNavigation(kRenderProcessId, kRenderFrameId,
+                                  GURL("http://mobile.test.com"), false,
+                                  kPageTransition);
 
   // Navigation commit should merge the two data use recorder entries.
   EXPECT_EQ(1u, recorders().size());
   auto& recorder_entry = recorders().front();
   EXPECT_EQ(RenderFrameHostID(kRenderProcessId, kRenderFrameId),
             recorder_entry.main_frame_id());
   EXPECT_EQ(content::GlobalRequestID(kRenderProcessId, 0),
             recorder_entry.main_frame_request_id());
   EXPECT_EQ(GURL("http://mobile.test.com"), recorder_entry.data_use().url());
   EXPECT_EQ(DataUse::TrafficType::USER_TRAFFIC,
@@ skipping 46 matching lines @@
   EXPECT_EQ(1u, recorders().size());
 
   ascriber()->OnBeforeUrlRequest(request.get());
 
   // Navigation starts.
   ascriber()->DidStartMainFrameNavigation(GURL("http://test.com"),
                                           kRenderProcessId, kRenderFrameId,
                                           kNavigationHandle);
 
   ascriber()->ReadyToCommitMainFrameNavigation(
-      GURL("http://mobile.test.com"),
       content::GlobalRequestID(kRenderProcessId, 0), kRenderProcessId,
-      kRenderFrameId, false, kNavigationHandle);
+      kRenderFrameId);
+
+  EXPECT_EQ(2u, recorders().size());
+  DataUse* data_use = &recorders().front().data_use();
+
+  EXPECT_CALL(mock_observer,
+              OnPageResourceLoad(testing::_, &recorders().back().data_use()))
+      .Times(1);
+  ascriber()->OnUrlRequestCompleted(*request, false);
+
+  EXPECT_CALL(mock_observer, OnPageLoadCommit(data_use)).Times(1);
+  EXPECT_CALL(mock_observer, OnPageLoadComplete(testing::_)).Times(1);
+  ascriber()->DidFinishNavigation(kRenderProcessId, kRenderFrameId,
+                                  GURL("http://mobile.test.com"), false,
+                                  kPageTransition);
 
   EXPECT_EQ(1u, recorders().size());
   auto& recorder_entry = recorders().front();
-  DataUse* data_use = &recorder_entry.data_use();
   EXPECT_EQ(RenderFrameHostID(kRenderProcessId, kRenderFrameId),
             recorder_entry.main_frame_id());
   EXPECT_EQ(content::GlobalRequestID(kRenderProcessId, 0),
             recorder_entry.main_frame_request_id());
   EXPECT_EQ(GURL("http://mobile.test.com"), recorder_entry.data_use().url());
-
-  EXPECT_CALL(mock_observer, OnPageLoadCommit(data_use)).Times(1);
-  ascriber()->DidFinishNavigation(kRenderProcessId, kRenderFrameId,
-                                  kPageTransition);
-
-  EXPECT_CALL(mock_observer, OnPageLoadComplete(data_use)).Times(1);
-  EXPECT_CALL(mock_observer, OnPageResourceLoad(testing::_, data_use)).Times(1);
+  EXPECT_CALL(mock_observer, OnPageLoadComplete(&recorder_entry.data_use()))
+      .Times(1);
 
   ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1);
   ascriber()->OnUrlRequestDestroyed(request.get());
 
   EXPECT_EQ(0u, recorders().size());
 }
 
 }  // namespace data_use_measurement