Remove GURL member from SubresourceFilterSafeBrowsingClientRequest

It served no purpose, except to copy bytes around.

Bug: 779914
Change-Id: I45d2bcee9c1efba6fb843bde365a094c10142ae1
Reviewed-on: https://chromium-review.googlesource.com/745843Reviewed-by: Varun Khaneja <vakh@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512952}

components/subresource_filter/content/browser/subresource_filter_safe_browsing_client.cc

@@ -50,7 +50,7 @@ void SubresourceFilterSafeBrowsingClient::CheckUrlOnIO(const GURL& url,
   DCHECK(!url.is_empty());
 
   auto request = base::MakeUnique<SubresourceFilterSafeBrowsingClientRequest>(
-      url, request_id, database_manager_, io_task_runner_, this);
+      request_id, database_manager_, io_task_runner_, this);
   auto* raw_request = request.get();
   DCHECK(requests_.find(raw_request) == requests_.end());
   requests_[raw_request] = std::move(request);
@@ -58,7 +58,7 @@ void SubresourceFilterSafeBrowsingClient::CheckUrlOnIO(const GURL& url,
                            "SubresourceFilterSBCheck", raw_request,
                            "check_result",
                            base::MakeUnique<base::trace_event::TracedValue>());
-  raw_request->Start();
+  raw_request->Start(url);
   // Careful, |raw_request| can be destroyed after this line.
 }
 

components/subresource_filter/content/browser/subresource_filter_safe_browsing_client_request.cc

@@ -14,6 +14,7 @@
 #include "base/single_thread_task_runner.h"
 #include "components/subresource_filter/content/browser/subresource_filter_safe_browsing_client.h"
 #include "content/public/browser/browser_thread.h"
+#include "url/gurl.h"
 
 namespace subresource_filter {
 
@@ -22,14 +23,12 @@ constexpr base::TimeDelta
 
 SubresourceFilterSafeBrowsingClientRequest::
     SubresourceFilterSafeBrowsingClientRequest(
-        const GURL& url,
         size_t request_id,
         scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
             database_manager,
         scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
         SubresourceFilterSafeBrowsingClient* client)
-    : url_(url),
-      request_id_(request_id),
+    : request_id_(request_id),
       database_manager_(std::move(database_manager)),
       client_(client) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
@@ -44,10 +43,10 @@ SubresourceFilterSafeBrowsingClientRequest::
   timer_.Stop();
 }
 
-void SubresourceFilterSafeBrowsingClientRequest::Start() {
+void SubresourceFilterSafeBrowsingClientRequest::Start(const GURL& url) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   start_time_ = base::TimeTicks::Now();
-  if (database_manager_->CheckUrlForSubresourceFilter(url_, this)) {
+  if (database_manager_->CheckUrlForSubresourceFilter(url, this)) {
     request_completed_ = true;
     SendCheckResultToClient(false /* served_from_network */,
                             safe_browsing::SB_THREAT_TYPE_SAFE,
@@ -65,7 +64,6 @@ void SubresourceFilterSafeBrowsingClientRequest::OnCheckBrowseUrlResult(
     safe_browsing::SBThreatType threat_type,
     const safe_browsing::ThreatMetadata& metadata) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-  DCHECK_EQ(url_, url);
   request_completed_ = true;
   SendCheckResultToClient(true /* served_from_network */, threat_type,
                           metadata);

components/subresource_filter/content/browser/subresource_filter_safe_browsing_client_request.h

@@ -13,7 +13,8 @@
 #include "base/timer/timer.h"
 #include "components/safe_browsing/db/database_manager.h"
 #include "components/safe_browsing/db/util.h"
-#include "url/gurl.h"
+
+class GURL;
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -33,7 +34,6 @@ class SubresourceFilterSafeBrowsingClientRequest
     : public safe_browsing::SafeBrowsingDatabaseManager::Client {
  public:
   SubresourceFilterSafeBrowsingClientRequest(
-      const GURL& url,
       size_t request_id,
       scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
           database_manager,
@@ -41,7 +41,7 @@ class SubresourceFilterSafeBrowsingClientRequest
       SubresourceFilterSafeBrowsingClient* client);
   ~SubresourceFilterSafeBrowsingClientRequest() override;
 
-  void Start();
+  void Start(const GURL& url);
 
   // safe_browsing::SafeBrowsingDatabaseManager::Client:
   void OnCheckBrowseUrlResult(
@@ -49,7 +49,6 @@ class SubresourceFilterSafeBrowsingClientRequest
       safe_browsing::SBThreatType threat_type,
       const safe_browsing::ThreatMetadata& metadata) override;
 
-  const GURL& url() const { return url_; }
   size_t request_id() const { return request_id_; }
 
   // Maximum time in milliseconds to wait for the Safe Browsing service to
@@ -68,8 +67,6 @@ class SubresourceFilterSafeBrowsingClientRequest
                                safe_browsing::SBThreatType threat_type,
                                const safe_browsing::ThreatMetadata& metadata);
 
-  const GURL url_;
-
   // The |request_id_| identifies a particular request, as issued from the
   // SubresourceFilterSafeBrowsingClient. It will be unique in the scope of a
   // single navigation (i.e. the scope of the