Remove the hash fields from FieldTrials.

chrome/browser/metrics/metrics_log.h

Index: chrome/browser/metrics/metrics_log.h
diff --git a/chrome/browser/metrics/metrics_log.h b/chrome/browser/metrics/metrics_log.h
index 400a2c634cd9e4bfbd14efe76266132fc45a3ce7..ff682057e6440f5e14c78033823799a41c517f6f 100644
--- a/chrome/browser/metrics/metrics_log.h
+++ b/chrome/browser/metrics/metrics_log.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/metrics/field_trial.h"
+#include "chrome/common/metrics/experiments_helper.h"
 #include "chrome/common/metrics/metrics_log_base.h"
 #include "ui/gfx/size.h"
 
@@ -96,7 +96,7 @@ class MetricsLog : public MetricsLogBase {
   // Fills |field_trial_ids| with the list of initialized field trials name and
   // group ids.
   virtual void GetFieldTrialIds(
-    std::vector<base::FieldTrial::NameGroupId>* field_trial_ids) const;
+    std::vector<experiments_helper::NameGroupId>* field_trial_ids) const;

[Ilya Sherman, 2012/04/25 20:26:57]

nit: Can we forward-declare this rather than #inlcuding the header?

[SteveT, 2012/04/26 19:03:31]

Yes! I didn't think we could, since NameGroupId isn't a ptr or ref here, but
turns out it's OK as it's a template argument. Thanks  :)

 
  private:
   FRIEND_TEST_ALL_PREFIXES(MetricsLogTest, ChromeOSStabilityData);