Extract minimal RenderViewHost interface for embedders, leaving

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 200 matching lines @@
       return;
     }
 
     // Everything checks out, so start classification.
     // |web_contents_| is safe to call as we will be destructed
     // before it is.
     VLOG(1) << "Instruct renderer to start phishing detection for URL: "
             << params_.url;
     RenderViewHost* rvh = web_contents_->GetRenderViewHost();
     rvh->Send(new SafeBrowsingMsg_StartPhishingDetection(
-        rvh->routing_id(), params_.url));
+        rvh->GetRoutingID(), params_.url));
   }
 
   // No need to protect |canceled_| with a lock because it is only read and
   // written by the UI thread.
   bool canceled_;
   content::FrameNavigateParams params_;
   WebContents* web_contents_;
   ClientSideDetectionService* csd_service_;
   // We keep a ref pointer here just to make sure the service class stays alive
   // long enough.
@@ skipping 90 matching lines @@
 }
 
 void ClientSideDetectionHost::OnSafeBrowsingHit(
     const SafeBrowsingService::UnsafeResource& resource) {
   // Check that this notification is really for us and that it corresponds to
   // either a malware or phishing hit.  In this case we store the unique page
   // ID for later.
   if (web_contents() &&
       web_contents()->GetRenderProcessHost()->GetID() ==
           resource.render_process_host_id &&
-      web_contents()->GetRenderViewHost()->routing_id() ==
+      web_contents()->GetRenderViewHost()->GetRoutingID() ==
           resource.render_view_id &&
       (resource.threat_type == SafeBrowsingService::URL_PHISHING ||
        resource.threat_type == SafeBrowsingService::URL_MALWARE) &&
       web_contents()->GetController().GetActiveEntry()) {
     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 SafeBrowsingService::UnsafeResource(resource));
     unsafe_resource_->callback.Reset();  // Don't do anything stupid.
@@ skipping 58 matching lines @@
     DCHECK(web_contents());
     if (sb_service_) {
       SafeBrowsingService::UnsafeResource resource;
       resource.url = phishing_url;
       resource.original_url = phishing_url;
       resource.is_subresource = false;
       resource.threat_type = SafeBrowsingService::CLIENT_SIDE_PHISHING_URL;
       resource.render_process_host_id =
           web_contents()->GetRenderProcessHost()->GetID();
       resource.render_view_id =
-          web_contents()->GetRenderViewHost()->routing_id();
+          web_contents()->GetRenderViewHost()->GetRoutingID();
       if (!sb_service_->IsWhitelisted(resource)) {
         // We need to stop any pending navigations, otherwise the interstital
         // might not get created properly.
         web_contents()->GetController().DiscardNonCommittedEntries();
         resource.callback = base::Bind(&EmptyUrlCheckCallback);
         sb_service_->DoDisplayBlockingPage(resource);
       }
     }
   }
 }
@@ skipping 52 matching lines @@
   if (sb_service_) {
     sb_service_->RemoveObserver(this);
   }
   sb_service_ = service;
   if (sb_service_) {
     sb_service_->AddObserver(this);
   }
 }
 
 }  // namespace safe_browsing