Change dont_embed_build_metadata default to 1 except for Official build and fix some unittests.

base/metrics/field_trial_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 "base/metrics/field_trial.h"
 
+#include "base/build_time.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 namespace {
 
 // Default group name used by several tests.
 const char kDefaultGroupName[] = "DefaultGroup";
 
 // Call FieldTrialList::FactoryGetFieldTrial() with a future expiry date.
 scoped_refptr<base::FieldTrial> CreateFieldTrial(
     const std::string& trial_name,
     int total_probability,
     const std::string& default_group_name,
     int* default_group_number) {
   return FieldTrialList::FactoryGetFieldTrial(
       trial_name, total_probability, default_group_name,
       base::FieldTrialList::kNoExpirationYear, 1, 1,
       base::FieldTrial::SESSION_RANDOMIZED, default_group_number);
 }
 
-int GetLastYear() {
-  Time last_year_time = Time::NowFromSystemTime() - TimeDelta::FromDays(365);
+int OneYearBeforeBuildTime() {
+  Time one_year_before_build_time = GetBuildTime() - TimeDelta::FromDays(365);
   Time::Exploded exploded;
-  last_year_time.LocalExplode(&exploded);
+  one_year_before_build_time.LocalExplode(&exploded);
   return exploded.year;
 }
 
 // FieldTrialList::Observer implementation for testing.
 class TestFieldTrialObserver : public FieldTrialList::Observer {
  public:
   TestFieldTrialObserver() {
     FieldTrialList::AddObserver(this);
   }
 
@@ skipping 195 matching lines @@
 }
 
 TEST_F(FieldTrialTest, DisableProbability) {
   const std::string default_group_name = "Default group";
   const std::string loser = "Loser";
   const std::string name = "Trial";
 
   // Create a field trail that has expired.
   int default_group_number = -1;
   FieldTrial* trial = FieldTrialList::FactoryGetFieldTrial(
-      name, 1000000000, default_group_name, GetLastYear(), 1, 1,
+      name, 1000000000, default_group_name, OneYearBeforeBuildTime(), 1, 1,
       FieldTrial::SESSION_RANDOMIZED,
       &default_group_number);
   trial->AppendGroup(loser, 999999999);  // 99.9999999% chance of being chosen.
 
   // Because trial has expired, we should always be in the default group.
   EXPECT_EQ(default_group_number, trial->group());
 
   // And that default_group_name should ALWAYS win.
   EXPECT_EQ(default_group_name, trial->group_name());
 }
@@ skipping 732 matching lines @@
   // Trying to instantiate a one-time randomized field trial before the
   // FieldTrialList is created should crash.
   EXPECT_DEATH(FieldTrialList::FactoryGetFieldTrial(
       "OneTimeRandomizedTrialWithoutFieldTrialList", 100, kDefaultGroupName,
       base::FieldTrialList::kNoExpirationYear, 1, 1,
       base::FieldTrial::ONE_TIME_RANDOMIZED, NULL), "");
 }
 #endif
 
 }  // namespace base