Revert of Fix webkit_unit_tests to use the threaded parser and enable everywhere.

Source/web/tests/FrameTestHelpers.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 26 matching lines @@
 #include "wtf/PassOwnPtr.h"
 #include <string>
 
 namespace blink {
 
 class WebLocalFrameImpl;
 class WebSettings;
 
 namespace FrameTestHelpers {
 
-class TestWebFrameClient;
-
-// Loads a url into the specified WebFrame for testing purposes. Pumps any
-// pending resource requests, as well as waiting for the threaded parser to
-// finish, before returning.
 void loadFrame(WebFrame*, const std::string& url);
-// Same as above, but for WebFrame::loadHTMLString().
-void loadHTMLString(WebFrame*, const std::string& html, const WebURL& baseURL);
-// Same as above, but for WebFrame::reload().
-void reloadFrame(WebFrame*);
-void reloadFrameIgnoringCache(WebFrame*);
-
-// Pumps pending resource requests while waiting for a frame to load. Don't use
-// this. Use one of the above helpers.
-void pumpPendingRequestsDoNotUse(WebFrame*);
-
 void runPendingTasks();
 
 // Convenience class for handling the lifetime of a WebView and its associated mainframe in tests.
 class WebViewHelper {
     WTF_MAKE_NONCOPYABLE(WebViewHelper);
 public:
     WebViewHelper();
     ~WebViewHelper();
 
     // Creates and initializes the WebView. Implicitly calls reset() first. IF a
     // WebFrameClient or a WebViewClient are passed in, they must outlive the
     // WebViewHelper.
-    WebViewImpl* initialize(bool enableJavascript = false, TestWebFrameClient* = 0, WebViewClient* = 0, void (*updateSettingsFunc)(WebSettings*) = 0);
+    WebViewImpl* initialize(bool enableJavascript = false, WebFrameClient* = 0, WebViewClient* = 0, void (*updateSettingsFunc)(WebSettings*) = 0);
 
     // Same as initialize() but also performs the initial load of the url.
-    WebViewImpl* initializeAndLoad(const std::string& url, bool enableJavascript = false, TestWebFrameClient* = 0, WebViewClient* = 0, void (*updateSettingsFunc)(WebSettings*) = 0);
+    WebViewImpl* initializeAndLoad(const std::string& url, bool enableJavascript = false, WebFrameClient* = 0, WebViewClient* = 0, void (*updateSettingsFunc)(WebSettings*) = 0);
 
     void reset();
 
     WebView* webView() const { return m_webView; }
     WebViewImpl* webViewImpl() const { return m_webView; }
 
 private:
     WebViewImpl* m_webView;
 };
 
 // Minimal implementation of WebFrameClient needed for unit tests that load frames. Tests that load
 // frames and need further specialization of WebFrameClient behavior should subclass this.
 class TestWebFrameClient : public WebFrameClient {
 public:
-    TestWebFrameClient();
-
     virtual WebFrame* createChildFrame(WebLocalFrame* parent, const WebString& frameName) OVERRIDE;
     virtual void frameDetached(WebFrame*) OVERRIDE;
-    virtual void didStartLoading(bool) OVERRIDE;
-    virtual void didStopLoading() OVERRIDE;
-
-    bool isLoading() { return m_loadsInProgress > 0; }
-
-private:
-    int m_loadsInProgress;
 };
 
 class TestWebViewClient : public WebViewClient {
 public:
     virtual ~TestWebViewClient() { }
     virtual void initializeLayerTreeView() OVERRIDE;
     virtual WebLayerTreeView* layerTreeView() OVERRIDE { return m_layerTreeView.get(); }
 
 private:
     OwnPtr<WebLayerTreeView> m_layerTreeView;
 };
 
 } // namespace FrameTestHelpers
 } // namespace blink
 
 #endif // FrameTestHelpers_h