Add interstitial info to certificate reports

chrome/browser/safe_browsing/ui_manager.h

 // Copyright (c) 2012 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.
 //
 // The Safe Browsing service is responsible for downloading anti-phishing and
 // anti-malware tables and checking urls against them.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "content/public/browser/notification_observer.h"
 #include "url/gurl.h"
 
 class SafeBrowsingService;
 
 namespace base {
 class Thread;
 }  // namespace base
 
+namespace chrome_browser_net {
+class CertLoggerRequest;
+}
+
 namespace net {
 class SSLInfo;
 }  // namespace net
 
 // Construction needs to happen on the main thread.
 class SafeBrowsingUIManager
     : public base::RefCountedThreadSafe<SafeBrowsingUIManager> {
  public:
   // Passed a boolean indicating whether or not it is OK to proceed with
   // loading an URL.
@@ skipping 84 matching lines @@
   // non-empty, the request will be sent as a POST instead of a GET.
   virtual void ReportSafeBrowsingHit(const GURL& malicious_url,
                                      const GURL& page_url,
                                      const GURL& referrer_url,
                                      bool is_subresource,
                                      SBThreatType threat_type,
                                      const std::string& post_data);
 
   // Report an invalid TLS/SSL certificate chain to the server. Can only
   // be called on UI thread.
-  void ReportInvalidCertificateChain(const std::string& hostname,
-                                     const net::SSLInfo& ssl_info,
-                                     const base::Closure& callback);
+  void ReportInvalidCertificateChain(
+      const chrome_browser_net::CertLoggerRequest& report,
+      const base::Closure& callback);
 
   // Add and remove observers.  These methods must be invoked on the UI thread.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* remove);
 
  protected:
   virtual ~SafeBrowsingUIManager();
 
  private:
   friend class base::RefCountedThreadSafe<SafeBrowsingUIManager>;
 
   // Used for whitelisting a render view when the user ignores our warning.
   struct WhiteListedEntry;
 
   // Call protocol manager on IO thread to report hits of unsafe contents.
   void ReportSafeBrowsingHitOnIOThread(const GURL& malicious_url,
                                        const GURL& page_url,
                                        const GURL& referrer_url,
                                        bool is_subresource,
                                        SBThreatType threat_type,
                                        const std::string& post_data);
 
   // Sends an invalid certificate chain report over the network.
-  void ReportInvalidCertificateChainOnIOThread(const std::string& hostname,
-                                               const net::SSLInfo& ssl_info);
+  void ReportInvalidCertificateChainOnIOThread(
+      const chrome_browser_net::CertLoggerRequest& report);
 
   // Adds the given entry to the whitelist.  Called on the UI thread.
   void UpdateWhitelist(const UnsafeResource& resource);
 
   // Safebrowsing service.
   scoped_refptr<SafeBrowsingService> sb_service_;
 
   // Only access this whitelist from the UI thread.
   std::vector<WhiteListedEntry> white_listed_entries_;
 
   ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingUIManager);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_