Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc

Index: chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
index 51a23903f6b942bb0f8c9d41ca6f5b06e3895a49..9ccb8da5aa472cdb118669898fab835c02361613 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
@@ -48,6 +48,10 @@ using ::testing::StrictMock;
 namespace safe_browsing {
 
 namespace {
+
+// The RenderFrame is routing ID 1, and the RenderView is 2.
+const int kRenderViewRoutingId = 2;
+
 class MockPhishingClassifier : public PhishingClassifier {
  public:
   explicit MockPhishingClassifier(content::RenderView* render_view)
@@ -146,7 +150,8 @@ class PhishingClassifierDelegateTest : public InProcessBrowserTest {
 
   virtual void SetUpOnMainThread() OVERRIDE {
     intercepting_filter_ = new InterceptingMessageFilter();
-    content::RenderView* render_view = content::RenderView::FromRoutingID(1);
+    content::RenderView* render_view =
+        content::RenderView::FromRoutingID(kRenderViewRoutingId);
 
     GetWebContents()->GetRenderProcessHost()->AddFilter(
         intercepting_filter_.get());
@@ -233,7 +238,8 @@ class PhishingClassifierDelegateTest : public InProcessBrowserTest {
   }
 
   void NavigateMainFrameInternal(const GURL& url) {
-    content::RenderView* render_view = content::RenderView::FromRoutingID(1);
+    content::RenderView* render_view =
+        content::RenderView::FromRoutingID(kRenderViewRoutingId);
     render_view->GetWebView()->mainFrame()->firstChild()->loadRequest(
         blink::WebURLRequest(url));
   }