Navigation throttle for the Safe Browsing Subresource Filter.

components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h

Index: components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h
index 29a7e73d22e7fb92f6ef44911b5ccbdde2575381..f70fe9f739e1a996bd89c9870ee78527eca5fa4d 100644
--- a/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h
+++ b/components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h
@@ -51,17 +51,24 @@ class ContentSubresourceFilterDriverFactory
       safe_browsing::ThreatPatternType threat_type);
   const OriginSet& activation_set() { return activate_on_origins_; }

[engedy, 2016/06/23 22:34:17]

Can this and the one below be made const?

[melandory, 2016/06/25 01:46:07]

Done.

   bool ShouldActivateForURL(const GURL& url);
+  void AddToSocEngList(const GURL& url);

[engedy, 2016/06/23 22:34:17]

s//AddOriginOfURLToActivationSet/ for consistency.

[melandory, 2016/06/25 01:46:07]

Done.

+
+  ContentSubresourceFilterDriver* DriverFromFrameHost(
+      content::RenderFrameHost* render_frame_host);
 
  private:
+  friend class SubresourceFilterNavigationThrottleTest;
+
   typedef std::map<content::RenderFrameHost*,
                    std::unique_ptr<ContentSubresourceFilterDriver>>
       FrameHostToOwnedDriverMap;
 
+  void TestingSetDriverForFrame(

[engedy, 2016/06/23 22:34:17]

nit: I think a more traditional naming convention is
SetDriverForFrameHostForTesting (also note the `Host`).

[melandory, 2016/06/25 01:46:08]

Done.

+      content::RenderFrameHost* render_frame_host,
+      std::unique_ptr<ContentSubresourceFilterDriver> driver);
+
   void CreateDriverForFrameHostIfNeeded(
       content::RenderFrameHost* render_frame_host);
-  ContentSubresourceFilterDriver* DriverFromFrameHost(
-      content::RenderFrameHost* render_frame_host);
-
   // content::WebContentsObserver:
   void RenderFrameCreated(content::RenderFrameHost* render_frame_host) override;
   void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;