Add enum-based UMA reporting to automatic redirect logic of Offline Pages.

chrome/browser/android/offline_pages/offline_page_tab_helper_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_tab_helper.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
@@ skipping 18 matching lines @@
 #include "net/base/network_change_notifier.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace offline_pages {
 
 namespace {
 
 const GURL kTestPageUrl("http://test.org/page1");
 const ClientId kTestClientId = ClientId(kBookmarkNamespace, "1234");
 const int64_t kTestFileSize = 876543LL;
-const char kBadNetworkHistogram[] = "OfflinePages.ShowOfflinePageOnBadNetwork";
-const char kRedirectToOfflineHistogram[] =
-    "OfflinePages.RedirectToOfflineCount";
-const char kRedirectToOnlineHistogram[] = "OfflinePages.RedirectToOnlineCount";
+const char kRedirectResultHistogram[] = "OfflinePages.RedirectResult";
 const char kTabId[] = "42";
 
 class TestNetworkChangeNotifier : public net::NetworkChangeNotifier {
  public:
   TestNetworkChangeNotifier() : online_(true) {}
 
   net::NetworkChangeNotifier::ConnectionType GetCurrentConnectionType()
       const override {
     return online_ ? net::NetworkChangeNotifier::CONNECTION_UNKNOWN
                    : net::NetworkChangeNotifier::CONNECTION_NONE;
@@ skipping 167 matching lines @@
 }
 
 TEST_F(OfflinePageTabHelperTest, SwitchToOnlineFromOfflineOnNetwork) {
   SimulateHasNetworkConnectivity(true);
 
   StartLoad(offline_url());
   // Gives a chance to run delayed task to do redirection.
   RunUntilIdle();
   // Redirection will be done immediately on navigation start.
   EXPECT_EQ(online_url(), controller().GetPendingEntry()->GetURL());
-  histograms().ExpectTotalCount(kBadNetworkHistogram, 0);
-  histograms().ExpectTotalCount(kRedirectToOfflineHistogram, 0);
-  histograms().ExpectTotalCount(kRedirectToOnlineHistogram, 1);
+  histograms().ExpectUniqueSample(
+      kRedirectResultHistogram,
+      static_cast<int>(OfflinePageTabHelper::RedirectResult::
+          REDIRECTED_ON_CONNECTED_NETWORK),
+      1);
 }
 
 TEST_F(OfflinePageTabHelperTest, SwitchToOfflineFromOnlineOnNoNetwork) {
   SimulateHasNetworkConnectivity(false);
 
   StartLoad(online_url());
   // Gives a chance to run delayed task to do redirection.
   RunUntilIdle();
   // Redirection will be done immediately on navigation start.
   EXPECT_EQ(offline_url(), controller().GetPendingEntry()->GetURL());
-  histograms().ExpectTotalCount(kBadNetworkHistogram, 0);
-  histograms().ExpectTotalCount(kRedirectToOfflineHistogram, 1);
-  histograms().ExpectTotalCount(kRedirectToOnlineHistogram, 0);
+  histograms().ExpectUniqueSample(
+      kRedirectResultHistogram,
+      static_cast<int>(OfflinePageTabHelper::RedirectResult::
+          REDIRECTED_ON_DISCONNECTED_NETWORK),
+      1);
 }
 
 TEST_F(OfflinePageTabHelperTest, TestCurrentOfflinePage) {
   SimulateHasNetworkConnectivity(false);
 
   StartLoad(online_url());
   // Gives a chance to run delayed task to do redirection.
   RunUntilIdle();
 
   const OfflinePageItem* item =
@@ skipping 12 matching lines @@
   SimulateHasNetworkConnectivity(true);
 
   StartLoad(online_url());
   RunUntilIdle();
   EXPECT_EQ(online_url(), controller().GetPendingEntry()->GetURL());
 
   // Redirection will be done immediately on navigation end with error.
   FailLoad(online_url());
   EXPECT_EQ(offline_url(), controller().GetPendingEntry()->GetURL());
 
-  histograms().ExpectBucketCount(kBadNetworkHistogram, false, 0);
-  histograms().ExpectBucketCount(kBadNetworkHistogram, true, 1);
-  histograms().ExpectTotalCount(kRedirectToOfflineHistogram, 1);
-  histograms().ExpectTotalCount(kRedirectToOnlineHistogram, 0);
+  histograms().ExpectUniqueSample(
+      kRedirectResultHistogram,
+      static_cast<int>(OfflinePageTabHelper::RedirectResult::
+          REDIRECTED_ON_FLAKY_NETWORK),
+      1);
 }
 
 TEST_F(OfflinePageTabHelperTest, NewNavigationCancelsPendingRedirects) {
   SimulateHasNetworkConnectivity(false);
 
   StartLoad(online_url());
   const GURL unsaved_url("http://test.org/page2");
 
   // We should have a pending task that will do the redirect.
   ASSERT_TRUE(offline_page_tab_helper()->weak_ptr_factory_.HasWeakPtrs());
   ASSERT_EQ(online_url(), controller().GetPendingEntry()->GetURL());
 
   // Should cancel pending tasks for previous URL.
   StartLoad(unsaved_url);
 
   // Gives a chance to run delayed task to do redirection.
   RunUntilIdle();
 
   // Redirection should be cancelled so we should still navigate to
   // |unsaved_url|.
   EXPECT_EQ(unsaved_url, controller().GetPendingEntry()->GetURL());
 
-  histograms().ExpectTotalCount(kBadNetworkHistogram, 0);
-  histograms().ExpectTotalCount(kRedirectToOfflineHistogram, 0);
-  histograms().ExpectTotalCount(kRedirectToOnlineHistogram, 0);
+  // Should report attempt of redirect, but the page not found.
+  histograms().ExpectUniqueSample(
+      kRedirectResultHistogram,
+      static_cast<int>(OfflinePageTabHelper::RedirectResult::
+          PAGE_NOT_FOUND_ON_DISCONNECTED_NETWORK),
+      1);
 }
 
 // This test saves 3 pages (one in setup and 2 in test). The most appropriate
 // test is related to |kTabId|, as it is saved in the latest moment and can be
 // used in the current tab.
 TEST_F(OfflinePageTabHelperTest, SelectBestPageForCurrentTab) {
   // Saves an offline page.
   OfflinePageModel* model =
       OfflinePageModelFactory::GetForBrowserContext(browser_context());
   std::unique_ptr<OfflinePageTestArchiver> archiver(BuildArchiver(
@@ skipping 22 matching lines @@
   RunUntilIdle();
 
   const OfflinePageItem* item =
       OfflinePageUtils::GetOfflinePageFromWebContents(web_contents());
   EXPECT_EQ(expected_offline_id, item->offline_id);
   EXPECT_EQ(expected_offline_url, item->GetOfflineURL());
   EXPECT_EQ(kLastNNamespace, item->client_id.name_space);
   EXPECT_EQ(kTabId, item->client_id.id);
 }
 }  // namespace offline_pages