Report redirect UMA in offline interceptor

chrome/browser/android/offline_pages/offline_page_request_job_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/android/offline_pages/offline_page_request_job.h"
 
 #include "base/callback.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
@@ skipping 231 matching lines @@
                 const ClientId& client_id,
                 const GURL& original_url,
                 std::unique_ptr<OfflinePageArchiver> archiver);
 
   void InterceptRequest(const GURL& url,
                         const std::string& method,
                         const std::string& extra_header_name,
                         const std::string& extra_header_value,
                         content::ResourceType resource_type);
 
-  void ExpectAggregatedRequestResultHistogram(
+  // Expect exactly one count of |result| UMA reported. No other bucket should
+  // have sample.
+  void ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult result);
-  void ExpectAggregatedRequestResultHistogramWithCount(
+  // Expect exactly |count| of |result| UMA reported. No other bucket should
+  // have sample.
+  void ExpectMultiUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult result, int count);
+  // Expect one count of |result| UMA reported. Other buckets may have samples
+  // as well.
+  void ExpectOneNonuniqueSampleForAggregatedRequestResult(
+      OfflinePageRequestJob::AggregatedRequestResult result);
 
   net::TestURLRequestContext* url_request_context() {
     return test_url_request_context_.get();
   }
   Profile* profile() { return profile_; }
   OfflinePageTabHelper* offline_page_tab_helper() const {
     return offline_page_tab_helper_;
   }
   int64_t offline_id() const { return offline_id_; }
   int64_t offline_id2() const { return offline_id2_; }
@@ skipping 174 matching lines @@
       1,     /* render_frame_id */
       true,  /* is_main_frame */
       false, /* parent_is_main_frame */
       true,  /* allow_download */
       true,  /* is_async */
       false  /* is_using_lofi */);
 
   return request;
 }
 
-void OfflinePageRequestJobTest::ExpectAggregatedRequestResultHistogram(
+void
+OfflinePageRequestJobTest::ExpectOneUniqueSampleForAggregatedRequestResult(
     OfflinePageRequestJob::AggregatedRequestResult result) {
   histogram_tester_.ExpectUniqueSample(
       kAggregatedRequestResultHistogram, static_cast<int>(result), 1);
 }
 
-void OfflinePageRequestJobTest::ExpectAggregatedRequestResultHistogramWithCount(
+void
+OfflinePageRequestJobTest::ExpectMultiUniqueSampleForAggregatedRequestResult(
     OfflinePageRequestJob::AggregatedRequestResult result, int count) {
   histogram_tester_.ExpectUniqueSample(
       kAggregatedRequestResultHistogram, static_cast<int>(result), count);
 }
 
+void
+OfflinePageRequestJobTest::ExpectOneNonuniqueSampleForAggregatedRequestResult(
+    OfflinePageRequestJob::AggregatedRequestResult result) {
+  histogram_tester_.ExpectBucketCount(
+      kAggregatedRequestResultHistogram, static_cast<int>(result), 1);
+}
+
 void OfflinePageRequestJobTest::SavePage(
     const GURL& url,
     const ClientId& client_id,
     const GURL& original_url,
     std::unique_ptr<OfflinePageArchiver> archiver) {
   OfflinePageModel::SavePageParams save_page_params;
   save_page_params.url = url;
   save_page_params.client_id = client_id;
   save_page_params.original_url = original_url;
   OfflinePageModelFactory::GetForBrowserContext(profile())->SavePage(
@@ skipping 109 matching lines @@
 TEST_F(OfflinePageRequestJobTest, LoadOfflinePageOnDisconnectedNetwork) {
   SimulateHasNetworkConnectivity(false);
 
   InterceptRequest(kTestUrl, "GET", "", "", content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(kTestFileSize2, bytes_read());
   ASSERT_TRUE(offline_page_tab_helper()->GetOfflinePageForTest());
   EXPECT_EQ(offline_id2(),
             offline_page_tab_helper()->GetOfflinePageForTest()->offline_id);
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           SHOW_OFFLINE_ON_DISCONNECTED_NETWORK);
 }
 
 TEST_F(OfflinePageRequestJobTest, PageNotFoundOnDisconnectedNetwork) {
   SimulateHasNetworkConnectivity(false);
 
   InterceptRequest(kTestUrl2, "GET", "", "", content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(0, bytes_read());
   EXPECT_FALSE(offline_page_tab_helper()->GetOfflinePageForTest());
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           PAGE_NOT_FOUND_ON_DISCONNECTED_NETWORK);
 }
 
 TEST_F(OfflinePageRequestJobTest, LoadOfflinePageOnProhibitivelySlowNetwork) {
   SimulateHasNetworkConnectivity(true);
 
   test_previews_decider()->set_should_allow_preview(true);
 
   InterceptRequest(kTestUrl, "GET", "", "", content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(kTestFileSize2, bytes_read());
   ASSERT_TRUE(offline_page_tab_helper()->GetOfflinePageForTest());
   EXPECT_EQ(offline_id2(),
             offline_page_tab_helper()->GetOfflinePageForTest()->offline_id);
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           SHOW_OFFLINE_ON_PROHIBITIVELY_SLOW_NETWORK);
   test_previews_decider()->set_should_allow_preview(false);
 }
 
 TEST_F(OfflinePageRequestJobTest, PageNotFoundOnProhibitivelySlowNetwork) {
   SimulateHasNetworkConnectivity(true);
 
   test_previews_decider()->set_should_allow_preview(true);
 
   InterceptRequest(kTestUrl2, "GET", "", "", content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(0, bytes_read());
   EXPECT_FALSE(offline_page_tab_helper()->GetOfflinePageForTest());
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           PAGE_NOT_FOUND_ON_PROHIBITIVELY_SLOW_NETWORK);
   test_previews_decider()->set_should_allow_preview(false);
 }
 
 TEST_F(OfflinePageRequestJobTest, LoadOfflinePageOnFlakyNetwork) {
   SimulateHasNetworkConnectivity(true);
 
   // When custom offline header exists and contains "reason=error", it means
   // that net error is hit in last request due to flaky network.
   InterceptRequest(
       kTestUrl,
       "GET",
       kOfflinePageHeader,
       std::string(kOfflinePageHeaderReasonKey) + "=" +
           kOfflinePageHeaderReasonValueDueToNetError,
       content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(kTestFileSize2, bytes_read());
   ASSERT_TRUE(offline_page_tab_helper()->GetOfflinePageForTest());
   EXPECT_EQ(offline_id2(),
             offline_page_tab_helper()->GetOfflinePageForTest()->offline_id);
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           SHOW_OFFLINE_ON_FLAKY_NETWORK);
 }
 
 TEST_F(OfflinePageRequestJobTest, PageNotFoundOnFlakyNetwork) {
   SimulateHasNetworkConnectivity(true);
 
   // When custom offline header exists and contains "reason=error", it means
   // that net error is hit in last request due to flaky network.
   InterceptRequest(
       kTestUrl2,
       "GET",
       kOfflinePageHeader,
       std::string(kOfflinePageHeaderReasonKey) + "=" +
           kOfflinePageHeaderReasonValueDueToNetError,
       content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(0, bytes_read());
   EXPECT_FALSE(offline_page_tab_helper()->GetOfflinePageForTest());
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           PAGE_NOT_FOUND_ON_FLAKY_NETWORK);
 }
 
 TEST_F(OfflinePageRequestJobTest, ForceLoadOfflinePageOnConnectedNetwork) {
   SimulateHasNetworkConnectivity(true);
 
   // When custom offline header exists and contains value other than
   // "reason=error", it means that offline page is forced to load.
   InterceptRequest(
       kTestUrl,
       "GET",
       kOfflinePageHeader,
       std::string(kOfflinePageHeaderReasonKey) + "=download",
       content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(kTestFileSize2, bytes_read());
   ASSERT_TRUE(offline_page_tab_helper()->GetOfflinePageForTest());
   EXPECT_EQ(offline_id2(),
             offline_page_tab_helper()->GetOfflinePageForTest()->offline_id);
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           SHOW_OFFLINE_ON_CONNECTED_NETWORK);
 }
 
 TEST_F(OfflinePageRequestJobTest, PageNotFoundOnConnectedNetwork) {
   SimulateHasNetworkConnectivity(true);
 
   // When custom offline header exists and contains value other than
   // "reason=error", it means that offline page is forced to load.
   InterceptRequest(
       kTestUrl2,
       "GET",
       kOfflinePageHeader,
       std::string(kOfflinePageHeaderReasonKey) + "=download",
       content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(0, bytes_read());
   EXPECT_FALSE(offline_page_tab_helper()->GetOfflinePageForTest());
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           PAGE_NOT_FOUND_ON_CONNECTED_NETWORK);
 }
 
 TEST_F(OfflinePageRequestJobTest, DoNotLoadOfflinePageOnConnectedNetwork) {
   SimulateHasNetworkConnectivity(true);
 
   InterceptRequest(kTestUrl, "GET", "", "", content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
@@ skipping 10 matching lines @@
       kOfflinePageHeader,
       std::string(kOfflinePageHeaderReasonKey) + "=download " +
           kOfflinePageHeaderIDKey + "=" + base::Int64ToString(offline_id()),
       content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(kTestFileSize, bytes_read());
   ASSERT_TRUE(offline_page_tab_helper()->GetOfflinePageForTest());
   EXPECT_EQ(offline_id(),
             offline_page_tab_helper()->GetOfflinePageForTest()->offline_id);
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           SHOW_OFFLINE_ON_CONNECTED_NETWORK);
 }
 
 TEST_F(OfflinePageRequestJobTest,
        LoadOfflinePageByOfflineIDAndFallbackToOnlineURL) {
   SimulateHasNetworkConnectivity(true);
 
   // The offline page found with specific offline ID does not match the passed
   // online URL. Should fall back to find the offline page based on the online
   // URL.
   InterceptRequest(
       kTestUrl2,
       "GET",
       kOfflinePageHeader,
       std::string(kOfflinePageHeaderReasonKey) + "=download " +
           kOfflinePageHeaderIDKey + "=" + base::Int64ToString(offline_id()),
       content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(0, bytes_read());
   EXPECT_FALSE(offline_page_tab_helper()->GetOfflinePageForTest());
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           PAGE_NOT_FOUND_ON_CONNECTED_NETWORK);
 }
 
 TEST_F(OfflinePageRequestJobTest, LoadOfflinePageForUrlWithFragment) {
   SimulateHasNetworkConnectivity(false);
 
   // Loads an url with fragment, that will match the offline URL without the
   // fragment.
   GURL url_with_fragment(kTestUrl.spec() + "#ref");
   InterceptRequest(
       url_with_fragment, "GET", "", "", content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(kTestFileSize2, bytes_read());
   ASSERT_TRUE(offline_page_tab_helper()->GetOfflinePageForTest());
   EXPECT_EQ(offline_id2(),
             offline_page_tab_helper()->GetOfflinePageForTest()->offline_id);
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           SHOW_OFFLINE_ON_DISCONNECTED_NETWORK);
 
   // Loads an url without fragment, that will match the offline URL with the
   // fragment.
   InterceptRequest(kTestUrl3, "GET", "", "", content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(kTestFileSize3, bytes_read());
   ASSERT_TRUE(offline_page_tab_helper()->GetOfflinePageForTest());
   EXPECT_EQ(offline_id3(),
             offline_page_tab_helper()->GetOfflinePageForTest()->offline_id);
-  ExpectAggregatedRequestResultHistogramWithCount(
+  ExpectMultiUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           SHOW_OFFLINE_ON_DISCONNECTED_NETWORK, 2);
 
   // Loads an url with fragment, that will match the offline URL with different
   // fragment.
   GURL url3_with_different_fragment(kTestUrl3.spec() + "#different_ref");
   InterceptRequest(url3_with_different_fragment, "GET", "", "",
                    content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(kTestFileSize3, bytes_read());
   ASSERT_TRUE(offline_page_tab_helper()->GetOfflinePageForTest());
   EXPECT_EQ(offline_id3(),
             offline_page_tab_helper()->GetOfflinePageForTest()->offline_id);
-  ExpectAggregatedRequestResultHistogramWithCount(
+  ExpectMultiUniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           SHOW_OFFLINE_ON_DISCONNECTED_NETWORK, 3);
 
 }
 
 TEST_F(OfflinePageRequestJobTest, LoadOfflinePageAfterRedirect) {
   SimulateHasNetworkConnectivity(false);
 
   // This should trigger redirect first.
   InterceptRequest(
       kTestOriginalUrl, "GET", "", "", content::RESOURCE_TYPE_MAIN_FRAME);
   base::RunLoop().Run();
 
   EXPECT_EQ(kTestFileSize3, bytes_read());
   ASSERT_TRUE(offline_page_tab_helper()->GetOfflinePageForTest());
   EXPECT_EQ(offline_id3(),
             offline_page_tab_helper()->GetOfflinePageForTest()->offline_id);
-  ExpectAggregatedRequestResultHistogram(
+  ExpectOneNonuniqueSampleForAggregatedRequestResult(
+      OfflinePageRequestJob::AggregatedRequestResult::
+          REDIRECTED_ON_DISCONNECTED_NETWORK);
+  ExpectOneNonuniqueSampleForAggregatedRequestResult(
       OfflinePageRequestJob::AggregatedRequestResult::
           SHOW_OFFLINE_ON_DISCONNECTED_NETWORK);
 }
 
 }  // namespace offline_pages