Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.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/renderer/safe_browsing/phishing_classifier_delegate.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 30 matching lines @@
 
 using ::testing::_;
 using ::testing::InSequence;
 using ::testing::Mock;
 using ::testing::Pointee;
 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)
       : PhishingClassifier(render_view, NULL /* clock */) {}
 
   virtual ~MockPhishingClassifier() {}
 
   MOCK_METHOD2(BeginClassification,
                void(const base::string16*, const DoneCallback&));
   MOCK_METHOD0(CancelPendingClassification, void());
@@ skipping 78 matching lines @@
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(switches::kSingleProcess);
 #if defined(OS_WIN) && defined(USE_AURA)
     // Don't want to try to create a GPU process.
     command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
 #endif
   }
 
   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());
     classifier_ = new StrictMock<MockPhishingClassifier>(render_view);
     delegate_ = PhishingClassifierDelegate::Create(render_view, classifier_);
 
     ASSERT_TRUE(StartTestServer());
     host_resolver()->AddRule("*", "127.0.0.1");
   }
 
@@ skipping 66 matching lines @@
     return response_url_;
   }
 
   void NavigateMainFrame(const GURL& url) {
     PostTaskToInProcessRendererAndWait(
         base::Bind(&PhishingClassifierDelegateTest::NavigateMainFrameInternal,
                    base::Unretained(this), url));
   }
 
   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));
   }
 
   void GoBack() {
     GetWebContents()->GetController().GoBack();
     content::WaitForLoadStop(GetWebContents());
   }
 
   void GoForward() {
@@ skipping 371 matching lines @@
   RunClassificationDone(verdict);
   ASSERT_TRUE(intercepting_filter_->verdict());
   EXPECT_EQ(verdict.SerializeAsString(),
             intercepting_filter_->verdict()->SerializeAsString());
 
   // The delegate will cancel pending classification on destruction.
   EXPECT_CALL(*classifier_, CancelPendingClassification());
 }
 
 }  // namespace safe_browsing