12 files changed, 6 insertions, 596 deletions

diff --git a/content/shell/resources/webkit_test_runner.js b/content/shell/resources/webkit_test_runner.js
index 5cbb59f..1443897 100644
--- a/content/shell/resources/webkit_test_runner.js
+++ b/content/shell/resources/webkit_test_runner.js
@@ -5,33 +5,11 @@
 var testRunner = testRunner || {};
 
 (function() {
-  native function CloseWebInspector();
-  native function Display();
-  native function DumpEditingCallbacks();
-  native function DumpFrameLoadCallbacks();
-  native function DumpUserGestureInFrameLoadCallbacks();
-  native function SetStopProvisionalFrameLoads();
-  native function DumpTitleChanges();
-  native function DumpResourceLoadCallbacks();
-  native function DumpResourceRequestCallbacks();
-  native function DumpResourceResponseMIMETypes();
-  native function DumpCreateView();
-  native function EvaluateInWebInspector();
-  native function ExecCommand();
-  native function GetWorkerThreadCount();
   native function NotifyDone();
   native function OverridePreference();
-  native function SetCanOpenWindows();
   native function SetDumpAsText();
   native function SetDumpChildFramesAsText();
-  native function SetPrinting();
-  native function SetShouldStayOnPageAfterHandlingBeforeUnload();
   native function SetWaitUntilDone();
-  native function SetXSSAuditorEnabled();
-  native function ShowWebInspector();
-
-  native function GetGlobalFlag();
-  native function SetGlobalFlag();
 
   native function NotImplemented();
 
@@ -61,114 +39,16 @@ var testRunner = testRunner || {};
   }
 
   var TestRunner = function() {
-    Object.defineProperty(this, "display", {value: Display});
     Object.defineProperty(this, "notifyDone", {value: NotifyDone});
     Object.defineProperty(this, "dumpAsText", {value: SetDumpAsText});
     Object.defineProperty(this,
                           "dumpChildFramesAsText",
                           {value: SetDumpChildFramesAsText});
-    Object.defineProperty(this,
-                          "setCanOpenWindows",
-                          {value: SetCanOpenWindows});
-    Object.defineProperty(this, "setPrinting", {value: SetPrinting});
-    Object.defineProperty(
-        this,
-        "setShouldStayOnPageAfterHandlingBeforeUnload",
-        {value: SetShouldStayOnPageAfterHandlingBeforeUnload});
-    Object.defineProperty(this,
-                          "setXSSAuditorEnabled",
-                          {value: SetXSSAuditorEnabled});
     Object.defineProperty(this, "waitUntilDone", {value: SetWaitUntilDone});
-    Object.defineProperty(this, "showWebInspector", {value: ShowWebInspector});
-    Object.defineProperty(this,
-                          "closeWebInspector",
-                          {value: CloseWebInspector});
-    Object.defineProperty(this,
-                          "evaluateInWebInspector",
-                          {value: EvaluateInWebInspector});
-    Object.defineProperty(this, "execCommand", {value: ExecCommand});
     Object.defineProperty(this,
                           "overridePreference",
                           {value: OverridePreference});
-    Object.defineProperty(this,
-                          "dumpEditingCallbacks",
-                          {value: DumpEditingCallbacks});
-    Object.defineProperty(this,
-                          "dumpFrameLoadCallbacks",
-                          {value: DumpFrameLoadCallbacks});
-    Object.defineProperty(this,
-                          "dumpUserGestureInFrameLoadCallbacks",
-                          {value: DumpUserGestureInFrameLoadCallbacks});
-    Object.defineProperty(this,
-                          "setStopProvisionalFrameLoads",
-                          {value: SetStopProvisionalFrameLoads});
-    Object.defineProperty(this,
-                          "dumpResourceLoadCallbacks",
-                          {value: DumpResourceLoadCallbacks});
-    Object.defineProperty(this,
-                          "dumpResourceRequestCallbacks",
-                          {value: DumpResourceRequestCallbacks});
-    Object.defineProperty(this,
-                          "dumpResourceResponseMIMETypes",
-                          {value: DumpResourceResponseMIMETypes});
-    Object.defineProperty(this,
-                          "dumpCreateView",
-                          {value: DumpCreateView});
-    Object.defineProperty(this,
-                          "dumpTitleChanges",
-                          {value: DumpTitleChanges});
 
-    Object.defineProperty(this,
-                          "globalFlag",
-                          {
-                            get: GetGlobalFlag,
-                            set: SetGlobalFlag,
-                            writeable: true,
-                            configurable: true,
-                            enumerable: true
-                          });
-    Object.defineProperty(this,
-                          "platformName",
-                          {
-                            value: "chromium",
-                            writeable: true,
-                            configurable: true,
-                            enumerable: true
-                          });
-    Object.defineProperty(this,
-                          "workerThreadCount",
-                          {get: GetWorkerThreadCount});
-
-    var stubs = [
-        "dumpDatabaseCallbacks",
-        "denyWebNotificationPermission",
-        "removeAllWebNotificationPermissions",
-        "simulateWebNotificationClick",
-        "setIconDatabaseEnabled",
-        "setScrollbarPolicy",
-        "clearAllApplicationCaches",
-        "clearApplicationCacheForOrigin",
-        "clearBackForwardList",
-        "keepWebHistory",
-        "setApplicationCacheOriginQuota",
-        "setCallCloseOnWebViews",
-        "setMainFrameIsFirstResponder",
-        "setPrivateBrowsingEnabled",
-        "setUseDashboardCompatibilityMode",
-        "deleteAllLocalStorage",
-        "localStorageDiskUsageForOrigin",
-        "originsWithLocalStorage",
-        "deleteLocalStorageForOrigin",
-        "observeStorageTrackerNotifications",
-        "syncLocalStorage",
-        "addDisallowedURL",
-        "applicationCacheDiskUsageForOrigin",
-        "abortModal"
-    ];
-    for (var idx in stubs) {
-      Object.defineProperty(
-          this, stubs[idx], {value: function() { return null; }});
-    }
   }
   TestRunner.prototype = DefaultHandler("testRunner");
   testRunner = new TestRunner();
diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc
index b2b93aa..0680d39 100644
--- a/content/shell/shell_content_browser_client.cc
+++ b/content/shell/shell_content_browser_client.cc
@@ -160,19 +160,6 @@ WebContentsViewDelegate* ShellContentBrowserClient::GetWebContentsViewDelegate(
   return NULL;
 }
 
-bool ShellContentBrowserClient::CanCreateWindow(
-    const GURL& opener_url,
-    const GURL& origin,
-    WindowContainerType container_type,
-    ResourceContext* context,
-    int render_process_id,
-    bool* no_javascript_access) {
-  *no_javascript_access = false;
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
-    return true;
-  return WebKitTestController::Get()->CanOpenWindows();
-}
-
 #if defined(OS_ANDROID)
 void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const CommandLine& command_line,
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
index 10933a9..78ef9ff 100644
--- a/content/shell/shell_content_browser_client.h
+++ b/content/shell/shell_content_browser_client.h
@@ -63,13 +63,6 @@ class ShellContentBrowserClient : public ContentBrowserClient {
   virtual std::string GetDefaultDownloadName() OVERRIDE;
   virtual WebContentsViewDelegate* GetWebContentsViewDelegate(
       WebContents* web_contents) OVERRIDE;
-  virtual bool CanCreateWindow(
-      const GURL& opener_url,
-      const GURL& source_origin,
-      WindowContainerType container_type,
-      ResourceContext* context,
-      int render_process_id,
-      bool* no_javascript_access) OVERRIDE;
 
 #if defined(OS_ANDROID)
   virtual void GetAdditionalMappedFilesForChildProcess(
diff --git a/content/shell/shell_javascript_dialog_manager.cc b/content/shell/shell_javascript_dialog_manager.cc
index bb85a28..17f5b6b 100644
--- a/content/shell/shell_javascript_dialog_manager.cc
+++ b/content/shell/shell_javascript_dialog_manager.cc
@@ -77,10 +77,7 @@ void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
     bool is_reload,
     const DialogClosedCallback& callback) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
-    WebKitTestController* controller = WebKitTestController::Get();
-    callback.Run(
-        !controller->should_stay_on_page_after_handling_before_unload(),
-        string16());
+    callback.Run(true, string16());
     return;
   }
 
diff --git a/content/shell/shell_messages.h b/content/shell/shell_messages.h
index ac2b98e..5c3ad60 100644
--- a/content/shell/shell_messages.h
+++ b/content/shell/shell_messages.h
@@ -60,16 +60,9 @@ IPC_SYNC_MESSAGE_ROUTED1_1(ShellViewHostMsg_ReadFileToString,
 IPC_MESSAGE_ROUTED0(ShellViewHostMsg_NotifyDone)
 IPC_MESSAGE_ROUTED0(ShellViewHostMsg_DumpAsText)
 IPC_MESSAGE_ROUTED0(ShellViewHostMsg_DumpChildFramesAsText)
-IPC_MESSAGE_ROUTED0(ShellViewHostMsg_SetPrinting)
-IPC_MESSAGE_ROUTED1(
-    ShellViewHostMsg_SetShouldStayOnPageAfterHandlingBeforeUnload,
-    bool /* should_stay_on_page */)
 IPC_MESSAGE_ROUTED0(ShellViewHostMsg_WaitUntilDone)
 IPC_MESSAGE_ROUTED1(ShellViewHostMsg_OverridePreferences,
                     webkit_glue::WebPreferences /* preferences */)
-IPC_MESSAGE_ROUTED0(ShellViewHostMsg_CanOpenWindows)
-IPC_MESSAGE_ROUTED0(ShellViewHostMsg_ShowWebInspector)
-IPC_MESSAGE_ROUTED0(ShellViewHostMsg_CloseWebInspector)
 IPC_SYNC_MESSAGE_ROUTED1_1(ShellViewHostMsg_RegisterIsolatedFileSystem,
                            std::vector<base::FilePath> /* absolute_filenames */,
                            std::string /* filesystem_id */)
diff --git a/content/shell/shell_render_process_observer.cc b/content/shell/shell_render_process_observer.cc
index bbabb82..e157f03 100644
--- a/content/shell/shell_render_process_observer.cc
+++ b/content/shell/shell_render_process_observer.cc
@@ -101,7 +101,6 @@ void ShellRenderProcessObserver::OnResetAll() {
     WebTestingSupport::resetInternalsObject(
         main_render_view_->GetWebView()->mainFrame());
   }
-  WebKitTestRunnerBindings::Reset();
 }
 
 void ShellRenderProcessObserver::OnSetWebKitSourceDir(
diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc
index 257859b..e047835 100644
--- a/content/shell/webkit_test_controller.cc
+++ b/content/shell/webkit_test_controller.cc
@@ -196,17 +196,11 @@ bool WebKitTestController::ResetAfterLayoutTest() {
   expected_pixel_hash_.clear();
   captured_dump_ = false;
   dump_as_text_ = false;
-  dump_child_frames_ = false;
-  is_printing_ = false;
-  should_stay_on_page_after_handling_before_unload_ = false;
+  dump_child_frames_as_text_ = false;
   wait_until_done_ = false;
   did_finish_load_ = false;
   prefs_ = webkit_glue::WebPreferences();
   should_override_prefs_ = false;
-  {
-    base::AutoLock lock(lock_);
-    can_open_windows_ = false;
-  }
   watchdog_.Cancel();
   if (main_window_) {
     WebContentsObserver::Observe(NULL);
@@ -241,11 +235,6 @@ void WebKitTestController::OverrideWebkitPrefs(
   }
 }
 
-bool WebKitTestController::CanOpenWindows() const {
-  base::AutoLock lock(lock_);
-  return can_open_windows_;
-}
-
 bool WebKitTestController::OnMessageReceived(const IPC::Message& message) {
   DCHECK(CalledOnValidThread());
   bool handled = true;
@@ -260,14 +249,7 @@ bool WebKitTestController::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_DumpAsText, OnDumpAsText)
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_DumpChildFramesAsText,
                         OnDumpChildFramesAsText)
-    IPC_MESSAGE_HANDLER(ShellViewHostMsg_SetPrinting, OnSetPrinting)
-    IPC_MESSAGE_HANDLER(
-        ShellViewHostMsg_SetShouldStayOnPageAfterHandlingBeforeUnload,
-        OnSetShouldStayOnPageAfterHandlingBeforeUnload)
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_WaitUntilDone, OnWaitUntilDone)
-    IPC_MESSAGE_HANDLER(ShellViewHostMsg_CanOpenWindows, OnCanOpenWindows)
-    IPC_MESSAGE_HANDLER(ShellViewHostMsg_ShowWebInspector, OnShowWebInspector)
-    IPC_MESSAGE_HANDLER(ShellViewHostMsg_CloseWebInspector, OnCloseWebInspector)
     IPC_MESSAGE_HANDLER(ShellViewHostMsg_NotImplemented, OnNotImplemented)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -348,8 +330,8 @@ void WebKitTestController::CaptureDump() {
   render_view_host->Send(new ShellViewMsg_CaptureTextDump(
       render_view_host->GetRoutingID(),
       dump_as_text_,
-      is_printing_,
-      dump_child_frames_));
+      false,
+      dump_child_frames_as_text_));
   if (!dump_as_text_ && enable_pixel_dumping_) {
     render_view_host->Send(new ShellViewMsg_CaptureImageDump(
         render_view_host->GetRoutingID(),
@@ -450,17 +432,8 @@ void WebKitTestController::OnDumpAsText() {
   dump_as_text_ = true;
 }
 
-void WebKitTestController::OnSetPrinting() {
-  is_printing_ = true;
-}
-
-void WebKitTestController::OnSetShouldStayOnPageAfterHandlingBeforeUnload(
-    bool should_stay_on_page) {
-  should_stay_on_page_after_handling_before_unload_ = should_stay_on_page;
-}
-
 void WebKitTestController::OnDumpChildFramesAsText() {
-  dump_child_frames_ = true;
+  dump_as_text_ = true;
 }
 
 void WebKitTestController::OnWaitUntilDone() {
@@ -477,19 +450,6 @@ void WebKitTestController::OnWaitUntilDone() {
   wait_until_done_ = true;
 }
 
-void WebKitTestController::OnCanOpenWindows() {
-  base::AutoLock lock(lock_);
-  can_open_windows_ = true;
-}
-
-void WebKitTestController::OnShowWebInspector() {
-  main_window_->ShowDevTools();
-}
-
-void WebKitTestController::OnCloseWebInspector() {
-  main_window_->CloseDevTools();
-}
-
 void WebKitTestController::OnNotImplemented(
     const std::string& object_name,
     const std::string& property_name) {
diff --git a/content/shell/webkit_test_controller.h b/content/shell/webkit_test_controller.h
index 6c98cf9..94e7ef0 100644
--- a/content/shell/webkit_test_controller.h
+++ b/content/shell/webkit_test_controller.h
@@ -90,12 +90,6 @@ class WebKitTestController : public base::NonThreadSafe,
   void set_printer(WebKitTestResultPrinter* printer) {
     printer_.reset(printer);
   }
-  bool should_stay_on_page_after_handling_before_unload() const {
-    return should_stay_on_page_after_handling_before_unload_;
-  }
-
-  // This method can be invoked on any thread.
-  bool CanOpenWindows() const;
 
   // WebContentsObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
@@ -125,12 +119,7 @@ class WebKitTestController : public base::NonThreadSafe,
   void OnNotifyDone();
   void OnDumpAsText();
   void OnDumpChildFramesAsText();
-  void OnSetPrinting();
-  void OnSetShouldStayOnPageAfterHandlingBeforeUnload(bool should_stay_on_page);
   void OnWaitUntilDone();
-  void OnCanOpenWindows();
-  void OnShowWebInspector();
-  void OnCloseWebInspector();
 
   void OnNotImplemented(const std::string& object_name,
                         const std::string& method_name);
@@ -151,9 +140,7 @@ class WebKitTestController : public base::NonThreadSafe,
   bool captured_dump_;
 
   bool dump_as_text_;
-  bool dump_child_frames_;
-  bool is_printing_;
-  bool should_stay_on_page_after_handling_before_unload_;
+  bool dump_child_frames_as_text_;
   bool wait_until_done_;
   bool did_finish_load_;
 
@@ -162,10 +149,6 @@ class WebKitTestController : public base::NonThreadSafe,
 
   base::CancelableClosure watchdog_;
 
-  // Access to the following variables needs to be guarded by |lock_|.
-  mutable base::Lock lock_;
-  bool can_open_windows_;
-
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
diff --git a/content/shell/webkit_test_runner.cc b/content/shell/webkit_test_runner.cc
index e66e693..93275d4 100644
--- a/content/shell/webkit_test_runner.cc
+++ b/content/shell/webkit_test_runner.cc
@@ -373,19 +373,6 @@ bool WebKitTestRunner::OnMessageReceived(const IPC::Message& message) {
 
 // Public methods - -----------------------------------------------------------
 
-void WebKitTestRunner::Display() {
-  const WebSize& size = render_view()->GetWebView()->size();
-  WebRect rect(0, 0, size.width, size.height);
-  proxy_->setPaintRect(rect);
-  PaintInvalidatedRegion();
-  DisplayRepaintMask();
-}
-
-void WebKitTestRunner::SetXSSAuditorEnabled(bool enabled) {
-  prefs_.XSSAuditorEnabled = enabled;
-  applyPreferences();
-}
-
 void WebKitTestRunner::NotifyDone() {
   if (load_finished_)
     test_is_running_ = false;
@@ -402,47 +389,11 @@ void WebKitTestRunner::DumpChildFramesAsText() {
   Send(new ShellViewHostMsg_DumpChildFramesAsText(routing_id()));
 }
 
-void WebKitTestRunner::SetPrinting() {
-  Send(new ShellViewHostMsg_SetPrinting(routing_id()));
-}
-
-void WebKitTestRunner::SetShouldStayOnPageAfterHandlingBeforeUnload(
-    bool should_stay_on_page) {
-  Send(new ShellViewHostMsg_SetShouldStayOnPageAfterHandlingBeforeUnload(
-      routing_id(), should_stay_on_page));
-}
-
 void WebKitTestRunner::WaitUntilDone() {
   wait_until_done_ = true;
   Send(new ShellViewHostMsg_WaitUntilDone(routing_id()));
 }
 
-void WebKitTestRunner::CanOpenWindows() {
-  can_open_windows_ = true;
-  Send(new ShellViewHostMsg_CanOpenWindows(routing_id()));
-}
-
-void WebKitTestRunner::ShowWebInspector() {
-  Send(new ShellViewHostMsg_ShowWebInspector(routing_id()));
-}
-
-void WebKitTestRunner::CloseWebInspector() {
-  Send(new ShellViewHostMsg_CloseWebInspector(routing_id()));
-}
-
-void WebKitTestRunner::EvaluateInWebInspector(int32_t call_id,
-                                              const std::string& script) {
-  WebDevToolsAgent* agent = render_view()->GetWebView()->devToolsAgent();
-  if (agent)
-    agent->evaluateInWebInspector(call_id, WebString::fromUTF8(script));
-}
-
-void WebKitTestRunner::ExecCommand(const std::string& command,
-                                   const std::string& value) {
-  render_view()->GetWebView()->focusedFrame()->executeCommand(
-      WebString::fromUTF8(command), WebString::fromUTF8(value));
-}
-
 void WebKitTestRunner::OverridePreference(const std::string& key,
                                           v8::Local<v8::Value> value) {
   if (key == "WebKitDefaultFontSize") {
@@ -497,42 +448,6 @@ void WebKitTestRunner::OverridePreference(const std::string& key,
   applyPreferences();
 }
 
-void WebKitTestRunner::DumpEditingCallbacks() {
-  dump_editing_callbacks_ = true;
-}
-
-void WebKitTestRunner::DumpFrameLoadCallbacks() {
-  dump_frame_load_callbacks_ = true;
-}
-
-void WebKitTestRunner::DumpUserGestureInFrameLoadCallbacks() {
-  dump_user_gesture_in_frame_load_callbacks_ = true;
-}
-
-void WebKitTestRunner::StopProvisionalFrameLoads() {
-  stop_provisional_frame_loads_ = true;
-}
-
-void WebKitTestRunner::DumpTitleChanges() {
-  dump_title_changes_ = true;
-}
-
-void WebKitTestRunner::DumpResourceLoadCallbacks() {
-  dump_resource_load_callbacks_ = true;
-}
-
-void WebKitTestRunner::DumpResourceRequestCallbacks() {
-  dump_resource_request_callbacks_ = true;
-}
-
-void WebKitTestRunner::DumpResourceResponseMIMETypes() {
-  dump_resource_response_mime_types_ = true;
-}
-
-void WebKitTestRunner::DumpCreateView() {
-  dump_create_view_ = true;
-}
-
 void WebKitTestRunner::NotImplemented(const std::string& object,
                                       const std::string& method) {
   Send(new ShellViewHostMsg_NotImplemented(routing_id(), object, method));
diff --git a/content/shell/webkit_test_runner.h b/content/shell/webkit_test_runner.h
index e394a1c..538aa9a 100644
--- a/content/shell/webkit_test_runner.h
+++ b/content/shell/webkit_test_runner.h
@@ -70,29 +70,11 @@ class WebKitTestRunner : public RenderViewObserver,
   virtual std::string makeURLErrorDescription(const WebKit::WebURLError& error);
 
   void Reset();
-  void Display();
-  void SetXSSAuditorEnabled(bool enabled);
   void NotifyDone();
   void DumpAsText();
   void DumpChildFramesAsText();
-  void SetPrinting();
-  void SetShouldStayOnPageAfterHandlingBeforeUnload(bool should_stay_on_page);
   void WaitUntilDone();
-  void CanOpenWindows();
-  void ShowWebInspector();
-  void CloseWebInspector();
-  void EvaluateInWebInspector(int32_t call_id, const std::string& script);
-  void ExecCommand(const std::string& command, const std::string& value);
   void OverridePreference(const std::string& key, v8::Local<v8::Value> value);
-  void DumpEditingCallbacks();
-  void DumpFrameLoadCallbacks();
-  void DumpUserGestureInFrameLoadCallbacks();
-  void StopProvisionalFrameLoads();
-  void DumpTitleChanges();
-  void DumpResourceLoadCallbacks();
-  void DumpResourceRequestCallbacks();
-  void DumpResourceResponseMIMETypes();
-  void DumpCreateView();
 
   void NotImplemented(const std::string& object, const std::string& method);
 
diff --git a/content/shell/webkit_test_runner_bindings.cc b/content/shell/webkit_test_runner_bindings.cc
index 2e1b9c6..a7c53cd 100644
--- a/content/shell/webkit_test_runner_bindings.cc
+++ b/content/shell/webkit_test_runner_bindings.cc
@@ -10,32 +10,17 @@
 #include "content/shell/shell_render_process_observer.h"
 #include "content/shell/webkit_test_runner.h"
 #include "grit/shell_resources.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerInfo.h"
 #include "ui/base/resource/resource_bundle.h"
 
-using WebKit::WebWorkerInfo;
-
 namespace content {
 
 namespace {
 
-bool g_global_flag = false;
-
 base::StringPiece GetStringResource(int resource_id) {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
       resource_id);
 }
 
-v8::Handle<v8::Value> Display(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->Display();
-  return v8::Undefined();
-}
-
 v8::Handle<v8::Value> NotifyDone(const v8::Arguments& args) {
   WebKitTestRunner* runner =
       ShellRenderProcessObserver::GetInstance()->main_test_runner();
@@ -46,16 +31,6 @@ v8::Handle<v8::Value> NotifyDone(const v8::Arguments& args) {
   return v8::Undefined();
 }
 
-v8::Handle<v8::Value> SetCanOpenWindows(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->CanOpenWindows();
-  return v8::Undefined();
-}
-
 v8::Handle<v8::Value> SetDumpAsText(const v8::Arguments& args) {
   WebKitTestRunner* runner =
       ShellRenderProcessObserver::GetInstance()->main_test_runner();
@@ -76,30 +51,6 @@ v8::Handle<v8::Value> SetDumpChildFramesAsText(const v8::Arguments& args) {
   return v8::Undefined();
 }
 
-v8::Handle<v8::Value> SetPrinting(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->SetPrinting();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> SetShouldStayOnPageAfterHandlingBeforeUnload(
-    const v8::Arguments& args) {
-  if (args.Length() != 1 || !args[0]->IsBoolean())
-    return v8::Undefined();
-
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->SetShouldStayOnPageAfterHandlingBeforeUnload(args[0]->BooleanValue());
-  return v8::Undefined();
-}
-
 v8::Handle<v8::Value> SetWaitUntilDone(const v8::Arguments& args) {
   WebKitTestRunner* runner =
       ShellRenderProcessObserver::GetInstance()->main_test_runner();
@@ -110,79 +61,6 @@ v8::Handle<v8::Value> SetWaitUntilDone(const v8::Arguments& args) {
   return v8::Undefined();
 }
 
-v8::Handle<v8::Value> SetXSSAuditorEnabled(
-    const v8::Arguments& args) {
-  if (args.Length() != 1 || !args[0]->IsBoolean())
-    return v8::Undefined();
-
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->SetXSSAuditorEnabled(args[0]->BooleanValue());
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> ShowWebInspector(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->ShowWebInspector();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> CloseWebInspector(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->CloseWebInspector();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> EvaluateInWebInspector(const v8::Arguments& args) {
-  if (args.Length() != 2 || !args[0]->IsNumber() || !args[1]->IsString())
-    return v8::Undefined();
-
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->EvaluateInWebInspector(args[0]->Int32Value(),
-                                 *v8::String::AsciiValue(args[1]));
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> ExecCommand(const v8::Arguments& args) {
-  // This method takes one, two, or three parameters, however, we only care
-  // about the first and third parameter which (if present) need to be strings.
-  // We ignore the second parameter (user interface) since this command
-  // emulates a manual action.
-  if (args.Length() == 0 || args.Length() > 3)
-    return v8::Undefined();
-
-  if (!args[0]->IsString() || (args.Length() == 3 && !args[2]->IsString()))
-    return v8::Undefined();
-
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  std::string command(*v8::String::AsciiValue(args[0]));
-  std::string value;
-  if (args.Length() == 3)
-    value = *v8::String::AsciiValue(args[2]);
-
-  runner->ExecCommand(command, value);
-  return v8::Undefined();
-}
-
 v8::Handle<v8::Value> OverridePreference(const v8::Arguments& args) {
   if (args.Length() != 2 || !args[0]->IsString())
     return v8::Undefined();
@@ -196,111 +74,6 @@ v8::Handle<v8::Value> OverridePreference(const v8::Arguments& args) {
   return v8::Undefined();
 }
 
-v8::Handle<v8::Value> DumpEditingCallbacks(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->DumpEditingCallbacks();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> DumpFrameLoadCallbacks(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->DumpFrameLoadCallbacks();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> DumpUserGestureInFrameLoadCallbacks(
-    const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->DumpUserGestureInFrameLoadCallbacks();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> SetStopProvisionalFrameLoads(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->StopProvisionalFrameLoads();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> DumpTitleChanges(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->DumpTitleChanges();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> DumpResourceLoadCallbacks(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->DumpResourceLoadCallbacks();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> DumpResourceRequestCallbacks(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->DumpResourceRequestCallbacks();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> DumpResourceResponseMIMETypes(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->DumpResourceResponseMIMETypes();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> DumpCreateView(const v8::Arguments& args) {
-  WebKitTestRunner* runner =
-      ShellRenderProcessObserver::GetInstance()->main_test_runner();
-  if (!runner)
-    return v8::Undefined();
-
-  runner->DumpCreateView();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> GetGlobalFlag(const v8::Arguments& args) {
-  return v8::Boolean::New(g_global_flag);
-}
-
-v8::Handle<v8::Value> SetGlobalFlag(const v8::Arguments& args) {
-  if (args.Length() == 1 && args[0]->IsBoolean())
-    g_global_flag = args[0]->BooleanValue();
-  return v8::Undefined();
-}
-
-v8::Handle<v8::Value> GetWorkerThreadCount(const v8::Arguments& args) {
-  return v8::Integer::NewFromUnsigned(WebWorkerInfo::dedicatedWorkerCount());
-}
-
 v8::Handle<v8::Value> NotImplemented(const v8::Arguments& args) {
   if (args.Length() != 2 || !args[0]->IsString() || !args[1]->IsString())
     return v8::Undefined();
@@ -330,68 +103,18 @@ WebKitTestRunnerBindings::WebKitTestRunnerBindings()
 WebKitTestRunnerBindings::~WebKitTestRunnerBindings() {
 }
 
-// static
-void WebKitTestRunnerBindings::Reset() {
-  g_global_flag = false;
-}
-
 v8::Handle<v8::FunctionTemplate>
 WebKitTestRunnerBindings::GetNativeFunction(v8::Handle<v8::String> name) {
-  if (name->Equals(v8::String::New("Display")))
-    return v8::FunctionTemplate::New(Display);
   if (name->Equals(v8::String::New("NotifyDone")))
     return v8::FunctionTemplate::New(NotifyDone);
-  if (name->Equals(v8::String::New("SetCanOpenWindows")))
-    return v8::FunctionTemplate::New(SetCanOpenWindows);
   if (name->Equals(v8::String::New("SetDumpAsText")))
     return v8::FunctionTemplate::New(SetDumpAsText);
   if (name->Equals(v8::String::New("SetDumpChildFramesAsText")))
     return v8::FunctionTemplate::New(SetDumpChildFramesAsText);
-  if (name->Equals(v8::String::New("SetPrinting")))
-    return v8::FunctionTemplate::New(SetPrinting);
-  if (name->Equals(v8::String::New(
-          "SetShouldStayOnPageAfterHandlingBeforeUnload"))) {
-    return v8::FunctionTemplate::New(
-        SetShouldStayOnPageAfterHandlingBeforeUnload);
-  }
   if (name->Equals(v8::String::New("SetWaitUntilDone")))
     return v8::FunctionTemplate::New(SetWaitUntilDone);
-  if (name->Equals(v8::String::New("SetXSSAuditorEnabled")))
-    return v8::FunctionTemplate::New(SetXSSAuditorEnabled);
-  if (name->Equals(v8::String::New("GetWorkerThreadCount")))
-    return v8::FunctionTemplate::New(GetWorkerThreadCount);
-  if (name->Equals(v8::String::New("ShowWebInspector")))
-    return v8::FunctionTemplate::New(ShowWebInspector);
-  if (name->Equals(v8::String::New("CloseWebInspector")))
-    return v8::FunctionTemplate::New(CloseWebInspector);
-  if (name->Equals(v8::String::New("EvaluateInWebInspector")))
-    return v8::FunctionTemplate::New(EvaluateInWebInspector);
-  if (name->Equals(v8::String::New("ExecCommand")))
-    return v8::FunctionTemplate::New(ExecCommand);
   if (name->Equals(v8::String::New("OverridePreference")))
     return v8::FunctionTemplate::New(OverridePreference);
-  if (name->Equals(v8::String::New("DumpEditingCallbacks")))
-    return v8::FunctionTemplate::New(DumpEditingCallbacks);
-  if (name->Equals(v8::String::New("DumpFrameLoadCallbacks")))
-    return v8::FunctionTemplate::New(DumpFrameLoadCallbacks);
-  if (name->Equals(v8::String::New("DumpUserGestureInFrameLoadCallbacks")))
-    return v8::FunctionTemplate::New(DumpUserGestureInFrameLoadCallbacks);
-  if (name->Equals(v8::String::New("SetStopProvisionalFrameLoads")))
-    return v8::FunctionTemplate::New(SetStopProvisionalFrameLoads);
-  if (name->Equals(v8::String::New("DumpTitleChanges")))
-    return v8::FunctionTemplate::New(DumpTitleChanges);
-  if (name->Equals(v8::String::New("DumpResourceLoadCallbacks")))
-    return v8::FunctionTemplate::New(DumpResourceLoadCallbacks);
-  if (name->Equals(v8::String::New("DumpResourceRequestCallbacks")))
-    return v8::FunctionTemplate::New(DumpResourceRequestCallbacks);
-  if (name->Equals(v8::String::New("DumpResourceResponseMIMETypes")))
-    return v8::FunctionTemplate::New(DumpResourceResponseMIMETypes);
-  if (name->Equals(v8::String::New("DumpCreateView")))
-    return v8::FunctionTemplate::New(DumpCreateView);
-  if (name->Equals(v8::String::New("GetGlobalFlag")))
-    return v8::FunctionTemplate::New(GetGlobalFlag);
-  if (name->Equals(v8::String::New("SetGlobalFlag")))
-    return v8::FunctionTemplate::New(SetGlobalFlag);
   if (name->Equals(v8::String::New("NotImplemented")))
     return v8::FunctionTemplate::New(NotImplemented);
 
diff --git a/content/shell/webkit_test_runner_bindings.h b/content/shell/webkit_test_runner_bindings.h
index 6dfa687..d9eac86 100644
--- a/content/shell/webkit_test_runner_bindings.h
+++ b/content/shell/webkit_test_runner_bindings.h
@@ -13,8 +13,6 @@ namespace content {
 
 class WebKitTestRunnerBindings : public v8::Extension {
  public:
-  static void Reset();
-
   WebKitTestRunnerBindings();
   virtual ~WebKitTestRunnerBindings();