Componentize safe_browsing: factor out chrome/ deps in ThreatDetailsRedirectsCollector.

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/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 141 matching lines @@
                              const UnsafeResource& resource)
     : content::WebContentsObserver(web_contents),
       profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())),
       request_context_getter_(profile_->GetRequestContext()),
       ui_manager_(ui_manager),
       resource_(resource),
       cache_result_(false),
       did_proceed_(false),
       num_visits_(0),
       ambiguous_dom_(false),
-      cache_collector_(new ThreatDetailsCacheCollector),
-      redirects_collector_(new ThreatDetailsRedirectsCollector(profile_)) {
+      cache_collector_(new ThreatDetailsCacheCollector) {
+  history::HistoryService* history_service =
+      HistoryServiceFactory::GetForProfile(profile_,
+                                           ServiceAccessType::EXPLICIT_ACCESS);
+  redirects_collector_ = new ThreatDetailsRedirectsCollector(

[Jialiu Lin, 2017/04/05 18:19:47]

If history_service is not available, maybe we don't need to create
ThreatDetailsRedirectsCollector at all.
How about 
 redirects_collector_ = history_service ?
     new ThreatDetailsRedirectsCollector(                    
         history_service->AsWeakPtr()) : nullptr;


And every time redirects_collector_ is called, do a check first.

[timvolodine, 2017/04/06 14:15:23]

Yes that would seem reasonable, because the redirects_collector_ doesn't do much
when there is no history_service. However simply checking for
redirects_collector != null does not seem sufficient as its callback is used for
further starting cache collection (in OnRedirectionCollectionReady, so this
would need more refactoring of the code. Maybe something for a separate patch..

+      history_service ? history_service->AsWeakPtr()
+                      : base::WeakPtr<history::HistoryService>());
   StartCollection();
 }
 
 ThreatDetails::~ThreatDetails() {}
 
 bool ThreatDetails::OnMessageReceived(const IPC::Message& message,
                                       RenderFrameHost* render_frame_host) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(ThreatDetails, message, render_frame_host)
     IPC_MESSAGE_HANDLER(SafeBrowsingHostMsg_ThreatDOMDetails,
@@ skipping 389 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