[content shell] Use the TestRunner library again and remove the mock testRunner

content/shell/webkit_test_runner.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 CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
 #define CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_
 
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/renderer/render_view_observer.h"
@@ skipping 16 matching lines @@
 // This is the renderer side of the webkit test runner.
 class WebKitTestRunner : public RenderViewObserver,
                          public WebTestRunner::WebTestDelegate {
  public:
   explicit WebKitTestRunner(RenderView* render_view);
   virtual ~WebKitTestRunner();
 
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE;
-  virtual void DidFinishLoad(WebKit::WebFrame* frame) OVERRIDE;
 
   // WebTestDelegate implementation.
   virtual void clearEditCommand();
   virtual void setEditCommand(const std::string& name,
                               const std::string& value);
   virtual void setGamepadData(const WebKit::WebGamepads& gamepads);
   virtual void printMessage(const std::string& message);
   virtual void postTask(::WebTestRunner::WebTask* task);
   virtual void postDelayedTask(::WebTestRunner::WebTask* task,
                                long long ms);
@@ skipping 51 matching lines @@
   virtual void reload();
   virtual void loadURLForFrame(const WebKit::WebURL& url,
                                const std::string& frame_name);
   virtual bool allowExternalPages();
   virtual void captureHistoryForWindow(
       size_t windowIndex,
       WebKit::WebVector<WebKit::WebHistoryItem>* history,
       size_t* currentEntryIndex);
 
   void Reset();
-  void NotifyDone();
-  void DumpAsText();
-  void DumpChildFramesAsText();
-  void WaitUntilDone();
-  void OverridePreference(const std::string& key, v8::Local<v8::Value> value);
-
-  void NotImplemented(const std::string& object, const std::string& method);
 
   void set_proxy(::WebTestRunner::WebTestProxyBase* proxy) { proxy_ = proxy; }
+  ::WebTestRunner::WebTestProxyBase* proxy() const { return proxy_; }
 
  private:
   // Message handlers.
   void OnSetTestConfiguration(
       const base::FilePath& current_working_directory,
       bool enable_pixel_dumping,
       int layout_test_timeout,
       bool allow_external_pages,
       const std::string& expected_pixel_hash);
 
   void CaptureDump();
-  void CaptureTextDump();
-  void CaptureImageDump();
 
   static int window_count_;
 
   base::FilePath current_working_directory_;
 
   ::WebTestRunner::WebTestProxyBase* proxy_;
 
   ::WebTestRunner::WebPreferences prefs_;
 
-  bool test_is_running_;
-  bool wait_until_done_;
-  bool load_finished_;
-  bool dump_as_text_;
-  bool dump_child_frames_as_text_;
-  bool printing_;
-
   bool enable_pixel_dumping_;
   int layout_test_timeout_;
   bool allow_external_pages_;
   std::string expected_pixel_hash_;
 
+  bool is_main_window_;
+
   DISALLOW_COPY_AND_ASSIGN(WebKitTestRunner);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_WEBKIT_TEST_RUNNER_H_