Move DumpBackForwardLists out of WebTestProxyBase.

content/shell/renderer/layout_test/blink_test_runner.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/shell/renderer/layout_test/blink_test_runner.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <clocale>
@@ skipping 574 matching lines @@
 void BlinkTestRunner::LoadURLForFrame(const WebURL& url,
                                       const std::string& frame_name) {
   Send(new ShellViewHostMsg_LoadURLForFrame(
       routing_id(), url, frame_name));
 }
 
 bool BlinkTestRunner::AllowExternalPages() {
   return test_config_.allow_external_pages;
 }
 
-std::string BlinkTestRunner::DumpHistoryForWindow(
-    test_runner::WebTestProxyBase* proxy) {
+std::string BlinkTestRunner::DumpHistoryForWindow(blink::WebView* web_view) {
   size_t pos = 0;
   std::vector<int>::iterator id;
   for (id = routing_ids_.begin(); id != routing_ids_.end(); ++id, ++pos) {
     RenderView* render_view = RenderView::FromRoutingID(*id);
     if (!render_view) {
       NOTREACHED();
       continue;
     }
-    if (BlinkTestRunner::Get(render_view)->proxy() == proxy)
+    if (render_view->GetWebView() == web_view)
       break;
   }
 
   if (id == routing_ids_.end()) {
     NOTREACHED();
     return std::string();
   }
   return DumpBackForwardList(session_histories_[pos],
                              current_entry_indexes_[pos]);
 }
@@ skipping 207 matching lines @@
   }
 
   Send(new ShellViewHostMsg_InitiateLayoutDump(routing_id()));
   // OnLayoutDumpCompleted will be eventually called by an IPC from the browser.
 }
 
 void BlinkTestRunner::OnLayoutDumpCompleted(std::string completed_layout_dump) {
   test_runner::WebTestInterfaces* interfaces =
       LayoutTestRenderProcessObserver::GetInstance()->test_interfaces();
   if (interfaces->TestRunner()->ShouldDumpBackForwardList()) {
-    completed_layout_dump.append(proxy()->DumpBackForwardLists());
+    for (WebView* web_view : interfaces->GetWindowList())
+      completed_layout_dump.append(DumpHistoryForWindow(web_view));
   }
 
   Send(new ShellViewHostMsg_TextDump(routing_id(), completed_layout_dump));
 
   CaptureDumpContinued();
 }
 
 void BlinkTestRunner::CaptureDumpContinued() {
   test_runner::WebTestInterfaces* interfaces =
       LayoutTestRenderProcessObserver::GetInstance()->test_interfaces();
@@ skipping 127 matching lines @@
   get_bluetooth_events_callbacks_.pop_front();
   callback.Run(events);
 }
 
 void BlinkTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content