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 381 matching lines @@
   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 are fetched when control app gets installed.
+  external_data_use_observer()
+      ->data_use_tab_model_->OnControlAppInstallStateChange(true);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(
+      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()
-      ->data_use_tab_model_->OnControlAppInstallStateChange(true);
+  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 not fetched on navigation if control app is installed and
   // more than zero rules are available.
   AddDefaultMatchingRule();
@@ skipping 163 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.
+  // Trigger the control app install, which will fetch the matching rules.
   external_data_use_observer()
       ->GetDataUseTabModel()
       ->OnControlAppInstallStateChange(true);
   histogram_tester.ExpectTotalCount(kUMAMatchingRuleFirstFetchDurationHistogram,
-                                    0);
+                                    1);
 
   // Verify that matching rules are fetched on the first navigation after the
   // control app is installed.
   external_data_use_observer()->GetDataUseTabModel()->OnNavigationEvent(
       kDefaultTabId, DataUseTabModel::TRANSITION_OMNIBOX_SEARCH,
       GURL(kDefaultURL), std::string());
   base::RunLoop().RunUntilIdle();
   histogram_tester.ExpectTotalCount(kUMAMatchingRuleFirstFetchDurationHistogram,
                                     1);
 
   AddDefaultMatchingRule();
   TriggerTabTrackingOnDefaultTab();
   OnDataUse(default_data_use());
   OnDataUse(default_data_use());
   // First data use report should be marked as timed out.
   histogram_tester.ExpectUniqueSample(
       "DataUsage.ReportSubmissionResult",
       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