Remove Two Old Search Provider Timing Histograms

and extend date of another omnibox histogram.

Bug: 871485
Change-Id: Ied602a6df0748faa501112c2a0dfcd38dab49071
Reviewed-on: https://chromium-review.googlesource.com/1166192Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Mark Pearson <mpearson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581892}

components/omnibox/browser/search_provider.cc

@@ -662,14 +662,10 @@ void SearchProvider::DoHistoryQuery(bool minimal_changes) {
   int num_matches = kMaxMatches * 5;
   const TemplateURL* default_url = providers_.GetDefaultProviderURL();
   if (default_url) {
-    const base::TimeTicks start_time = base::TimeTicks::Now();
     url_db->GetMostRecentKeywordSearchTerms(default_url->id(),
                                             input_.text(),
                                             num_matches,
                                             &raw_default_history_results_);
-    UMA_HISTOGRAM_TIMES(
-        "Omnibox.SearchProvider.GetMostRecentKeywordTermsDefaultProviderTime",
-        base::TimeTicks::Now() - start_time);
   }
   const TemplateURL* keyword_url = providers_.GetKeywordProviderURL();
   if (keyword_url) {
@@ -969,7 +965,6 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
 void SearchProvider::ConvertResultsToAutocompleteMatches() {
   // Convert all the results to matches and add them to a map, so we can keep
   // the most relevant match for each result.
-  base::TimeTicks start_time(base::TimeTicks::Now());
   MatchMap map;
   int did_not_accept_keyword_suggestion =
       keyword_results_.suggest_results.empty() ?
@@ -1129,8 +1124,6 @@ void SearchProvider::ConvertResultsToAutocompleteMatches() {
 
     matches_.push_back(*i);
   }
-  UMA_HISTOGRAM_TIMES("Omnibox.SearchProvider.ConvertResultsTime",
-                      base::TimeTicks::Now() - start_time);
 }
 
 void SearchProvider::RemoveExtraAnswers(ACMatches* matches) {

tools/metrics/histograms/histograms.xml

@@ -65781,7 +65781,7 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Omnibox.PasteAndGo" units="count" expires_after="2018-08-30">
+<histogram name="Omnibox.PasteAndGo" units="count" expires_after="2019-07-30">
   <owner>mpearson@chromium.org</owner>
   <summary>
     The number of paste-and-go commands on the text in the omnibox. Reported
@@ -65953,8 +65953,10 @@ uploading your change for review.
   </summary>
 </histogram>
 
-<histogram name="Omnibox.SearchProvider.ConvertResultsTime" units="ms"
-    expires_after="2018-08-30">
+<histogram name="Omnibox.SearchProvider.ConvertResultsTime" units="ms">
+  <obsolete>
+    Deleted in August 2018 in M-70.
+  </obsolete>
   <owner>mpearson@chromium.org</owner>
   <summary>
     Time it takes to convert all the results to matches and add them to a map,
@@ -65964,7 +65966,10 @@ uploading your change for review.
 
 <histogram
     name="Omnibox.SearchProvider.GetMostRecentKeywordTermsDefaultProviderTime"
-    units="ms" expires_after="2018-08-30">
+    units="ms">
+  <obsolete>
+    Deleted in August 2018 in M-70.
+  </obsolete>
   <owner>mpearson@chromium.org</owner>
   <summary>
     Time it takes for the omnibox to search the previous query history database