Remove the hash fields from FieldTrials.

chrome/browser/metrics/metrics_log.h

 // Copyright (c) 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.
 
 // This file defines a set of user experience metrics data recorded by
 // the MetricsService.  This is the unit of data that is sent to the server.
 
 #ifndef CHROME_BROWSER_METRICS_METRICS_LOG_H_
 #define CHROME_BROWSER_METRICS_METRICS_LOG_H_
 #pragma once
 
 #include <string>
 #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"
 
 struct AutocompleteLog;
 class PrefService;
 
 namespace base {
 class DictionaryValue;
 }
 
@@ skipping 62 matching lines @@
 
   // Returns the screen size for the primary monitor.
   virtual gfx::Size GetScreenSize() const;
 
   // Returns the number of monitors the user is using.
   virtual int GetScreenCount() const;
 
   // 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);
 
   // Writes application stability metrics (as part of the profile log).
   // NOTE: Has the side-effect of clearing those counts.
   void WriteStabilityElement(
       const std::vector<webkit::WebPluginInfo>& plugin_list,
       PrefService* pref);
 
@@ skipping 27 matching lines @@
 
   // Writes metrics for the profile identified by key. This writes all
   // key/value pairs in profile_metrics.
   void WriteProfileMetrics(const std::string& key,
                            const base::DictionaryValue& profile_metrics);
 
   DISALLOW_COPY_AND_ASSIGN(MetricsLog);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_LOG_H_