Add tracing for BrowsingDataCounter and ImportantSites

Add tracing for methods in BrowsingData[Counter]Bridge and each
browsing data counter. This will allow easier debugging of performance
issues with the Clear Browsing Data dialog.

Bug: 804839
Change-Id: I971d08edea77fee4e76e48b901516253e46fcb33
Reviewed-on: https://chromium-review.googlesource.com/883530Reviewed-by: Martin Šrámek <msramek@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532405}

chrome/browser/android/browsing_data/browsing_data_bridge.cc

@@ -17,6 +17,7 @@
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/scoped_observer.h"
+#include "base/trace_event/trace_event.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data/browsing_data_important_sites_util.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
@@ -69,6 +70,8 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData(
     const JavaParamRef<jintArray>& jexcluding_domain_reasons,
     const JavaParamRef<jobjectArray>& jignoring_domains,
     const JavaParamRef<jintArray>& jignoring_domain_reasons) {
+  TRACE_EVENT0("browsing_data", "BrowsingDataBridge_ClearBrowsingData");
+
   BrowsingDataRemover* browsing_data_remover =
       content::BrowserContext::GetBrowsingDataRemover(GetOriginalProfile());
 
@@ -163,6 +166,9 @@ static void JNI_BrowsingDataBridge_RequestInfoAboutOtherFormsOfBrowsingHistory(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& listener) {
+  TRACE_EVENT0(
+      "browsing_data",
+      "BrowsingDataBridge_RequestInfoAboutOtherFormsOfBrowsingHistory");
   // The one-time notice in the dialog.
   browsing_data::ShouldPopupDialogAboutOtherFormsOfBrowsingHistory(
       ProfileSyncServiceFactory::GetForProfile(GetOriginalProfile()),
@@ -176,6 +182,7 @@ static void JNI_BrowsingDataBridge_FetchImportantSites(
     JNIEnv* env,
     const JavaParamRef<jclass>& clazz,
     const JavaParamRef<jobject>& java_callback) {
+  TRACE_EVENT0("browsing_data", "BrowsingDataBridge_FetchImportantSites");
   Profile* profile = GetOriginalProfile();
   std::vector<ImportantSitesUtil::ImportantDomainInfo> important_sites =
       ImportantSitesUtil::GetImportantRegisterableDomains(

chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/android/browsing_data/browsing_data_counter_bridge.h"
 
 #include "base/android/jni_string.h"
+#include "base/trace_event/trace_event.h"
 #include "chrome/browser/browsing_data/counters/browsing_data_counter_factory.h"
 #include "chrome/browser/browsing_data/counters/browsing_data_counter_utils.h"
 #include "chrome/browser/profiles/profile.h"
@@ -27,6 +28,9 @@ BrowsingDataCounterBridge::BrowsingDataCounterBridge(
   DCHECK_GE(clear_browsing_data_tab, 0);
   DCHECK_LT(clear_browsing_data_tab,
             static_cast<int>(browsing_data::ClearBrowsingDataTab::NUM_TYPES));
+  TRACE_EVENT1("browsing_data",
+               "BrowsingDataCounterBridge::BrowsingDataCounterBridge",
+               "data_type", data_type);
 
   clear_browsing_data_tab_ =
       static_cast<browsing_data::ClearBrowsingDataTab>(clear_browsing_data_tab);

components/browsing_data/core/counters/browsing_data_counter.cc

@@ -7,6 +7,7 @@
 #include <memory>
 #include <utility>
 
+#include "base/trace_event/trace_event.h"
 #include "components/browsing_data/core/browsing_data_utils.h"
 #include "components/browsing_data/core/pref_names.h"
 #include "components/prefs/pref_service.h"
@@ -66,6 +67,8 @@ base::Time BrowsingDataCounter::GetPeriodEnd() {
 
 void BrowsingDataCounter::Restart() {
   DCHECK(initialized_);
+  TRACE_EVENT_ASYNC_BEGIN1("browsing_data", "BrowsingDataCounter::Restart",
+                           this, "data_type", GetPrefName());
   if (state_ == State::IDLE) {
     DCHECK(!timer_.IsRunning());
     DCHECK(!staged_result_);
@@ -85,6 +88,8 @@ void BrowsingDataCounter::Restart() {
   } else {
     state_ = State::READY_TO_REPORT_RESULT;
   }
+  TRACE_EVENT1("browsing_data", "BrowsingDataCounter::Count", "data_type",
+               GetPrefName());
   Count();
 }
 
@@ -95,7 +100,8 @@ void BrowsingDataCounter::ReportResult(ResultInt value) {
 void BrowsingDataCounter::ReportResult(std::unique_ptr<Result> result) {
   DCHECK(initialized_);
   DCHECK(result->Finished());
-
+  TRACE_EVENT_ASYNC_END1("browsing_data", "BrowsingDataCounter::Restart", this,
+                         "data_type", GetPrefName());
   switch (state_) {
     case State::RESTARTED:
     case State::READY_TO_REPORT_RESULT: