Switch to WebFrame from the WebKit API....

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2006-2008 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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 13 matching lines @@
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "googleurl/src/url_util.h"
 #include "grit/webkit_strings.h"
 #include "net/base/mime_util.h"
 #include "net/url_request/url_request_file_job.h"
 #include "net/url_request/url_request_filter.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "webkit/api/public/WebFrame.h"
+#include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebRect.h"
-#include "webkit/api/public/WebKit.h"
 #include "webkit/api/public/WebSize.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/api/public/WebURLRequest.h"
 #include "webkit/api/public/WebURLResponse.h"
 #include "webkit/glue/glue_serialize.h"
-#include "webkit/glue/webframe.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 
+using WebKit::WebFrame;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebRect;
 using WebKit::WebSize;
 using WebKit::WebURLRequest;
 
 namespace {
 
 // Default timeout in ms for file page loads when in layout test mode.
 const int kDefaultFileTestTimeoutMillisecs = 10 * 1000;
 
@@ skipping 134 matching lines @@
     bool should_dump_as_text =
         shell->layout_test_controller_->ShouldDumpAsText();
     bool dumped_anything = false;
     if (params->dump_tree) {
       dumped_anything = true;
       // Text output: the test page can request different types of output
       // which we handle here.
       if (!should_dump_as_text) {
         // Plain text pages should be dumped as text
         const string16& mime_type =
-            frame->GetDataSource()->response().mimeType();
+            frame->dataSource()->response().mimeType();
         should_dump_as_text = EqualsASCII(mime_type, "text/plain");
       }
       if (should_dump_as_text) {
         bool recursive = shell->layout_test_controller_->
             ShouldDumpChildFramesAsText();
         std::string data_utf8 = WideToUTF8(
             webkit_glue::DumpFramesAsText(frame, recursive));
         if (fwrite(data_utf8.c_str(), 1, data_utf8.size(), stdout) !=
             data_utf8.size()) {
           LOG(FATAL) << "Short write to stdout, disk full?";
@@ skipping 252 matching lines @@
 void TestShell::DumpBackForwardList(std::wstring* result) {
   result->append(L"\n============== Back Forward List ==============\n");
 
   for (int i = 0; i < navigation_controller_->GetEntryCount(); ++i)
     DumpBackForwardEntry(i, result);
 
   result->append(L"===============================================\n");
 }
 
 void TestShell::CallJSGC() {
-  webView()->GetMainFrame()->CallJSGC();
+  webView()->GetMainFrame()->collectGarbage();
 }
 
 WebView* TestShell::CreateWebView(WebView* webview) {
   // If we're running layout tests, only open a new window if the test has
   // called layoutTestController.setCanOpenWindows()
   if (layout_test_mode_ && !layout_test_controller_->CanOpenWindows())
     return NULL;
 
   TestShell* new_win;
   if (!CreateNewWindow(std::wstring(), &new_win))
@@ skipping 35 matching lines @@
   // treated as a browser initiated event.  Instead, we want it to look as if
   // the page initiated any load resulting from JS execution.
   if (!entry.GetURL().SchemeIs("javascript")) {
     delegate_->set_pending_extra_data(
         new TestShellExtraData(entry.GetPageID()));
   }
 
   // If we are reloading, then WebKit will use the state of the current page.
   // Otherwise, we give it the state to navigate to.
   if (reload) {
-    frame->Reload();
+    frame->reload();
   } else if (!entry.GetContentState().empty()) {
     DCHECK(entry.GetPageID() != -1);
-    frame->LoadHistoryItem(
+    frame->loadHistoryItem(
         webkit_glue::HistoryItemFromString(entry.GetContentState()));
   } else {
     DCHECK(entry.GetPageID() == -1);
-    frame->LoadRequest(WebURLRequest(entry.GetURL()));
+    frame->loadRequest(WebURLRequest(entry.GetURL()));
   }
 
   // In case LoadRequest failed before DidCreateDataSource was called.
   delegate_->set_pending_extra_data(NULL);
 
   // Restore focus to the main frame prior to loading new request.
   // This makes sure that we don't have a focused iframe. Otherwise, that
   // iframe would keep focus when the SetFocus called immediately after
   // LoadRequest, thus making some tests fail (see http://b/issue?id=845337
   // for more details).
@@ skipping 121 matching lines @@
 
 void CloseIdleConnections() {
   // Used in benchmarking,  Ignored for test_shell.
 }
 
 void SetCacheMode(bool enabled) {
   // Used in benchmarking,  Ignored for test_shell.
 }
 
 }  // namespace webkit_glue