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

chrome/browser/safe_browsing/threat_details.cc

 // 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.
 //
 // Implementation of the ThreatDetails class.
 
 #include "chrome/browser/safe_browsing/threat_details.h"
 
 #include <stddef.h>
 #include <stdint.h>
-#include <unordered_set>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
-#include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/threat_details_cache.h"
 #include "chrome/browser/safe_browsing/threat_details_history.h"
 #include "components/history/core/browser/history_service.h"
+#include "components/safe_browsing/base_ui_manager.h"
 #include "components/safe_browsing/common/safebrowsing_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserThread;
 using content::NavigationEntry;
@@ skipping 100 matching lines @@
 
 }  // namespace
 
 // The default ThreatDetailsFactory.  Global, made a singleton so we
 // don't leak it.
 class ThreatDetailsFactoryImpl : public ThreatDetailsFactory {
  public:
   ThreatDetails* CreateThreatDetails(
       BaseUIManager* ui_manager,
       WebContents* web_contents,
-      const security_interstitials::UnsafeResource& unsafe_resource) override {
-    return new ThreatDetails(ui_manager, web_contents, unsafe_resource);
+      const security_interstitials::UnsafeResource& unsafe_resource,
+      net::URLRequestContextGetter* request_context_getter,
+      history::HistoryService* history_service) override {
+    return new ThreatDetails(ui_manager, web_contents, unsafe_resource,
+                             request_context_getter, history_service);
   }
 
  private:
   friend struct base::LazyInstanceTraitsBase<ThreatDetailsFactoryImpl>;
 
   ThreatDetailsFactoryImpl() {}
 
   DISALLOW_COPY_AND_ASSIGN(ThreatDetailsFactoryImpl);
 };
 
 static base::LazyInstance<ThreatDetailsFactoryImpl>::DestructorAtExit
     g_threat_details_factory_impl = LAZY_INSTANCE_INITIALIZER;
 
 // Create a ThreatDetails for the given tab.
 /* static */
 ThreatDetails* ThreatDetails::NewThreatDetails(
     BaseUIManager* ui_manager,
     WebContents* web_contents,
-    const UnsafeResource& resource) {
+    const UnsafeResource& resource,
+    net::URLRequestContextGetter* request_context_getter,
+    history::HistoryService* history_service) {
   // Set up the factory if this has not been done already (tests do that
   // before this method is called).
   if (!factory_)
     factory_ = g_threat_details_factory_impl.Pointer();
-  return factory_->CreateThreatDetails(ui_manager, web_contents, resource);
+  return factory_->CreateThreatDetails(ui_manager, web_contents, resource,
+                                       request_context_getter, history_service);
 }
 
 // Create a ThreatDetails for the given tab. Runs in the UI thread.
-ThreatDetails::ThreatDetails(BaseUIManager* ui_manager,
-                             content::WebContents* web_contents,
-                             const UnsafeResource& resource)
+ThreatDetails::ThreatDetails(
+    BaseUIManager* ui_manager,
+    content::WebContents* web_contents,
+    const UnsafeResource& resource,
+    net::URLRequestContextGetter* request_context_getter,
+    history::HistoryService* history_service)
     : content::WebContentsObserver(web_contents),
-      profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())),
-      request_context_getter_(profile_->GetRequestContext()),
+      request_context_getter_(request_context_getter),
       ui_manager_(ui_manager),
       resource_(resource),
       cache_result_(false),
       did_proceed_(false),
       num_visits_(0),
       ambiguous_dom_(false),
       cache_collector_(new ThreatDetailsCacheCollector) {
-  history::HistoryService* history_service =
-      HistoryServiceFactory::GetForProfile(profile_,
-                                           ServiceAccessType::EXPLICIT_ACCESS);
   redirects_collector_ = new ThreatDetailsRedirectsCollector(
       history_service ? history_service->AsWeakPtr()
                       : base::WeakPtr<history::HistoryService>());
   StartCollection();
 }
 
 ThreatDetails::~ThreatDetails() {}
 
 bool ThreatDetails::OnMessageReceived(const IPC::Message& message,
                                       RenderFrameHost* render_frame_host) {
@@ skipping 392 matching lines @@
   // Send the report, using the SafeBrowsingService.
   std::string serialized;
   if (!report_->SerializeToString(&serialized)) {
     DLOG(ERROR) << "Unable to serialize the threat report.";
     return;
   }
   ui_manager_->SendSerializedThreatDetails(serialized);
 }
 
 }  // namespace safe_browsing