Move loading methods from WebFrame to WebLocalFrame.

third_party/WebKit/Source/core/frame/FrameTestHelpers.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 79 matching lines @@
 std::unique_ptr<T> CreateDefaultClientIfNeeded(T*& client) {
   if (client)
     return nullptr;
   auto owned_client = WTF::MakeUnique<T>();
   client = owned_client.get();
   return owned_client;
 }
 
 }  // namespace
 
-void LoadFrame(WebFrame* frame, const std::string& url) {
+void LoadFrame(WebLocalFrame* frame, const std::string& url) {
   WebURLRequest url_request(URLTestHelpers::ToKURL(url));
   frame->LoadRequest(url_request);
   PumpPendingRequestsForFrameToLoad(frame);
 }
 
 void LoadHTMLString(WebLocalFrame* frame,
                     const std::string& html,
                     const WebURL& base_url) {
   frame->LoadHTMLString(WebData(html.data(), html.size()), base_url);
   PumpPendingRequestsForFrameToLoad(frame);
 }
 
-void LoadHistoryItem(WebFrame* frame,
+void LoadHistoryItem(WebLocalFrame* frame,
                      const WebHistoryItem& item,
                      WebHistoryLoadType load_type,
                      WebCachePolicy cache_policy) {
-  WebURLRequest request =
-      frame->ToWebLocalFrame()->RequestFromHistoryItem(item, cache_policy);
-  frame->ToWebLocalFrame()->Load(request, WebFrameLoadType::kBackForward, item);
+  WebURLRequest request = frame->RequestFromHistoryItem(item, cache_policy);
+  frame->Load(request, WebFrameLoadType::kBackForward, item);
   PumpPendingRequestsForFrameToLoad(frame);
 }
 
-void ReloadFrame(WebFrame* frame) {
+void ReloadFrame(WebLocalFrame* frame) {
   frame->Reload(WebFrameLoadType::kReload);
   PumpPendingRequestsForFrameToLoad(frame);
 }
 
-void ReloadFrameBypassingCache(WebFrame* frame) {
+void ReloadFrameBypassingCache(WebLocalFrame* frame) {
   frame->Reload(WebFrameLoadType::kReloadBypassingCache);
   PumpPendingRequestsForFrameToLoad(frame);
 }
 
 void PumpPendingRequestsForFrameToLoad(WebFrame* frame) {
   Platform::Current()->CurrentThread()->GetWebTaskRunner()->PostTask(
       BLINK_FROM_HERE, WTF::Bind(&RunServeAsyncRequestsTask));
   testing::EnterRunLoop();
 }
 
@@ skipping 148 matching lines @@
 
 WebViewBase* WebViewHelper::InitializeAndLoad(
     const std::string& url,
     TestWebFrameClient* web_frame_client,
     TestWebViewClient* web_view_client,
     TestWebWidgetClient* web_widget_client,
     void (*update_settings_func)(WebSettings*)) {
   Initialize(web_frame_client, web_view_client, web_widget_client,
              update_settings_func);
 
-  LoadFrame(WebView()->MainFrame(), url);
+  LoadFrame(WebView()->MainFrameImpl(), url);
 
   return WebView();
 }
 
 WebViewBase* WebViewHelper::InitializeRemote(
     TestWebRemoteFrameClient* web_remote_frame_client,
     RefPtr<SecurityOrigin> security_origin,
     TestWebViewClient* web_view_client) {
   Reset();
 
@@ skipping 138 matching lines @@
   test_web_view_client_.ScheduleAnimation();
 }
 
 void TestWebViewWidgetClient::DidMeaningfulLayout(
     WebMeaningfulLayout layout_type) {
   test_web_view_client_.DidMeaningfulLayout(layout_type);
 }
 
 }  // namespace FrameTestHelpers
 }  // namespace blink