Makes GetBuildTime behave identically on all build types.

components/ssl_errors/error_classification.cc

 // Copyright 2015 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 "components/ssl_errors/error_classification.h"
 
 #include <limits.h>
 #include <stddef.h>
 
 #include <vector>
@@ skipping 194 matching lines @@
   UMA_HISTOGRAM_ENUMERATION("interstitial.ssl.connection_type",
                             net::NetworkChangeNotifier::GetConnectionType(),
                             net::NetworkChangeNotifier::CONNECTION_LAST);
 }
 
 bool IsUserClockInThePast(const base::Time& time_now) {
   base::Time build_time;
   if (!g_testing_build_time.Get().is_null()) {
     build_time = g_testing_build_time.Get();
   } else {
-#if defined(DONT_EMBED_BUILD_METADATA) && !defined(OFFICIAL_BUILD)

[agl, 2016/01/29 21:46:46]

This (and below) needs careful consideration about when
DONT_EMBED_BUILD_METADATA was defined. You might need felt or estark to sign off
on this.

-    return false;
-#else
     build_time = base::GetBuildTime();
-#endif
   }
 
   if (time_now < build_time - base::TimeDelta::FromDays(2))
     return true;
   return false;
 }
 
 bool IsUserClockInTheFuture(const base::Time& time_now) {
   base::Time build_time;
   if (!g_testing_build_time.Get().is_null()) {
     build_time = g_testing_build_time.Get();
   } else {
-#if defined(DONT_EMBED_BUILD_METADATA) && !defined(OFFICIAL_BUILD)
-    return false;
-#else
     build_time = base::GetBuildTime();
-#endif
   }
 
   if (time_now > build_time + base::TimeDelta::FromDays(365))
     return true;
   return false;
 }
 
 void SetBuildTimeForTesting(const base::Time& testing_time) {
   g_testing_build_time.Get() = testing_time;
 }
@@ skipping 169 matching lines @@
   return std::find(dns_names_domain.begin(), dns_names_domain.end() - 1,
                    host_name_domain) != dns_names_domain.end() - 1;
 }
 
 bool IsHostnameNonUniqueOrDotless(const std::string& hostname) {
   return net::IsHostnameNonUnique(hostname) ||
          hostname.find('.') == std::string::npos;
 }
 
 }  // namespace ssl_errors