Use network time for bad clock interstitial.

components/security_interstitials/core/bad_clock_ui.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/security_interstitials/core/bad_clock_ui.h"
 
 #include "base/i18n/time_formatting.h"
 #include "components/security_interstitials/core/common_string_util.h"
 #include "components/security_interstitials/core/metrics_helper.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+namespace network_time {
+class NetworkTimeTracker;
+}
+
 namespace security_interstitials {
 
-BadClockUI::BadClockUI(const GURL& request_url,
-                       int cert_error,
-                       const net::SSLInfo& ssl_info,
-                       const base::Time& time_triggered,
-                       const std::string& languages,
-                       ControllerClient* controller)
+BadClockUI::BadClockUI(
+    const GURL& request_url, int cert_error, const net::SSLInfo& ssl_info,

[estark, 2016/03/10 20:10:08]

This formatting looks a little strange to me. Do you know about `git cl format`,
and if yes, is this what `git cl format` did? If no, try `git cl format` :)

[mab, 2016/03/11 04:18:41]

Neato.  Done.

+    const base::Time& time_triggered,
+    const network_time::NetworkTimeTracker* network_time_tracker,
+    const std::string& languages, ControllerClient* controller)
     : request_url_(request_url),
       cert_error_(cert_error),
       ssl_info_(ssl_info),
       time_triggered_(time_triggered),
       languages_(languages),
-      controller_(controller) {
+      controller_(controller),
+      network_time_tracker_(network_time_tracker) {
   controller_->metrics_helper()->RecordUserInteraction(
       security_interstitials::MetricsHelper::TOTAL_VISITS);
 
   // TODO(felt): Separate the clock statistics from the main ssl statistics.
-  ssl_errors::RecordUMAStatistics(false, time_triggered_, request_url_,
-                                  cert_error_, *ssl_info_.cert.get());
+  ssl_errors::RecordUMAStatistics(false, time_triggered_, network_time_tracker_,
+                                  request_url_, cert_error_,
+                                  *ssl_info_.cert.get());
 }
 
 BadClockUI::~BadClockUI() {
   controller_->metrics_helper()->RecordShutdownMetrics();
 }
 
 void BadClockUI::PopulateStringsForHTML(base::DictionaryValue* load_time_data) {
   CHECK(load_time_data);
 
   // Shared with other SSL errors.
   common_string_util::PopulateSSLLayoutStrings(cert_error_, load_time_data);
   common_string_util::PopulateSSLDebuggingStrings(ssl_info_, time_triggered_,
                                                   load_time_data);
 
   // Clock-specific strings.
   PopulateClockStrings(load_time_data);
   load_time_data->SetString("finalParagraph", std::string());  // Placeholder.
 }
 
 void BadClockUI::PopulateClockStrings(base::DictionaryValue* load_time_data) {
   load_time_data->SetBoolean("bad_clock", true);
   load_time_data->SetBoolean("overridable", false);
   load_time_data->SetBoolean("hide_primary_button",
                              !controller_->CanLaunchDateAndTimeSettings());
-  int heading_string = ssl_errors::IsUserClockInTheFuture(time_triggered_)
-                           ? IDS_CLOCK_ERROR_AHEAD_HEADING
-                           : IDS_CLOCK_ERROR_BEHIND_HEADING;
+  int heading_string;
+  switch (ssl_errors::GetClockState(time_triggered_, network_time_tracker_)) {
+    case ssl_errors::NETWORK_FUTURE:
+    case ssl_errors::BUILD_FUTURE:
+      heading_string = IDS_CLOCK_ERROR_AHEAD_HEADING;
+      break;
+    case ssl_errors::NETWORK_OK:
+    case ssl_errors::NETWORK_PAST:
+    case ssl_errors::BUILD_PAST:
+    case ssl_errors::UNKNOWN:
+      heading_string = IDS_CLOCK_ERROR_BEHIND_HEADING;

[estark, 2016/03/10 20:10:08]

Eh? NETWORK_OK and UNKNOWN => CLOCK_ERROR_BEHIND?

Should this be an ASSERT_UNREACHED() for NETWORK_OK and UNKNOWN, perhaps?

(Btw, if you don't know about chrome://interstitials, it lets you preview
interstitials without having to do gymnastics to trigger them.)

[mab, 2016/03/11 04:18:41]

It seems ever so slightly unsafe, but, done.

+      break;
+  }
   load_time_data->SetString("tabTitle",
                             l10n_util::GetStringUTF16(IDS_CLOCK_ERROR_TITLE));
   load_time_data->SetString("heading",
                             l10n_util::GetStringUTF16(heading_string));
   load_time_data->SetString(
       "primaryParagraph",
       l10n_util::GetStringFUTF16(
           IDS_CLOCK_ERROR_PRIMARY_PARAGRAPH,
           common_string_util::GetFormattedHostName(request_url_, languages_),
           base::TimeFormatFriendlyDateAndTime(time_triggered_)));
@@ skipping 40 matching lines @@
       NOTREACHED() << "Unsupported command: " << command;
     case CMD_ERROR:
     case CMD_TEXT_FOUND:
     case CMD_TEXT_NOT_FOUND:
       // Commands are only for testing.
       NOTREACHED() << "Unexpected command: " << command;
   }
 }
 
 }  // security_interstitials