Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

content/renderer/resource_fetcher_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 "content/public/renderer/resource_fetcher.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/test/content_browser_test.h"
 #include "content/test/content_browser_test_utils.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using blink::WebFrame;
 using blink::WebURLRequest;
 using blink::WebURLResponse;
 
+namespace {
+
+// The first RenderFrame is routing ID 1, and the first RenderView is 2.
+const int kRenderViewRoutingId = 2;
+
+}
+
 namespace content {
 
 static const int kMaxWaitTimeMs = 5000;
 
 class FetcherDelegate {
  public:
   FetcherDelegate()
       : completed_(false),
         timed_out_(false) {
     // Start a repeating timer waiting for the download to complete.  The
@@ skipping 90 matching lines @@
     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
   }
 
   RenderView* GetRenderView() {
     // We could have the test on the UI thread get the WebContent's routing ID,
     // but we know this will be the first RV so skip that and just hardcode it.
-    return RenderView::FromRoutingID(1);
+    return RenderView::FromRoutingID(kRenderViewRoutingId);
   }
 
   void ResourceFetcherDownloadOnRenderer(const GURL& url) {
     WebFrame* frame = GetRenderView()->GetWebView()->mainFrame();
 
     scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
     scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(
         url, frame, WebURLRequest::TargetIsMainFrame, delegate->NewCallback()));
 
     delegate->WaitForResponse();
@@ skipping 131 matching lines @@
   ASSERT_TRUE(test_server()->Start());
   GURL url(test_server()->GetURL("slow?1"));
 
   PostTaskToInProcessRendererAndWait(
         base::Bind(
             &ResourceFetcherTests::ResourceFetcherDeletedInCallbackOnRenderer,
             base::Unretained(this), url));
 }
 
 }  // namespace content