Remove some WebContents::GetRenderViewHost() calls.

content/test/test_web_contents.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/test/test_web_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler_impl.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
@@ skipping 247 matching lines @@
     return delegate_view_override_;
   return WebContentsImpl::GetDelegateView();
 }
 
 void TestWebContents::SetOpener(TestWebContents* opener) {
   frame_tree_.root()->SetOpener(opener->GetFrameTree()->root());
 }
 
 void TestWebContents::AddPendingContents(TestWebContents* contents) {
   // This is normally only done in WebContentsImpl::CreateNewWindow.
-  ProcessRoutingIdPair key(contents->GetRenderViewHost()->GetProcess()->GetID(),
+  ProcessRoutingIdPair key(contents->GetMainFrame()->GetProcess()->GetID(),

[Charlie Reis, 2016/11/28 21:00:41]

We shouldn't change this one.  We should always get the process ID and routing
ID from the same object.  (It *should* be the case that the RVH and RFH will
give the same process ID here, but it's quite confusing to get the process ID
from one and the route ID from the other.)

Nick has a CL converting CreateNewWindow logic away from RVH, so we can leave
this one for that CL.

[Lei Zhang, 2016/11/30 10:27:00]

Reverted.

                            contents->GetRenderViewHost()->GetRoutingID());
   pending_contents_[key] = contents;
   AddDestructionObserver(contents);
 }
 
 void TestWebContents::ExpectSetHistoryOffsetAndLength(int history_offset,
                                                       int history_length) {
   expect_set_history_offset_and_length_ = true;
   expect_set_history_offset_and_length_history_offset_ = history_offset;
   expect_set_history_offset_and_length_history_length_ = history_length;
@@ skipping 62 matching lines @@
                                                   int route_id) {
 }
 
 void TestWebContents::SaveFrameWithHeaders(const GURL& url,
                                            const Referrer& referrer,
                                            const std::string& headers) {
   save_frame_headers_ = headers;
 }
 
 }  // namespace content