net: make HSTS hosts use the normal SSL interstitials

webkit/fileapi/file_writer_delegate.h

 // Copyright (c) 2011 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.
 
 #ifndef WEBKIT_FILEAPI_FILE_WRITER_DELEGATE_H_
 #define WEBKIT_FILEAPI_FILE_WRITER_DELEGATE_H_
 
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_callback_factory.h"
@@ skipping 20 matching lines @@
       int64 offset,
       scoped_refptr<base::MessageLoopProxy> proxy);
   virtual ~FileWriterDelegate();
 
   void Start(base::PlatformFile file,
              net::URLRequest* request);
   base::PlatformFile file() {
     return file_;
   }
 
-  virtual void OnReceivedRedirect(
-      net::URLRequest* request, const GURL& new_url, bool* defer_redirect);
-  virtual void OnAuthRequired(
-      net::URLRequest* request, net::AuthChallengeInfo* auth_info);
+  virtual void OnReceivedRedirect(net::URLRequest* request,
+                                  const GURL& new_url,
+                                  bool* defer_redirect) OVERRIDE;
+  virtual void OnAuthRequired(net::URLRequest* request,
+                              net::AuthChallengeInfo* auth_info) OVERRIDE;
   virtual void OnCertificateRequested(
-      net::URLRequest* request, net::SSLCertRequestInfo* cert_request_info);
-  virtual void OnSSLCertificateError(
-      net::URLRequest* request, int cert_error, net::X509Certificate* cert);
-  virtual void OnResponseStarted(net::URLRequest* request);
-  virtual void OnReadCompleted(net::URLRequest* request, int bytes_read);
+      net::URLRequest* request,
+      net::SSLCertRequestInfo* cert_request_info) OVERRIDE;
+  virtual void OnSSLCertificateError(net::URLRequest* request,
+                                     const net::SSLInfo& ssl_info,
+                                     bool must_be_fatal) OVERRIDE;

[wtc, 2011/09/26 19:15:10]

must_be_fatal => is_hsts_host

+  virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
+  virtual void OnReadCompleted(net::URLRequest* request,
+                               int bytes_read) OVERRIDE;
 
  private:
   void OnGetFileInfoAndCallStartUpdate(
       base::PlatformFileError error,
       const base::PlatformFileInfo& file_info);
   void Read();
   void OnDataReceived(int bytes_read);
   void Write();
   void OnDataWritten(int write_response);
   void OnError(base::PlatformFileError error);
@@ skipping 17 matching lines @@
   scoped_ptr<net::FileStream> file_stream_;
   net::URLRequest* request_;
   net::CompletionCallbackImpl<FileWriterDelegate> io_callback_;
   ScopedRunnableMethodFactory<FileWriterDelegate> method_factory_;
   base::ScopedCallbackFactory<FileWriterDelegate> callback_factory_;
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_WRITER_DELEGATE_H_