Fix problem where field trials using kExpirationYearInFuture could get disabled.

chrome/common/metrics/entropy_provider_unittest.cc

Index: chrome/common/metrics/entropy_provider_unittest.cc
===================================================================
--- chrome/common/metrics/entropy_provider_unittest.cc	(revision 175535)
+++ chrome/common/metrics/entropy_provider_unittest.cc	(working copy)
@@ -192,9 +192,9 @@
   base::FieldTrialList field_trial_list(new SHA1EntropyProvider("client_id"));
   scoped_refptr<base::FieldTrial> trials[] = {
       base::FieldTrialList::FactoryGetFieldTrial("one", 100, "default",
-          base::FieldTrialList::kExpirationYearInFuture, 1, 1, NULL),
+          base::FieldTrialList::kExpirationYearNotExpired, 1, 1, NULL),
       base::FieldTrialList::FactoryGetFieldTrial("two", 100, "default",
-          base::FieldTrialList::kExpirationYearInFuture, 1, 1, NULL) };
+          base::FieldTrialList::kExpirationYearNotExpired, 1, 1, NULL) };
 
   for (size_t i = 0; i < arraysize(trials); ++i) {
     trials[i]->UseOneTimeRandomization();
@@ -220,9 +220,9 @@
       new PermutedEntropyProvider(1234, kMaxLowEntropySize));
   scoped_refptr<base::FieldTrial> trials[] = {
       base::FieldTrialList::FactoryGetFieldTrial("one", 100, "default",
-          base::FieldTrialList::kExpirationYearInFuture, 1, 1, NULL),
+          base::FieldTrialList::kExpirationYearNotExpired, 1, 1, NULL),
       base::FieldTrialList::FactoryGetFieldTrial("two", 100, "default",
-          base::FieldTrialList::kExpirationYearInFuture, 1, 1, NULL) };
+          base::FieldTrialList::kExpirationYearNotExpired, 1, 1, NULL) };
 
   for (size_t i = 0; i < arraysize(trials); ++i) {
     trials[i]->UseOneTimeRandomization();