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

chrome/browser/ssl/ssl_error_classification.cc

 // Copyright 2014 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 <vector>
 
 #include "chrome/browser/ssl/ssl_error_classification.h"
 
 #include "base/build_time.h"
 #include "base/metrics/field_trial.h"
@@ skipping 335 matching lines @@
   // Assume if captive portals are detected then the user is connected using a
   // hot spot.
   static const float kHotspotWeight = 0.2f;
   if (captive_portal_probe_completed_ && captive_portal_detected_)
       return kHotspotWeight;
 #endif
   return kOtherWeight;
 }
 
 bool SSLErrorClassification::IsUserClockInThePast(const base::Time& time_now) {
+#if defined(OFFICIAL_BUILD)

[M-A Ruel, 2014/10/30 21:09:07]

Why not use for consistency?
#if defined(DONT_EMBED_BUILD_METADATA) && !defined(OFFICIAL_BUILD)

[Sébastien Marchand, 2014/10/30 21:14:05]

Done.

   base::Time build_time = base::GetBuildTime();
   if (time_now < build_time - base::TimeDelta::FromDays(2))
     return true;
+#endif
   return false;
 }
 
 bool SSLErrorClassification::IsUserClockInTheFuture(
     const base::Time& time_now) {
+#if defined(OFFICIAL_BUILD)
   base::Time build_time = base::GetBuildTime();
   if (time_now > build_time + base::TimeDelta::FromDays(365))
     return true;
+#endif
   return false;
 }
 
 bool SSLErrorClassification::MaybeWindowsLacksSHA256Support() {
 #if defined(OS_WIN)
   return !base::win::MaybeHasSHA256Support();
 #else
   return false;
 #endif
 }
@@ skipping 216 matching lines @@
     // sure we don't clear the captive protal flag, since the interstitial was
     // potentially caused by the captive portal.
     captive_portal_detected_ = captive_portal_detected_ ||
         (results->result == captive_portal::RESULT_BEHIND_CAPTIVE_PORTAL);
     // Also keep track of non-HTTP portals and error cases.
     captive_portal_no_response_ = captive_portal_no_response_ ||
         (results->result == captive_portal::RESULT_NO_RESPONSE);
   }
 #endif
 }