Remove one thread hop while fetching matching rules

chrome/browser/android/data_usage/external_data_use_observer_unittest.cc

 // Copyright 2015 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/data_usage/external_data_use_observer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 371 matching lines @@
             external_data_use_observer()->fetch_matching_rules_duration_);
 }
 
 // Tests the matching rule fetch behavior when the external control app is
 // installed and not installed. Matching rules should be fetched when control
 // app gets installed. If control app is installed and no valid rules are found,
 // matching rules are fetched on every navigation. Rules are not fetched if
 // control app is not installed  or if more than zero valid rules have been
 // fetched.
 TEST_F(ExternalDataUseObserverTest, MatchingRuleFetchOnControlAppInstall) {
-  // Matching rules not fetched on navigation if control app is not installed.
-  external_data_use_observer()->last_matching_rules_fetch_time_ =
-      base::TimeTicks();
-  external_data_use_observer()->data_use_tab_model_->is_control_app_installed_ =
-      false;
-  external_data_use_observer()->data_use_tab_model_->OnNavigationEvent(
-      kDefaultTabId, DataUseTabModel::TRANSITION_LINK, GURL(kDefaultURL),
-      std::string());
-  EXPECT_TRUE(
-      external_data_use_observer()->last_matching_rules_fetch_time_.is_null());
+  {
+    // Matching rules not fetched on navigation if control app is not installed.
+    external_data_use_observer()->last_matching_rules_fetch_time_ =
+        base::TimeTicks();
+    external_data_use_observer()
+        ->data_use_tab_model_->is_control_app_installed_ = false;
+    base::HistogramTester histogram_tester;
+    external_data_use_observer()->data_use_tab_model_->OnNavigationEvent(
+        kDefaultTabId, DataUseTabModel::TRANSITION_LINK, GURL(kDefaultURL),
+        std::string());
+    base::RunLoop().RunUntilIdle();
+    histogram_tester.ExpectTotalCount("DataUsage.MatchingRulesCount.Valid", 0);
+  }
 
-  // Matching rules are fetched when control app is installed.
-  external_data_use_observer()
-      ->data_use_tab_model_->OnControlAppInstallStateChange(true);
-  base::RunLoop().RunUntilIdle();
-  EXPECT_FALSE(
-      external_data_use_observer()->last_matching_rules_fetch_time_.is_null());
+  {
+    // Matching rules are fetched when control app is installed.
+    base::HistogramTester histogram_tester;
+    external_data_use_observer()
+        ->data_use_tab_model_->OnControlAppInstallStateChange(true);
+    base::RunLoop().RunUntilIdle();
+    histogram_tester.ExpectTotalCount("DataUsage.MatchingRulesCount.Valid", 1);
+  }
 
-  // Matching rules fetched on every navigation if control app is installed and
-  // zero rules are available.
-  external_data_use_observer()->last_matching_rules_fetch_time_ =
-      base::TimeTicks();
-  external_data_use_observer()->data_use_tab_model_->OnNavigationEvent(
-      kDefaultTabId, DataUseTabModel::TRANSITION_LINK, GURL(kDefaultURL),
-      std::string());
-  base::RunLoop().RunUntilIdle();
-  EXPECT_FALSE(
-      external_data_use_observer()->last_matching_rules_fetch_time_.is_null());
+  {
+    // Matching rules fetched on every navigation if control app is installed
+    // and zero rules are available.
+    external_data_use_observer()->last_matching_rules_fetch_time_ =
+        base::TimeTicks();
+    base::HistogramTester histogram_tester;
+    external_data_use_observer()->data_use_tab_model_->OnNavigationEvent(
+        kDefaultTabId, DataUseTabModel::TRANSITION_LINK, GURL(kDefaultURL),
+        std::string());
+    base::RunLoop().RunUntilIdle();
+    histogram_tester.ExpectTotalCount("DataUsage.MatchingRulesCount.Valid", 1);
+  }
 
-  // Matching rules not fetched on navigation if control app is installed and
-  // more than zero rules are available.
-  AddDefaultMatchingRule();
-  external_data_use_observer()->last_matching_rules_fetch_time_ =
-      base::TimeTicks();
-  EXPECT_TRUE(
-      external_data_use_observer()->last_matching_rules_fetch_time_.is_null());
-  external_data_use_observer()->data_use_tab_model_->OnNavigationEvent(
-      kDefaultTabId, DataUseTabModel::TRANSITION_LINK, GURL(kDefaultURL),
-      std::string());
-  EXPECT_TRUE(
-      external_data_use_observer()->last_matching_rules_fetch_time_.is_null());
+  {
+    // Matching rules not fetched on navigation if control app is installed and
+    // more than zero rules are available.
+    AddDefaultMatchingRule();
+    external_data_use_observer()->last_matching_rules_fetch_time_ =
+        base::TimeTicks();
+    EXPECT_TRUE(external_data_use_observer()
+                    ->last_matching_rules_fetch_time_.is_null());
+    base::HistogramTester histogram_tester;
+    external_data_use_observer()->data_use_tab_model_->OnNavigationEvent(
+        kDefaultTabId, DataUseTabModel::TRANSITION_LINK, GURL(kDefaultURL),
+        std::string());
+    base::RunLoop().RunUntilIdle();
+    histogram_tester.ExpectTotalCount("DataUsage.MatchingRulesCount.Valid", 0);
+  }
 }
 
 // Tests if data use reports are sent only after the total bytes sent/received
 // across all buffered reports have reached the specified threshold.
 TEST_F(ExternalDataUseObserverTest, BufferDataUseReports) {
   AddDefaultMatchingRule();
   TriggerTabTrackingOnDefaultTab();
 
   // This tests reports 1024 bytes in each loop iteration. For the test to work
   // properly, |data_use_report_min_bytes_| should be a multiple of 1024.
@@ skipping 144 matching lines @@
 
 // Tests if the metrics are recorded correctly.
 TEST_F(ExternalDataUseObserverTest, DataUseReportTimedOut) {
   base::HistogramTester histogram_tester;
   std::map<std::string, std::string> variation_params;
   variation_params["data_report_submit_timeout_msec"] = "0";
   variation_params["data_use_report_min_bytes"] = "0";
 
   // Create another ExternalDataUseObserver object.
   ReplaceExternalDataUseObserver(variation_params);
+  histogram_tester.ExpectTotalCount(kUMAMatchingRuleFirstFetchDurationHistogram,
+                                    0);
 
   // Trigger the control app install, and matching rules will be fetched.
   external_data_use_observer()
       ->GetDataUseTabModel()
       ->OnControlAppInstallStateChange(true);
   base::RunLoop().RunUntilIdle();
   histogram_tester.ExpectTotalCount(kUMAMatchingRuleFirstFetchDurationHistogram,
                                     1);
 
   // Verify that matching rules are fetched on every navigation after the
@@ skipping 15 matching lines @@
       ExternalDataUseObserver::DATAUSAGE_REPORT_SUBMISSION_TIMED_OUT, 1);
   histogram_tester.ExpectUniqueSample(
       "DataUsage.ReportSubmission.Bytes.TimedOut",
       default_upload_bytes() + default_download_bytes(), 1);
   histogram_tester.ExpectTotalCount(kUMAReportSubmissionDurationHistogram, 0);
 }
 
 }  // namespace android
 
 }  // namespace chrome