Switch to WebFrame from the WebKit API....

webkit/tools/test_shell/layout_test_controller.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.
 
 // This file contains the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebScriptSource.h"
 #include "webkit/glue/dom_operations.h"
-#include "webkit/glue/webframe.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
 using std::string;
 using std::wstring;
 
 using WebKit::WebScriptSource;
 using WebKit::WebString;
@@ skipping 292 matching lines @@
 void LayoutTestController::queueReload(
     const CppArgumentList& args, CppVariant* result) {
   work_queue_.AddWork(new WorkItemReload);
   result->SetNull();
 }
 
 class WorkItemLoadingScript : public LayoutTestController::WorkItem {
  public:
   WorkItemLoadingScript(const string& script) : script_(script) {}
   bool Run(TestShell* shell) {
-    shell->webView()->GetMainFrame()->ExecuteScript(
+    shell->webView()->GetMainFrame()->executeScript(
         WebScriptSource(WebString::fromUTF8(script_)));
     return true;  // TODO(darin): Did it really start a navigation?
   }
  private:
   string script_;
 };
 
 class WorkItemNonLoadingScript : public LayoutTestController::WorkItem {
  public:
   WorkItemNonLoadingScript(const string& script) : script_(script) {}
   bool Run(TestShell* shell) {
-    shell->webView()->GetMainFrame()->ExecuteScript(
+    shell->webView()->GetMainFrame()->executeScript(
         WebScriptSource(WebString::fromUTF8(script_)));
     return false;
   }
  private:
   string script_;
 };
 
 void LayoutTestController::queueLoadingScript(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isString())
@@ skipping 18 matching lines @@
     return true;  // TODO(darin): Did it really start a navigation?
   }
  private:
   GURL url_;
   string target_;
 };
 
 void LayoutTestController::queueLoad(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isString()) {
-    GURL current_url = shell_->webView()->GetMainFrame()->GetURL();
+    GURL current_url = shell_->webView()->GetMainFrame()->url();
     GURL full_url = current_url.Resolve(args[0].ToString());
 
     string target = "";
     if (args.size() > 1 && args[1].isString())
       target = args[1].ToString();
 
     work_queue_.AddWork(new WorkItemLoad(full_url, target));
   }
   result->SetNull();
 }
@@ skipping 131 matching lines @@
   if (args.size() > 0 && args[0].isString()) {
     std::string command = args[0].ToString();
     std::string value("");
 
     // Ignore the second parameter (which is userInterface)
     // since this command emulates a manual action.
     if (args.size() >= 3 && args[2].isString())
       value = args[2].ToString();
 
     // Note: webkit's version does not return the boolean, so neither do we.
-    shell_->webView()->GetFocusedFrame()->ExecuteEditCommandByName(command,
-                                                                   value);
+    shell_->webView()->GetFocusedFrame()->executeCommand(
+        WebString::fromUTF8(command), WebString::fromUTF8(value));
   }
   result->SetNull();
 }
 
 void LayoutTestController::isCommandEnabled(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() <= 0 || !args[0].isString()) {
     result->SetNull();
     return;
   }
 
   std::string command = args[0].ToString();
-  bool rv = shell_->webView()->GetFocusedFrame()->IsEditCommandEnabled(command);
+  bool rv = shell_->webView()->GetFocusedFrame()->isCommandEnabled(
+      WebString::fromUTF8(command));
   result->Set(rv);
 }
 
 void LayoutTestController::setPopupBlockingEnabled(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isBool()) {
     bool block_popups = args[0].ToBoolean();
     WebPreferences* prefs = shell_->GetWebPreferences();
     prefs->javascript_can_open_windows_automatically = !block_popups;
 
@@ skipping 235 matching lines @@
     preferences->xss_auditor_enabled = args[0].value.boolValue;
     shell_->webView()->SetPreferences(*preferences);
   }
   result->SetNull();
 }
 
 void LayoutTestController::evaluateScriptInIsolatedWorld(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isString()) {
     WebScriptSource source(WebString::fromUTF8(args[0].ToString()));
-    shell_->webView()->GetMainFrame()->ExecuteScriptInNewWorld(&source, 1, 1);
+    shell_->webView()->GetMainFrame()->executeScriptInNewWorld(&source, 1, 1);
   }
   result->SetNull();
 }
 
 void LayoutTestController::fallbackMethod(
     const CppArgumentList& args, CppVariant* result) {
   std::wstring message(L"JavaScript ERROR: unknown method called on LayoutTestController");
   if (!shell_->layout_test_mode()) {
     logging::LogMessage("CONSOLE:", 0).stream() << message;
   } else {
     printf("CONSOLE MESSAGE: %S\n", message.c_str());
   }
   result->SetNull();
 }