TestInterfaces to chromium c++ style, rename methods and remove un-used header.

content/shell/renderer/test_runner/web_test_proxy.cc

 // Copyright 2014 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/test_runner/web_test_proxy.h"
 
 #include <cctype>
 
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "content/shell/renderer/test_runner/TestInterfaces.h"
 #include "content/shell/renderer/test_runner/TestPlugin.h"
 #include "content/shell/renderer/test_runner/WebTestDelegate.h"
 #include "content/shell/renderer/test_runner/WebTestInterfaces.h"
 #include "content/shell/renderer/test_runner/accessibility_controller.h"
 #include "content/shell/renderer/test_runner/event_sender.h"
 #include "content/shell/renderer/test_runner/mock_color_chooser.h"
 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h"
 #include "content/shell/renderer/test_runner/mock_web_push_client.h"
 #include "content/shell/renderer/test_runner/mock_web_speech_recognizer.h"
 #include "content/shell/renderer/test_runner/mock_web_user_media_client.h"
 #include "content/shell/renderer/test_runner/spell_check_client.h"
+#include "content/shell/renderer/test_runner/test_interfaces.h"
 #include "content/shell/renderer/test_runner/test_runner.h"
 #include "content/shell/renderer/test_runner/web_test_runner.h"
 // FIXME: Including platform_canvas.h here is a layering violation.
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebClipboard.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
@@ skipping 257 matching lines @@
     return result;
   for (blink::WebFrame* child = frame->firstChild(); child;
        child = child->nextSibling())
     result += DumpFrameScrollPosition(child, recursive);
   return result;
 }
 
 std::string DumpAllBackForwardLists(TestInterfaces* interfaces,
                                     WebTestDelegate* delegate) {
   std::string result;
-  const std::vector<WebTestProxyBase*>& window_list = interfaces->windowList();
+  const std::vector<WebTestProxyBase*>& window_list = interfaces->WindowList();
   for (size_t i = 0; i < window_list.size(); ++i)
     result.append(delegate->dumpHistoryForWindow(window_list.at(i)));
   return result;
 }
 }
 
 WebTestProxyBase::WebTestProxyBase()
     : test_interfaces_(NULL),
       delegate_(NULL),
       web_widget_(NULL),
       spellcheck_(new SpellCheckClient(this)),
       chooser_count_(0) {
   Reset();
 }
 
 WebTestProxyBase::~WebTestProxyBase() {
-  test_interfaces_->windowClosed(this);
+  test_interfaces_->WindowClosed(this);
   // Tests must wait for readback requests to finish before notifying that
   // they are done.
   CHECK_EQ(0u, composite_and_readback_callbacks_.size());
 }
 
 void WebTestProxyBase::SetInterfaces(WebTestInterfaces* interfaces) {
   test_interfaces_ = interfaces->testInterfaces();
-  test_interfaces_->windowOpened(this);
+  test_interfaces_->WindowOpened(this);
 }
 
 void WebTestProxyBase::SetDelegate(WebTestDelegate* delegate) {
   delegate_ = delegate;
   spellcheck_->SetDelegate(delegate);
   if (speech_recognizer_.get())
     speech_recognizer_->SetDelegate(delegate);
 }
 
 blink::WebView* WebTestProxyBase::GetWebView() const {
@@ skipping 38 matching lines @@
     const blink::WebString& sub_message,
     blink::WebTextDirection hint) {
   delegate_->printMessage(
       std::string("ValidationMessageClient: main-message=") +
       std::string(message.utf8()) + " sub-message=" +
       std::string(sub_message.utf8()) + "\n");
 }
 
 std::string WebTestProxyBase::CaptureTree(bool debug_render_tree) {
   bool should_dump_custom_text =
-      test_interfaces_->testRunner()->shouldDumpAsCustomText();
-  bool should_dump_as_text = test_interfaces_->testRunner()->shouldDumpAsText();
+      test_interfaces_->GetTestRunner()->shouldDumpAsCustomText();
+  bool should_dump_as_text =
+      test_interfaces_->GetTestRunner()->shouldDumpAsText();
   bool should_dump_as_markup =
-      test_interfaces_->testRunner()->shouldDumpAsMarkup();
-  bool should_dump_as_printed = test_interfaces_->testRunner()->isPrinting();
+      test_interfaces_->GetTestRunner()->shouldDumpAsMarkup();
+  bool should_dump_as_printed = test_interfaces_->GetTestRunner()->isPrinting();
   blink::WebFrame* frame = GetWebView()->mainFrame();
   std::string data_utf8;
   if (should_dump_custom_text) {
     // Append a newline for the test driver.
-    data_utf8 = test_interfaces_->testRunner()->customDumpText() + "\n";
+    data_utf8 = test_interfaces_->GetTestRunner()->customDumpText() + "\n";
   } else if (should_dump_as_text) {
     bool recursive =
-        test_interfaces_->testRunner()->shouldDumpChildFramesAsText();
+        test_interfaces_->GetTestRunner()->shouldDumpChildFramesAsText();
     data_utf8 = should_dump_as_printed ?
         DumpFramesAsPrintedText(frame, recursive) :
         DumpFramesAsText(frame, recursive);
   } else if (should_dump_as_markup) {
     bool recursive =
-        test_interfaces_->testRunner()->shouldDumpChildFramesAsMarkup();
+        test_interfaces_->GetTestRunner()->shouldDumpChildFramesAsMarkup();
     // Append a newline for the test driver.
     data_utf8 = DumpFramesAsMarkup(frame, recursive);
   } else {
-    bool recursive =
-        test_interfaces_->testRunner()->shouldDumpChildFrameScrollPositions();
+    bool recursive = test_interfaces_->GetTestRunner()
+                         ->shouldDumpChildFrameScrollPositions();
     blink::WebFrame::RenderAsTextControls render_text_behavior =
         blink::WebFrame::RenderAsTextNormal;
     if (should_dump_as_printed)
       render_text_behavior |= blink::WebFrame::RenderAsTextPrinting;
     if (debug_render_tree)
       render_text_behavior |= blink::WebFrame::RenderAsTextDebug;
     data_utf8 = frame->renderTreeAsText(render_text_behavior).utf8();
     data_utf8 += DumpFrameScrollPosition(frame, recursive);
   }
 
-  if (test_interfaces_->testRunner()->ShouldDumpBackForwardList())
+  if (test_interfaces_->GetTestRunner()->ShouldDumpBackForwardList())
     data_utf8 += DumpAllBackForwardLists(test_interfaces_, delegate_);
 
   return data_utf8;
 }
 
 void WebTestProxyBase::DrawSelectionRect(SkCanvas* canvas) {
   // See if we need to draw the selection bounds rect. Selection bounds
   // rect is the rect enclosing the (possibly transformed) selection.
   // The rect should be drawn after everything is laid out and painted.
-  if (!test_interfaces_->testRunner()->shouldDumpSelectionRect())
+  if (!test_interfaces_->GetTestRunner()->shouldDumpSelectionRect())
     return;
   // If there is a selection rect - draw a red 1px border enclosing rect
   blink::WebRect wr = GetWebView()->mainFrame()->selectionBoundsRect();
   if (wr.isEmpty())
     return;
   // Render a red rectangle bounding selection rect
   SkPaint paint;
   paint.setColor(0xFFFF0000);  // Fully opaque red
   paint.setStyle(SkPaint::kStroke_Style);
   paint.setFlags(SkPaint::kAntiAlias_Flag);
@@ skipping 73 matching lines @@
   callback.Run(bitmap);
 }
 
 void WebTestProxyBase::CapturePixelsAsync(
     const base::Callback<void(const SkBitmap&)>& callback) {
   TRACE_EVENT0("shell", "WebTestProxyBase::CapturePixelsAsync");
 
   DCHECK(web_widget_->isAcceleratedCompositingActive());
   DCHECK(!callback.is_null());
 
-  if (test_interfaces_->testRunner()->isPrinting()) {
+  if (test_interfaces_->GetTestRunner()->isPrinting()) {
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(&WebTestProxyBase::CapturePixelsForPrinting,
                    base::Unretained(this),
                    callback));
     return;
   }
 
   composite_and_readback_callbacks_.push_back(callback);
   web_widget_->compositeAndReadbackAsync(this);
@@ skipping 47 matching lines @@
 
 MockWebSpeechRecognizer* WebTestProxyBase::GetSpeechRecognizerMock() {
   if (!speech_recognizer_.get()) {
     speech_recognizer_.reset(new MockWebSpeechRecognizer());
     speech_recognizer_->SetDelegate(delegate_);
   }
   return speech_recognizer_.get();
 }
 
 void WebTestProxyBase::ScheduleAnimation() {
-  if (!test_interfaces_->testRunner()->TestIsRunning())
+  if (!test_interfaces_->GetTestRunner()->TestIsRunning())
     return;
 
   if (!animate_scheduled_) {
     animate_scheduled_ = true;
     delegate_->postDelayedTask(
         new HostMethodTask(this, &WebTestProxyBase::AnimateNow), 1);
   }
 }
 
 void WebTestProxyBase::AnimateNow() {
   if (animate_scheduled_) {
     animate_scheduled_ = false;
     web_widget_->animate(0.0);
     web_widget_->layout();
   }
 }
 
 void WebTestProxyBase::PostAccessibilityEvent(const blink::WebAXObject& obj,
                                               blink::WebAXEvent event) {
   // Only hook the accessibility events occured during the test run.
   // This check prevents false positives in WebLeakDetector.
   // The pending tasks in browser/renderer message queue may trigger
   // accessibility events,
   // and AccessibilityController will hold on to their target nodes if we don't
   // ignore them here.
-  if (!test_interfaces_->testRunner()->TestIsRunning())
+  if (!test_interfaces_->GetTestRunner()->TestIsRunning())
     return;
 
   if (event == blink::WebAXEventFocus)
-    test_interfaces_->accessibilityController()->SetFocusedElement(obj);
+    test_interfaces_->GetAccessibilityController()->SetFocusedElement(obj);
 
   const char* event_name = NULL;
   switch (event) {
     case blink::WebAXEventActiveDescendantChanged:
       event_name = "ActiveDescendantChanged";
       break;
     case blink::WebAXEventAlert:
       event_name = "Alert";
       break;
     case blink::WebAXEventAriaAttributeChanged:
@@ skipping 72 matching lines @@
       event_name = "TextRemoved";
       break;
     case blink::WebAXEventValueChanged:
       event_name = "ValueChanged";
       break;
     default:
       event_name = "Unknown";
       break;
   }
 
-  test_interfaces_->accessibilityController()->NotificationReceived(obj,
-                                                                    event_name);
+  test_interfaces_->GetAccessibilityController()->NotificationReceived(
+      obj, event_name);
 
-  if (test_interfaces_->accessibilityController()
+  if (test_interfaces_->GetAccessibilityController()
           ->ShouldLogAccessibilityEvents()) {
     std::string message("AccessibilityNotification - ");
     message += event_name;
 
     blink::WebNode node = obj.node();
     if (!node.isNull() && node.isElementNode()) {
       blink::WebElement element = node.to<blink::WebElement>();
       if (element.hasAttribute("id")) {
         message += " - id:";
         message += element.getAttribute("id").utf8().data();
       }
     }
 
     delegate_->printMessage(message + "\n");
   }
 }
 
 void WebTestProxyBase::StartDragging(blink::WebLocalFrame* frame,
                                      const blink::WebDragData& data,
                                      blink::WebDragOperationsMask mask,
                                      const blink::WebImage& image,
                                      const blink::WebPoint& point) {
   // When running a test, we need to fake a drag drop operation otherwise
   // Windows waits for real mouse events to know when the drag is over.
-  test_interfaces_->eventSender()->DoDragDrop(data, mask);
+  test_interfaces_->GetEventSender()->DoDragDrop(data, mask);
 }
 
 // The output from these methods in layout test mode should match that
 // expected by the layout tests. See EditingDelegate.m in DumpRenderTree.
 
 void WebTestProxyBase::DidChangeSelection(bool is_empty_callback) {
-  if (test_interfaces_->testRunner()->shouldDumpEditingCallbacks())
+  if (test_interfaces_->GetTestRunner()->shouldDumpEditingCallbacks())
     delegate_->printMessage(
         "EDITING DELEGATE: "
         "webViewDidChangeSelection:WebViewDidChangeSelectionNotification\n");
 }
 
 void WebTestProxyBase::DidChangeContents() {
-  if (test_interfaces_->testRunner()->shouldDumpEditingCallbacks())
+  if (test_interfaces_->GetTestRunner()->shouldDumpEditingCallbacks())
     delegate_->printMessage(
         "EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification\n");
 }
 
 bool WebTestProxyBase::CreateView(blink::WebLocalFrame* frame,
                                   const blink::WebURLRequest& request,
                                   const blink::WebWindowFeatures& features,
                                   const blink::WebString& frame_name,
                                   blink::WebNavigationPolicy policy,
                                   bool suppress_opener) {
-  if (!test_interfaces_->testRunner()->canOpenWindows())
+  if (!test_interfaces_->GetTestRunner()->canOpenWindows())
     return false;
-  if (test_interfaces_->testRunner()->shouldDumpCreateView())
+  if (test_interfaces_->GetTestRunner()->shouldDumpCreateView())
     delegate_->printMessage(std::string("createView(") +
                             URLDescription(request.url()) + ")\n");
   return true;
 }
 
 blink::WebPlugin* WebTestProxyBase::CreatePlugin(
     blink::WebLocalFrame* frame,
     const blink::WebPluginParams& params) {
   if (TestPlugin::isSupportedMimeType(params.mimeType))
     return TestPlugin::create(frame, params, delegate_);
   return 0;
 }
 
 void WebTestProxyBase::SetStatusText(const blink::WebString& text) {
-  if (!test_interfaces_->testRunner()->shouldDumpStatusCallbacks())
+  if (!test_interfaces_->GetTestRunner()->shouldDumpStatusCallbacks())
     return;
   delegate_->printMessage(
       std::string("UI DELEGATE STATUS CALLBACK: setStatusText:") +
       text.utf8().data() + "\n");
 }
 
 void WebTestProxyBase::DidStopLoading() {
-  if (test_interfaces_->testRunner()->shouldDumpProgressFinishedCallback())
+  if (test_interfaces_->GetTestRunner()->shouldDumpProgressFinishedCallback())
     delegate_->printMessage("postProgressFinishedNotification\n");
 }
 
 void WebTestProxyBase::ShowContextMenu(
     blink::WebLocalFrame* frame,
     const blink::WebContextMenuData& context_menu_data) {
-  test_interfaces_->eventSender()->SetContextMenuData(context_menu_data);
+  test_interfaces_->GetEventSender()->SetContextMenuData(context_menu_data);
 }
 
 blink::WebUserMediaClient* WebTestProxyBase::GetUserMediaClient() {
   if (!user_media_client_.get())
     user_media_client_.reset(new MockWebUserMediaClient(delegate_));
   return user_media_client_.get();
 }
 
 // Simulate a print by going into print mode and then exit straight away.
 void WebTestProxyBase::PrintPage(blink::WebLocalFrame* frame) {
   blink::WebSize page_size_in_pixels = web_widget_->size();
   if (page_size_in_pixels.isEmpty())
     return;
   blink::WebPrintParams printParams(page_size_in_pixels);
   frame->printBegin(printParams);
   frame->printEnd();
 }
 
 blink::WebNotificationPresenter* WebTestProxyBase::GetNotificationPresenter() {
-  return test_interfaces_->testRunner()->notification_presenter();
+  return test_interfaces_->GetTestRunner()->notification_presenter();
 }
 
 blink::WebMIDIClient* WebTestProxyBase::GetWebMIDIClient() {
   return GetMIDIClientMock();
 }
 
 blink::WebSpeechRecognizer* WebTestProxyBase::GetSpeechRecognizer() {
   return GetSpeechRecognizerMock();
 }
 
 bool WebTestProxyBase::RequestPointerLock() {
-  return test_interfaces_->testRunner()->RequestPointerLock();
+  return test_interfaces_->GetTestRunner()->RequestPointerLock();
 }
 
 void WebTestProxyBase::RequestPointerUnlock() {
-  test_interfaces_->testRunner()->RequestPointerUnlock();
+  test_interfaces_->GetTestRunner()->RequestPointerUnlock();
 }
 
 bool WebTestProxyBase::IsPointerLocked() {
-  return test_interfaces_->testRunner()->isPointerLocked();
+  return test_interfaces_->GetTestRunner()->isPointerLocked();
 }
 
 void WebTestProxyBase::DidFocus() {
   delegate_->setFocus(this, true);
 }
 
 void WebTestProxyBase::DidBlur() {
   delegate_->setFocus(this, false);
 }
 
 void WebTestProxyBase::SetToolTipText(const blink::WebString& text,
                                       blink::WebTextDirection direction) {
-  test_interfaces_->testRunner()->setToolTipText(text);
+  test_interfaces_->GetTestRunner()->setToolTipText(text);
 }
 
 void WebTestProxyBase::DidOpenChooser() {
   chooser_count_++;
 }
 
 void WebTestProxyBase::DidCloseChooser() {
   chooser_count_--;
 }
 
 bool WebTestProxyBase::IsChooserShown() {
   return 0 < chooser_count_;
 }
 
 void WebTestProxyBase::LoadURLExternally(
     blink::WebLocalFrame* frame,
     const blink::WebURLRequest& request,
     blink::WebNavigationPolicy policy,
     const blink::WebString& suggested_name) {
-  if (test_interfaces_->testRunner()->shouldWaitUntilExternalURLLoad()) {
+  if (test_interfaces_->GetTestRunner()->shouldWaitUntilExternalURLLoad()) {
     if (policy == blink::WebNavigationPolicyDownload) {
       delegate_->printMessage(
           std::string("Downloading URL with suggested filename \"") +
           suggested_name.utf8() + "\"\n");
     } else {
       delegate_->printMessage(std::string("Loading URL externally - \"") +
                               URLDescription(request.url()) + "\"\n");
     }
     delegate_->testFinished();
   }
 }
 
 void WebTestProxyBase::DidStartProvisionalLoad(blink::WebLocalFrame* frame) {
-  if (!test_interfaces_->testRunner()->topLoadingFrame())
-    test_interfaces_->testRunner()->setTopLoadingFrame(frame, false);
+  if (!test_interfaces_->GetTestRunner()->topLoadingFrame())
+    test_interfaces_->GetTestRunner()->setTopLoadingFrame(frame, false);
 
-  if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(" - didStartProvisionalLoadForFrame\n");
   }
 
-  if (test_interfaces_->testRunner()
+  if (test_interfaces_->GetTestRunner()
           ->shouldDumpUserGestureInFrameLoadCallbacks()) {
     PrintFrameuserGestureStatus(
         delegate_, frame, " - in didStartProvisionalLoadForFrame\n");
   }
 }
 
 void WebTestProxyBase::DidReceiveServerRedirectForProvisionalLoad(
     blink::WebLocalFrame* frame) {
-  if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(
         " - didReceiveServerRedirectForProvisionalLoadForFrame\n");
   }
 }
 
 bool WebTestProxyBase::DidFailProvisionalLoad(blink::WebLocalFrame* frame,
                                               const blink::WebURLError& error) {
-  if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(" - didFailProvisionalLoadWithError\n");
   }
   LocationChangeDone(frame);
   return !frame->provisionalDataSource();
 }
 
 void WebTestProxyBase::DidCommitProvisionalLoad(
     blink::WebLocalFrame* frame,
     const blink::WebHistoryItem& history_item,
     blink::WebHistoryCommitType history_type) {
-  if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(" - didCommitLoadForFrame\n");
   }
 }
 
 void WebTestProxyBase::DidReceiveTitle(blink::WebLocalFrame* frame,
                                        const blink::WebString& title,
                                        blink::WebTextDirection direction) {
   blink::WebCString title8 = title.utf8();
 
-  if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(std::string(" - didReceiveTitle: ") +
                             title8.data() + "\n");
   }
 
-  if (test_interfaces_->testRunner()->shouldDumpTitleChanges())
+  if (test_interfaces_->GetTestRunner()->shouldDumpTitleChanges())
     delegate_->printMessage(std::string("TITLE CHANGED: '") + title8.data() +
                             "'\n");
 }
 
 void WebTestProxyBase::DidChangeIcon(blink::WebLocalFrame* frame,
                                      blink::WebIconURL::Type icon_type) {
-  if (test_interfaces_->testRunner()->shouldDumpIconChanges()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpIconChanges()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(std::string(" - didChangeIcons\n"));
   }
 }
 
 void WebTestProxyBase::DidFinishDocumentLoad(blink::WebLocalFrame* frame) {
-  if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(" - didFinishDocumentLoadForFrame\n");
   } else {
     unsigned pendingUnloadEvents = frame->unloadListenerCount();
     if (pendingUnloadEvents) {
       PrintFrameDescription(delegate_, frame);
       delegate_->printMessage(base::StringPrintf(
           " - has %u onunload handler(s)\n", pendingUnloadEvents));
     }
   }
 }
 
 void WebTestProxyBase::DidHandleOnloadEvents(blink::WebLocalFrame* frame) {
-  if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(" - didHandleOnloadEventsForFrame\n");
   }
 }
 
 void WebTestProxyBase::DidFailLoad(blink::WebLocalFrame* frame,
                                    const blink::WebURLError& error) {
-  if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(" - didFailLoadWithError\n");
   }
   LocationChangeDone(frame);
 }
 
 void WebTestProxyBase::DidFinishLoad(blink::WebLocalFrame* frame) {
-  if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(" - didFinishLoadForFrame\n");
   }
   LocationChangeDone(frame);
 }
 
 void WebTestProxyBase::DidDetectXSS(blink::WebLocalFrame* frame,
                                     const blink::WebURL& insecure_url,
                                     bool did_block_entire_page) {
-  if (test_interfaces_->testRunner()->shouldDumpFrameLoadCallbacks())
+  if (test_interfaces_->GetTestRunner()->shouldDumpFrameLoadCallbacks())
     delegate_->printMessage("didDetectXSS\n");
 }
 
 void WebTestProxyBase::DidDispatchPingLoader(blink::WebLocalFrame* frame,
                                              const blink::WebURL& url) {
-  if (test_interfaces_->testRunner()->shouldDumpPingLoaderCallbacks())
+  if (test_interfaces_->GetTestRunner()->shouldDumpPingLoaderCallbacks())
     delegate_->printMessage(std::string("PingLoader dispatched to '") +
                             URLDescription(url).c_str() + "'.\n");
 }
 
 void WebTestProxyBase::WillRequestResource(
     blink::WebLocalFrame* frame,
     const blink::WebCachedURLRequest& request) {
-  if (test_interfaces_->testRunner()->shouldDumpResourceRequestCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpResourceRequestCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->printMessage(std::string(" - ") +
                             request.initiatorName().utf8().data());
     delegate_->printMessage(std::string(" requested '") +
                             URLDescription(request.urlRequest().url()).c_str() +
                             "'\n");
   }
 }
 
 void WebTestProxyBase::WillSendRequest(
     blink::WebLocalFrame* frame,
     unsigned identifier,
     blink::WebURLRequest& request,
     const blink::WebURLResponse& redirect_response) {
   // Need to use GURL for host() and SchemeIs()
   GURL url = request.url();
   std::string request_url = url.possibly_invalid_spec();
 
   GURL main_document_url = request.firstPartyForCookies();
 
   if (redirect_response.isNull() &&
-      (test_interfaces_->testRunner()->shouldDumpResourceLoadCallbacks() ||
-       test_interfaces_->testRunner()->shouldDumpResourcePriorities())) {
+      (test_interfaces_->GetTestRunner()->shouldDumpResourceLoadCallbacks() ||
+       test_interfaces_->GetTestRunner()->shouldDumpResourcePriorities())) {
     DCHECK(resource_identifier_map_.find(identifier) ==
            resource_identifier_map_.end());
     resource_identifier_map_[identifier] =
         DescriptionSuitableForTestResult(request_url);
   }
 
-  if (test_interfaces_->testRunner()->shouldDumpResourceLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpResourceLoadCallbacks()) {
     if (resource_identifier_map_.find(identifier) ==
         resource_identifier_map_.end())
       delegate_->printMessage("<unknown>");
     else
       delegate_->printMessage(resource_identifier_map_[identifier]);
     delegate_->printMessage(" - willSendRequest <NSURLRequest URL ");
     delegate_->printMessage(
         DescriptionSuitableForTestResult(request_url).c_str());
     delegate_->printMessage(", main document URL ");
     delegate_->printMessage(URLDescription(main_document_url).c_str());
     delegate_->printMessage(", http method ");
     delegate_->printMessage(request.httpMethod().utf8().data());
     delegate_->printMessage("> redirectResponse ");
     PrintResponseDescription(delegate_, redirect_response);
     delegate_->printMessage("\n");
   }
 
-  if (test_interfaces_->testRunner()->shouldDumpResourcePriorities()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpResourcePriorities()) {
     delegate_->printMessage(
         DescriptionSuitableForTestResult(request_url).c_str());
     delegate_->printMessage(" has priority ");
     delegate_->printMessage(PriorityDescription(request.priority()));
     delegate_->printMessage("\n");
   }
 
-  if (test_interfaces_->testRunner()->httpHeadersToClear()) {
+  if (test_interfaces_->GetTestRunner()->httpHeadersToClear()) {
     const std::set<std::string>* clearHeaders =
-        test_interfaces_->testRunner()->httpHeadersToClear();
+        test_interfaces_->GetTestRunner()->httpHeadersToClear();
     for (std::set<std::string>::const_iterator header = clearHeaders->begin();
          header != clearHeaders->end();
          ++header)
       request.clearHTTPHeaderField(blink::WebString::fromUTF8(*header));
   }
 
   std::string host = url.host();
   if (!host.empty() && (url.SchemeIs("http") || url.SchemeIs("https"))) {
     if (!IsLocalHost(host) && !HostIsUsedBySomeTestsToGenerateError(host) &&
         ((!main_document_url.SchemeIs("http") &&
           !main_document_url.SchemeIs("https")) ||
          IsLocalHost(main_document_url.host())) &&
         !delegate_->allowExternalPages()) {
       delegate_->printMessage(std::string("Blocked access to external URL ") +
                               request_url + "\n");
       BlockRequest(request);
       return;
     }
   }
 
   // Set the new substituted URL.
   request.setURL(delegate_->rewriteLayoutTestsURL(request.url().spec()));
 }
 
 void WebTestProxyBase::DidReceiveResponse(
     blink::WebLocalFrame* frame,
     unsigned identifier,
     const blink::WebURLResponse& response) {
-  if (test_interfaces_->testRunner()->shouldDumpResourceLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpResourceLoadCallbacks()) {
     if (resource_identifier_map_.find(identifier) ==
         resource_identifier_map_.end())
       delegate_->printMessage("<unknown>");
     else
       delegate_->printMessage(resource_identifier_map_[identifier]);
     delegate_->printMessage(" - didReceiveResponse ");
     PrintResponseDescription(delegate_, response);
     delegate_->printMessage("\n");
   }
-  if (test_interfaces_->testRunner()->shouldDumpResourceResponseMIMETypes()) {
+  if (test_interfaces_->GetTestRunner()
+          ->shouldDumpResourceResponseMIMETypes()) {
     GURL url = response.url();
     blink::WebString mime_type = response.mimeType();
     delegate_->printMessage(url.ExtractFileName());
     delegate_->printMessage(" has MIME type ");
     // Simulate NSURLResponse's mapping of empty/unknown MIME types to
     // application/octet-stream
     delegate_->printMessage(mime_type.isEmpty() ? "application/octet-stream"
                                                 : mime_type.utf8().data());
     delegate_->printMessage("\n");
   }
 }
 
 void WebTestProxyBase::DidChangeResourcePriority(
     blink::WebLocalFrame* frame,
     unsigned identifier,
     const blink::WebURLRequest::Priority& priority,
     int intra_priority_value) {
-  if (test_interfaces_->testRunner()->shouldDumpResourcePriorities()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpResourcePriorities()) {
     if (resource_identifier_map_.find(identifier) ==
         resource_identifier_map_.end())
       delegate_->printMessage("<unknown>");
     else
       delegate_->printMessage(resource_identifier_map_[identifier]);
     delegate_->printMessage(
         base::StringPrintf(" changed priority to %s, intra_priority %d\n",
                            PriorityDescription(priority).c_str(),
                            intra_priority_value));
   }
 }
 
 void WebTestProxyBase::DidFinishResourceLoad(blink::WebLocalFrame* frame,
                                              unsigned identifier) {
-  if (test_interfaces_->testRunner()->shouldDumpResourceLoadCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpResourceLoadCallbacks()) {
     if (resource_identifier_map_.find(identifier) ==
         resource_identifier_map_.end())
       delegate_->printMessage("<unknown>");
     else
       delegate_->printMessage(resource_identifier_map_[identifier]);
     delegate_->printMessage(" - didFinishLoading\n");
   }
   resource_identifier_map_.erase(identifier);
 }
 
@@ skipping 33 matching lines @@
     if (file_protocol != std::string::npos) {
       new_message = new_message.substr(0, file_protocol) +
                     URLSuitableForTestResult(new_message.substr(file_protocol));
     }
     delegate_->printMessage(new_message);
   }
   delegate_->printMessage(std::string("\n"));
 }
 
 void WebTestProxyBase::LocationChangeDone(blink::WebFrame* frame) {
-  if (frame != test_interfaces_->testRunner()->topLoadingFrame())
+  if (frame != test_interfaces_->GetTestRunner()->topLoadingFrame())
     return;
-  test_interfaces_->testRunner()->setTopLoadingFrame(frame, true);
+  test_interfaces_->GetTestRunner()->setTopLoadingFrame(frame, true);
 }
 
 blink::WebNavigationPolicy WebTestProxyBase::DecidePolicyForNavigation(
     const blink::WebFrameClient::NavigationPolicyInfo& info) {
   blink::WebNavigationPolicy result;
-  if (!test_interfaces_->testRunner()->policyDelegateEnabled())
+  if (!test_interfaces_->GetTestRunner()->policyDelegateEnabled())
     return info.defaultPolicy;
 
   delegate_->printMessage(std::string("Policy delegate: attempt to load ") +
                           URLDescription(info.urlRequest.url()) +
                           " with navigation type '" +
                           WebNavigationTypeToString(info.navigationType) + "'\n");
-  if (test_interfaces_->testRunner()->policyDelegateIsPermissive())
+  if (test_interfaces_->GetTestRunner()->policyDelegateIsPermissive())
     result = blink::WebNavigationPolicyCurrentTab;
   else
     result = blink::WebNavigationPolicyIgnore;
 
-  if (test_interfaces_->testRunner()->policyDelegateShouldNotifyDone())
-    test_interfaces_->testRunner()->policyDelegateDone();
+  if (test_interfaces_->GetTestRunner()->policyDelegateShouldNotifyDone())
+    test_interfaces_->GetTestRunner()->policyDelegateDone();
   return result;
 }
 
 bool WebTestProxyBase::WillCheckAndDispatchMessageEvent(
     blink::WebLocalFrame* source_frame,
     blink::WebFrame* target_frame,
     blink::WebSecurityOrigin target,
     blink::WebDOMMessageEvent event) {
-  if (test_interfaces_->testRunner()->shouldInterceptPostMessage()) {
+  if (test_interfaces_->GetTestRunner()->shouldInterceptPostMessage()) {
     delegate_->printMessage("intercepted postMessage\n");
     return true;
   }
 
   return false;
 }
 
 void WebTestProxyBase::PostSpellCheckEvent(const blink::WebString& event_name) {
-  if (test_interfaces_->testRunner()->shouldDumpSpellCheckCallbacks()) {
+  if (test_interfaces_->GetTestRunner()->shouldDumpSpellCheckCallbacks()) {
     delegate_->printMessage(std::string("SpellCheckEvent: ") +
                             event_name.utf8().data() + "\n");
   }
 }
 
 void WebTestProxyBase::ResetInputMethod() {
   // If a composition text exists, then we need to let the browser process
   // to cancel the input method's ongoing composition session.
   if (web_widget_)
     web_widget_->confirmComposition();
 }
 
 blink::WebString WebTestProxyBase::acceptLanguages() {
   return blink::WebString::fromUTF8(accept_languages_);
 }
 
 MockWebPushClient* WebTestProxyBase::GetPushClientMock() {
   if (!push_client_.get())
     push_client_.reset(new MockWebPushClient);
   return push_client_.get();
 }
 
 blink::WebPushClient* WebTestProxyBase::GetWebPushClient() {
   return GetPushClientMock();
 }
 
 }  // namespace content