Componentize safe_browsing: decouple threat_details* from the chrome/ layer.

chrome/browser/safe_browsing/threat_details.h

Index: chrome/browser/safe_browsing/threat_details.h
diff --git a/chrome/browser/safe_browsing/threat_details.h b/chrome/browser/safe_browsing/threat_details.h
index e5f6ac564a0e2bb60d20678f3a32f35427808deb..19a8c31ab2da9740087a752099e6b92ff97ee454 100644
--- a/chrome/browser/safe_browsing/threat_details.h
+++ b/chrome/browser/safe_browsing/threat_details.h
@@ -20,7 +20,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/safe_browsing/ui_manager.h"
+#include "components/safe_browsing/base_ui_manager.h"

[Jialiu Lin, 2017/04/07 18:42:05]

nit: Maybe use a forward declaration here. and put this include in the
threat_details.cc file?

[timvolodine, 2017/04/10 15:02:55]

yes indeed. done.
(still required unsafe_resource.h and fwd declare of HistoryService)

 #include "components/safe_browsing/common/safebrowsing_types.h"
 #include "components/safe_browsing/csd.pb.h"
 #include "content/public/browser/browser_thread.h"
@@ -31,7 +31,6 @@ namespace net {
 class URLRequestContextGetter;
 }
 
-class Profile;
 struct SafeBrowsingHostMsg_ThreatDOMDetails_Node;
 
 namespace safe_browsing {
@@ -72,9 +71,12 @@ class ThreatDetails : public base::RefCountedThreadSafe<
   typedef security_interstitials::UnsafeResource UnsafeResource;
 
   // Constructs a new ThreatDetails instance, using the factory.
-  static ThreatDetails* NewThreatDetails(BaseUIManager* ui_manager,
-                                         content::WebContents* web_contents,
-                                         const UnsafeResource& resource);
+  static ThreatDetails* NewThreatDetails(
+      BaseUIManager* ui_manager,
+      content::WebContents* web_contents,
+      const UnsafeResource& resource,
+      net::URLRequestContextGetter* request_context_getter,
+      history::HistoryService* history_service);
 
   // Makes the passed |factory| the factory used to instanciate
   // SafeBrowsingBlockingPage objects. Useful for tests.
@@ -104,7 +106,9 @@ class ThreatDetails : public base::RefCountedThreadSafe<
 
   ThreatDetails(BaseUIManager* ui_manager,
                 content::WebContents* web_contents,
-                const UnsafeResource& resource);
+                const UnsafeResource& resource,
+                net::URLRequestContextGetter* request_context_getter,
+                history::HistoryService* history_service);
 
   ~ThreatDetails() override;
 
@@ -114,8 +118,6 @@ class ThreatDetails : public base::RefCountedThreadSafe<
       const GURL& frame_last_committed_url,
       const std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node>& params);
 
-  Profile* profile_;
-
   // The report protocol buffer.
   std::unique_ptr<ClientSafeBrowsingReportRequest> report_;
 
@@ -244,7 +246,9 @@ class ThreatDetailsFactory {
   virtual ThreatDetails* CreateThreatDetails(
       BaseUIManager* ui_manager,
       content::WebContents* web_contents,
-      const SafeBrowsingUIManager::UnsafeResource& unsafe_resource) = 0;
+      const security_interstitials::UnsafeResource& unsafe_resource,
+      net::URLRequestContextGetter* request_context_getter,
+      history::HistoryService* history_service) = 0;
 };
 
 }  // namespace safe_browsing