Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

chrome/renderer/safe_browsing/phishing_classifier_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.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 15 matching lines @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "url/gurl.h"
 
 using ::testing::AllOf;
 using ::testing::Contains;
 using ::testing::Not;
 using ::testing::Pair;
 
+namespace {
+
+// The first RenderFrame is routing ID 1, and the first RenderView is 2.
+const int kRenderViewRoutingId = 2;
+
+}
+
 namespace safe_browsing {
 
 class PhishingClassifierTest : public InProcessBrowserTest {
  protected:
   PhishingClassifierTest()
       : url_tld_token_net_(features::kUrlTldToken + std::string("net")),
         page_link_domain_phishing_(features::kPageLinkDomain +
                                    std::string("phishing.com")),
         page_term_login_(features::kPageTerm + std::string("login")) {
   }
@@ skipping 39 matching lines @@
     model.add_page_term(3);
     model.set_murmur_hash_seed(2777808611U);
     model.add_page_word(MurmurHash3String("login", model.murmur_hash_seed()));
     model.set_max_words_per_term(1);
 
     clock_ = new MockFeatureExtractorClock;
     scorer_.reset(Scorer::Create(model.SerializeAsString()));
     ASSERT_TRUE(scorer_.get());
 
     classifier_.reset(new PhishingClassifier(
-        content::RenderView::FromRoutingID(1),
+        content::RenderView::FromRoutingID(kRenderViewRoutingId),
         clock_));
   }
 
   virtual void TearDownOnMainThread() OVERRIDE {
     content::RunAllPendingInMessageLoop();
   }
 
   // Helper method to start phishing classification and wait for it to
   // complete.  Returns the true if the page is classified as phishy and
   // false otherwise.
@@ skipping 175 matching lines @@
   // Now set the scorer.
   classifier_->set_phishing_scorer(scorer_.get());
   EXPECT_TRUE(classifier_->is_ready());
 
   // Set a NULL scorer, which turns detection back off.
   classifier_->set_phishing_scorer(NULL);
   EXPECT_FALSE(classifier_->is_ready());
 }
 
 }  // namespace safe_browsing