Remove the hash fields from FieldTrials.

chrome/browser/metrics/metrics_log_unittest.cc

Index: chrome/browser/metrics/metrics_log_unittest.cc
diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc
index 7d8be39c0db63035df35d9a49fdcf20ee4d97a3c..833e7eef495c195808db0395c8e6c0431201d3bf 100644
--- a/chrome/browser/metrics/metrics_log_unittest.cc
+++ b/chrome/browser/metrics/metrics_log_unittest.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/metrics/proto/profiler_event.pb.h"
+#include "chrome/common/metrics/experiments_helper.h"

[jar (doing other things), 2012/04/27 19:05:44]

nit: alphabetize (merge/update messed up your order)

[SteveT, 2012/04/27 19:15:13]

Thanks for the catch. Done.

 #include "chrome/common/metrics/proto/system_profile.pb.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
@@ -34,7 +35,7 @@ const int kSessionId = 127;
 const int kScreenWidth = 1024;
 const int kScreenHeight = 768;
 const int kScreenCount = 3;
-const base::FieldTrial::NameGroupId kFieldTrialIds[] = {
+const experiments_helper::SelectedGroupId kFieldTrialIds[] = {
   {37, 43},
   {13, 47},
   {23, 17}
@@ -73,7 +74,7 @@ class TestMetricsLog : public MetricsLog {
   }
 
   virtual void GetFieldTrialIds(
-      std::vector<base::FieldTrial::NameGroupId>* field_trial_ids) const
+      std::vector<experiments_helper::SelectedGroupId>* field_trial_ids) const
       OVERRIDE {
     ASSERT_TRUE(field_trial_ids->empty());