Clean up the unused Suggest field trial and make GetActiveSuggestFieldTrialHash

chrome/browser/autocomplete/search_provider.cc

 // Copyright 2012 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/autocomplete/search_provider.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/autocomplete/url_prefix.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/metrics/variations/variations_http_header_provider.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/omnibox/omnibox_field_trial.h"

[SteveT, 2013/04/11 13:46:27]

Can you check if this is still used?

[Bart N., 2013/04/11 19:35:07]

Yes :) I still call OmniboxFieldTrial::GetActiveSuggestFieldTrialHashes.

 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/url_util.h"
 #include "grit/generated_resources.h"
@@ skipping 367 matching lines @@
 
   if (clear_cached_results)
     ClearResults();
 }
 
 void SearchProvider::AddProviderInfo(ProvidersInfo* provider_info) const {
   provider_info->push_back(metrics::OmniboxEventProto_ProviderInfo());
   metrics::OmniboxEventProto_ProviderInfo& new_entry = provider_info->back();
   new_entry.set_provider(AsOmniboxEventProviderType());
   new_entry.set_provider_done(done_);
-  uint32 field_trial_hash = 0;
-  if (OmniboxFieldTrial::GetActiveSuggestFieldTrialHash(&field_trial_hash)) {
-    if (field_trial_triggered_)
-      new_entry.mutable_field_trial_triggered()->Add(field_trial_hash);
-    if (field_trial_triggered_in_session_) {
-      new_entry.mutable_field_trial_triggered_in_session()->Add(
-          field_trial_hash);
+  std::vector<uint32> field_trial_hashes;
+  if (OmniboxFieldTrial::GetActiveSuggestFieldTrialHashes(
+          &field_trial_hashes)) {
+    for (size_t i = 0; i < field_trial_hashes.size(); ++i) {
+      if (field_trial_triggered_)
+        new_entry.mutable_field_trial_triggered()->Add(field_trial_hashes[i]);
+      if (field_trial_triggered_in_session_) {
+        new_entry.mutable_field_trial_triggered_in_session()->Add(
+            field_trial_hashes[i]);
+      }
     }
   }

[SteveT, 2013/04/11 13:46:27]

That's odd... do these two braces need to be cleaned up?

[Bart N., 2013/04/11 19:35:07]

They are needed for if/for statements.

 }
 
 void SearchProvider::ResetSession() {
   field_trial_triggered_in_session_ = false;
 }
 
 void SearchProvider::OnURLFetchComplete(const net::URLFetcher* source) {
   DCHECK(!done_);
   suggest_results_pending_--;
   LogOmniboxSuggestRequest(REPLY_RECEIVED);
@@ skipping 1073 matching lines @@
     it->set_relevance(max_query_relevance);
   }
 }
 
 void SearchProvider::UpdateDone() {
   // We're done when the timer isn't running, there are no suggest queries
   // pending, and we're not waiting on Instant.
   done_ = (!timer_.IsRunning() && (suggest_results_pending_ == 0) &&
            (instant_finalized_ || !chrome::IsInstantEnabled(profile_)));
 }