Use network time for bad clock interstitial.

chrome/browser/ui/webui/interstitials/interstitial_ui.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 "chrome/browser/ui/webui/interstitials/interstitial_ui.h"
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 138 matching lines @@
                                  &overridable_param)) {
     overridable = overridable_param == "1";
   }
   std::string strict_enforcement_param;
   if (net::GetValueForKeyInQuery(web_contents->GetURL(), "strict_enforcement",
                                  &strict_enforcement_param)) {
     strict_enforcement = strict_enforcement_param == "1";
   }
 
   // Determine whether to change the clock to be ahead or behind.
-  base::Time time_triggered_ = base::Time::NowFromSystemTime();
   std::string clock_manipulation_param;
+  ssl_errors::ClockState clock_state = ssl_errors::CLOCK_STATE_PAST;
   if (net::GetValueForKeyInQuery(web_contents->GetURL(), "clock_manipulation",
                                  &clock_manipulation_param)) {
     int time_offset;
-    if (!base::StringToInt(clock_manipulation_param, &time_offset))
-      time_offset = 2;
-    time_triggered_ += base::TimeDelta::FromDays(365 * time_offset);
+    if (base::StringToInt(clock_manipulation_param, &time_offset)) {
+      clock_state = time_offset > 0 ? ssl_errors::CLOCK_STATE_FUTURE
+                                    : ssl_errors::CLOCK_STATE_PAST;
+    }
   }
 
   net::SSLInfo ssl_info;
   ssl_info.cert = new net::X509Certificate(
       request_url.host(), "CA", base::Time::Max(), base::Time::Max());
   // This delegate doesn't create an interstitial.
   int options_mask = 0;
   if (overridable)
     options_mask |= security_interstitials::SSLErrorUI::SOFT_OVERRIDE_ENABLED;
   if (strict_enforcement)
     options_mask |= security_interstitials::SSLErrorUI::STRICT_ENFORCEMENT;
   return new BadClockBlockingPage(web_contents, cert_error, ssl_info,
-                                  request_url, time_triggered_, nullptr,
-                                  base::Callback<void(bool)>());
+                                  request_url, base::Time::Now(), clock_state,
+                                  nullptr, base::Callback<void(bool)>());
 }
 
 safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
     content::WebContents* web_contents) {
   safe_browsing::SBThreatType threat_type =
       safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
   GURL request_url("http://example.com");
   std::string url_param;
   if (net::GetValueForKeyInQuery(web_contents->GetURL(),
                                  "url",
@@ skipping 147 matching lines @@
     html = interstitial_delegate.get()->GetHTMLContents();
   } else {
     html = ResourceBundle::GetSharedInstance()
                           .GetRawDataResource(IDR_SECURITY_INTERSTITIAL_UI_HTML)
                           .as_string();
   }
   scoped_refptr<base::RefCountedString> html_bytes = new base::RefCountedString;
   html_bytes->data().assign(html.begin(), html.end());
   callback.Run(html_bytes.get());
 }