If we show a SafeBrowsing warning we always send the client-side detection

chrome/browser/safe_browsing/client_side_detection_host.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 CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_
 #define CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/safe_browsing/browser_feature_extractor.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+#include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
 class NotificationDetails;
 class NotificationSource;
 class TabContents;
 
 namespace safe_browsing {
 class ClientPhishingRequest;
 class ClientSideDetectionService;
 
 // This class is used to receive the IPC from the renderer which
 // notifies the browser that a URL was classified as phishing.  This
 // class relays this information to the client-side detection service
 // class which sends a ping to a server to validate the verdict.
 // TODO(noelutz): move all client-side detection IPCs to this class.
 class ClientSideDetectionHost : public TabContentsObserver,
-                                public NotificationObserver {
+                                public NotificationObserver,
+                                public SafeBrowsingService::Observer {
  public:
   // The caller keeps ownership of the tab object and is responsible for
   // ensuring that it stays valid until TabContentsDestroyed is called.
   static ClientSideDetectionHost* Create(TabContents* tab);
   virtual ~ClientSideDetectionHost();
 
   // From TabContentsObserver.
   virtual bool OnMessageReceived(const IPC::Message& message);
 
   // From TabContentsObserver.  If we navigate away we cancel all pending
   // callbacks that could show an interstitial, and check to see whether
   // we should classify the new URL.
   virtual void DidNavigateMainFramePostCommit(
       const content::LoadCommittedDetails& details,
       const ViewHostMsg_FrameNavigate_Params& params);
 
+  // Called when the SafeBrowsingService found a hit with one of the
+  // SafeBrowsing lists.  This method is called on the UI thread.
+  virtual void OnSafeBrowsingHit(
+      const SafeBrowsingService::UnsafeResource& resource);
+
  protected:
   // From TabContentsObserver.  Called when the TabContents is being destroyed.
   virtual void TabContentsDestroyed(TabContents* tab);
 
  private:
   friend class ClientSideDetectionHostTest;
   class ShouldClassifyUrlRequest;
   friend class ShouldClassifyUrlRequest;
 
   explicit ClientSideDetectionHost(TabContents* tab);
 
   // Verdict is an encoded ClientPhishingRequest protocol message.
-  void OnDetectedPhishingSite(const std::string& verdict);
+  void OnPhishingDetectionDone(const std::string& verdict);
 
   // Callback that is called when the server ping back is
   // done. Display an interstitial if |is_phishing| is true.
   // Otherwise, we do nothing.  Called in UI thread.
   void MaybeShowPhishingWarning(GURL phishing_url, bool is_phishing);
 
   // Callback that is called when the browser feature extractor is done.
   // This method is responsible for deleting the request object.  Called on
   // the UI thread.
   void FeatureExtractionDone(bool success, ClientPhishingRequest* request);
 
   // From NotificationObserver.  Called when a notification comes in.  This
   // method is called in the UI thread.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
+  // Returns true if the user has seen a regular SafeBrowsing
+  // interstitial for the current page.  This is only true if the user has
+  // actually clicked through the warning.  this method is called on the UI

[Garrett Casto, 2011/07/19 21:18:48]

this -> This

[Brian Ryner, 2011/07/19 21:27:10]

Capitalize "this".

[noelutz, 2011/07/19 22:28:08]

Done.

[noelutz, 2011/07/19 22:28:08]

Done.

+  // thread.
+  bool DidShowSBInterstitial();
+
   // Used for testing.  This function does not take ownership of the service
   // class.
   void set_client_side_detection_service(ClientSideDetectionService* service);
 
   // Used for testing.  This function does not take ownership of the service
   // class.
   void set_safe_browsing_service(SafeBrowsingService* service);
 
   // This pointer may be NULL if client-side phishing detection is disabled.
   ClientSideDetectionService* csd_service_;
   // This pointer may be NULL if SafeBrowsing is disabled.
   scoped_refptr<SafeBrowsingService> sb_service_;
   // Keep a handle to the latest classification request so that we can cancel
   // it if necessary.
   scoped_refptr<ShouldClassifyUrlRequest> classification_request_;
   // Browser-side feature extractor.
   scoped_ptr<BrowserFeatureExtractor> feature_extractor_;
   // Keeps some info about the current page visit while the renderer
   // classification is going on.  Since we cancel classification on
   // every page load we can simply keep this data around as a member
   // variable.  This information will be passed on to the feature extractor.
   scoped_ptr<BrowseInfo> browse_info_;
   // Handles registering notifications with the NotificationService.
   NotificationRegistrar registrar_;
 
   base::ScopedCallbackFactory<ClientSideDetectionHost> cb_factory_;
 
+  // Unique page ID of the most recent unsafe site that was loaded in this tab.
+  int unsafe_unique_page_id_;
+
   DISALLOW_COPY_AND_ASSIGN(ClientSideDetectionHost);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_CLIENT_SIDE_DETECTION_HOST_H_