Remove the hash fields from FieldTrials.

chrome/browser/metrics/metrics_log_unittest.cc

 // 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.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/metrics/metrics_log.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/common/metrics/experiments_helper.h"
 #include "chrome/common/metrics/proto/system_profile.pb.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/size.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using base::TimeDelta;
 
 namespace {
 
 const char kClientId[] = "bogus client ID";
 const int kSessionId = 127;
 const int kScreenWidth = 1024;
 const int kScreenHeight = 768;
 const int kScreenCount = 3;
-const base::FieldTrial::NameGroupId kFieldTrialIds[] = {
+const experiments_helper::NameGroupId kFieldTrialIds[] = {
   {37, 43},
   {13, 47},
   {23, 17}
 };
 
 class TestMetricsLog : public MetricsLog {
  public:
   TestMetricsLog(const std::string& client_id, int session_id)
       : MetricsLog(client_id, session_id) {
     browser::RegisterLocalState(&prefs_);
@@ skipping 14 matching lines @@
   const metrics::SystemProfileProto& system_profile() const {
     return uma_proto()->system_profile();
   }
 
  private:
   virtual std::string GetCurrentTimeString() OVERRIDE {
     return std::string();
   }
 
   virtual void GetFieldTrialIds(
-      std::vector<base::FieldTrial::NameGroupId>* field_trial_ids) const
+      std::vector<experiments_helper::NameGroupId>* field_trial_ids) const
       OVERRIDE {
     ASSERT_TRUE(field_trial_ids->empty());
 
     for (size_t i = 0; i < arraysize(kFieldTrialIds); ++i) {
       field_trial_ids->push_back(kFieldTrialIds[i]);
     }
   }
 
   virtual gfx::Size GetScreenSize() const OVERRIDE {
     return gfx::Size(kScreenWidth, kScreenHeight);
@@ skipping 74 matching lines @@
   EXPECT_NE(std::string::npos,
             encoded.find(" childprocesscrashcount=\"10\""));
   EXPECT_EQ(std::string::npos,
             encoded.find(" otherusercrashcount="));
   EXPECT_EQ(std::string::npos,
             encoded.find(" kernelcrashcount="));
   EXPECT_EQ(std::string::npos,
             encoded.find(" systemuncleanshutdowns="));
 }
 #endif  // OS_CHROMEOS