Clean up the unused Suggest field trial and make GetActiveSuggestFieldTrialHash

chrome/browser/autocomplete/search_provider.cc

Index: chrome/browser/autocomplete/search_provider.cc
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 6b92d82f0f7b28268549197391eac64eb54b2698..9e833c0a32ff15f88d1bd45558a7383d31aa0dd7 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -419,13 +419,16 @@ void SearchProvider::AddProviderInfo(ProvidersInfo* provider_info) const {
   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.

 }