Remove unused DidPageReceiveSafeBrowsingMatch code.

chrome/browser/safe_browsing/client_side_detection_host.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.
 
 #include "chrome/browser/safe_browsing/client_side_detection_host.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
@@ skipping 27 matching lines @@
 using content::NavigationEntry;
 using content::ResourceRequestDetails;
 using content::ResourceType;
 using content::WebContents;
 
 namespace safe_browsing {
 
 const size_t ClientSideDetectionHost::kMaxUrlsPerIP = 20;
 const size_t ClientSideDetectionHost::kMaxIPsPerBrowse = 200;
 
-const char kSafeBrowsingMatchKey[] = "safe_browsing_match";
-
 typedef base::Callback<void(bool)> ShouldClassifyUrlCallback;
 
 // This class is instantiated each time a new toplevel URL loads, and
 // asynchronously checks whether the malware and phishing classifiers should run
 // for this URL.  If so, it notifies the host class by calling the provided
 // callback form the UI thread.  Objects of this class are ref-counted and will
 // be destroyed once nobody uses it anymore.  If |web_contents|, |csd_service|
 // or |host| go away you need to call Cancel().  We keep the |database_manager|
 // alive in a ref pointer for as long as it takes.
 class ClientSideDetectionHost::ShouldClassifyUrlRequest
@@ skipping 365 matching lines @@
   // Store the unique page ID for later.
   unsafe_unique_page_id_ =
       web_contents()->GetController().GetActiveEntry()->GetUniqueID();
 
   // We also keep the resource around in order to be able to send the
   // malicious URL to the server.
   unsafe_resource_.reset(new SafeBrowsingUIManager::UnsafeResource(resource));
   unsafe_resource_->callback.Reset();  // Don't do anything stupid.
 }
 
 void ClientSideDetectionHost::OnSafeBrowsingMatch(

[Nathan Parker, 2015/12/03 17:21:20]

Can this method be removed altogether (from the observer too)?

[mattm, 2015/12/03 20:38:36]

Yeah, it could be. I'll do that in a separate CL so it's easier to bring back if
it's ever needed for something else.

-    const SafeBrowsingUIManager::UnsafeResource& resource) {
-  if (!web_contents() || !web_contents()->GetController().GetActiveEntry())
-    return;
-
-  // Check that this notification is really for us.
-  content::RenderViewHost* hit_rvh = content::RenderViewHost::FromID(
-      resource.render_process_host_id, resource.render_view_id);
-  if (!hit_rvh ||
-      web_contents() != content::WebContents::FromRenderViewHost(hit_rvh))
-    return;
-
-  web_contents()->GetController().GetActiveEntry()->SetExtraData(
-      kSafeBrowsingMatchKey, base::ASCIIToUTF16("1"));
-}
+    const SafeBrowsingUIManager::UnsafeResource& resource) {}
 
 scoped_refptr<SafeBrowsingDatabaseManager>
 ClientSideDetectionHost::database_manager() {
   return database_manager_;
 }
 
-bool ClientSideDetectionHost::DidPageReceiveSafeBrowsingMatch() const {
-  if (!web_contents() || !web_contents()->GetController().GetVisibleEntry())
-    return false;
-
-  // If an interstitial page is showing, GetVisibleEntry will return the
-  // transient NavigationEntry for the interstitial. The transient entry
-  // will not have the flag set, so use the pending entry instead if there
-  // is one.
-  NavigationEntry* entry = web_contents()->GetController().GetPendingEntry();
-  if (!entry) {
-    entry = web_contents()->GetController().GetVisibleEntry();
-    if (entry->GetPageType() == content::PAGE_TYPE_INTERSTITIAL)
-      entry = web_contents()->GetController().GetLastCommittedEntry();
-    if (!entry)
-      return false;
-  }
-
-  base::string16 value;
-  return entry->GetExtraData(kSafeBrowsingMatchKey, &value);
-}
-
 void ClientSideDetectionHost::WebContentsDestroyed() {
   // Tell any pending classification request that it is being canceled.
   if (classification_request_.get()) {
     classification_request_->Cancel();
   }
   // Cancel all pending feature extractions.
   feature_extractor_.reset();
 }
 
 void ClientSideDetectionHost::OnPhishingPreClassificationDone(
@@ skipping 242 matching lines @@
     ui_manager_->RemoveObserver(this);
 
   ui_manager_ = ui_manager;
   if (ui_manager)
     ui_manager_->AddObserver(this);
 
   database_manager_ = database_manager;
 }
 
 }  // namespace safe_browsing