Remove layoutTestController from test_shell.

webkit/tools/test_shell/test_shell.h

 // Copyright (c) 2012 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.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
 
 #pragma once
 
 #include <list>
+#include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_piece.h"
 #if defined(OS_MACOSX)
 #include "base/lazy_instance.h"
 #endif
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNavigationPolicy.h"
 #include "ui/gfx/native_widget_types.h"
-#include "webkit/tools/test_shell/layout_test_controller.h"
 #include "webkit/tools/test_shell/webview_host.h"
 #include "webkit/tools/test_shell/webwidget_host.h"
 
 typedef std::list<gfx::NativeWindow> WindowList;
 
 namespace webkit_glue {
 struct WebPreferences;
 }
 
 class GURL;
@@ skipping 71 matching lines @@
     void set_allow_scripts(bool allow) { allow_scripts_ = allow; }
 
     void UpdateNavigationControls();
 
     // A new TestShell window will be opened with devtools url.
     // DevTools window can be opened manually via menu or automatically when
     // inspector's layout test url is passed from command line or console.
     void ShowDevTools();
     void CloseDevTools();
 
-    // Called by the LayoutTestController to signal test completion.
+    // Called to signal test completion.
     void TestFinished();
 
-    // Called by LayoutTestController when a test hits the timeout, but does not
-    // cause a hang. We can avoid killing TestShell in this case and still dump
-    // the test results.
+    // Called when a test hits the timeout, but does not cause a hang.  We can
+    // avoid killing TestShell in this case and still dump the test results.
     void TestTimedOut();
 
     // Called to block the calling thread until TestFinished is called.
     void WaitTestFinished();
 
     void Show(WebKit::WebNavigationPolicy policy);
 
     // We use this to avoid relying on Windows focus during layout test mode.
     void SetFocus(WebWidgetHost* host, bool enable);
 
-    LayoutTestController* layout_test_controller() {
-      return layout_test_controller_.get();
-    }
     TestWebViewDelegate* delegate() { return delegate_.get(); }
     TestWebViewDelegate* popup_delegate() { return popup_delegate_.get(); }
     TestNavigationController* navigation_controller() {
       return navigation_controller_.get();
     }
     TestNotificationPresenter* notification_presenter() {
       return notification_presenter_.get();
     }
 
-    // Resets the LayoutTestController and EventSendingController.  Should be
-    // called before loading a page, since some end-editing event notifications
-    // may arrive after the previous page has finished dumping its text and
-    // therefore end up in the next test's results if the messages are still
-    // enabled.
+    // Resets TestWebViewDelegate. Should be called before loading a page,
+    // since some end-editing event notifications may arrive after the previous
+    // page has finished dumping its text and therefore end up in the next
+    // test's results if the messages are still enabled.
     void ResetTestController();
 
-    // Passes options from LayoutTestController through to the delegate (or
-    // any other caller).
     bool AcceptsEditing() {
-      return layout_test_controller_->AcceptsEditing();
+      return true;
     }
 
     void LoadFile(const FilePath& file);
     void LoadURL(const GURL& url);
     void LoadURLForFrame(const GURL& url, const string16& frame_name);
     void GoBackOrForward(int offset);
     void Reload();
     bool Navigate(const TestNavigationEntry& entry, bool reload);
 
     bool PromptForSaveFile(const wchar_t* prompt_title, FilePath* result);
@@ skipping 21 matching lines @@
     // Implements CreateWebView for TestWebViewDelegate, which in turn
     // is called as a WebViewDelegate.
     WebKit::WebView* CreateWebView();
     WebKit::WebWidget* CreatePopupWidget();
     void ClosePopup();
 
 #if defined(OS_WIN)
     static ATOM RegisterWindowClass();
 #endif
 
-    // Called by the WebView delegate WindowObjectCleared() method, this
-    // binds the layout_test_controller_ and other C++ controller classes to
-    // window JavaScript objects so they can be accessed by layout tests.
-    virtual void BindJSObjectsToWindow(WebKit::WebFrame* frame);
-
     // Writes the back-forward list data for every open window into result.
     // Should call DumpBackForwardListOfWindow on each TestShell window.
     static void DumpAllBackForwardLists(string16* result);
 
     // Writes the single back-forward entry into result.
     void DumpBackForwardEntry(int index, string16* result);
 
     // Writes the back-forward list data for this test shell into result.
     void DumpBackForwardList(string16* result);
 
@@ skipping 141 matching lines @@
     static bool layout_test_mode_;
 
     // True when we wish to allow test shell to load external pages like
     // www.google.com even when in --layout-test mode (used for QA to
     // produce images of the rendered page)
     static bool allow_external_pages_;
 
     // Default timeout in ms for file page loads when in layout test mode.
     static int file_test_timeout_ms_;
 
-    scoped_ptr<LayoutTestController> layout_test_controller_;
     scoped_ptr<TestNavigationController> navigation_controller_;
     scoped_ptr<TestNotificationPresenter> notification_presenter_;
 
     scoped_ptr<TestWebViewDelegate> delegate_;
     scoped_ptr<TestWebViewDelegate> popup_delegate_;
 
     base::WeakPtr<TestShell> devtools_shell_;
     scoped_ptr<TestShellDevToolsAgent> dev_tools_agent_;
     scoped_ptr<TestShellDevToolsClient> dev_tools_client_;
     scoped_ptr<WebKit::WebDeviceOrientationClientMock>
@@ skipping 38 matching lines @@
 #if defined(OS_WIN)
     // Used by the watchdog to know when it's finished.
     HANDLE finished_event_;
 #endif
 
     // Dump the stats table counters on exit.
     bool dump_stats_table_on_exit_;
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_