Make the embedder responsible for creating the WebFrame

Source/web/tests/FrameTestHelpers.h

Index: Source/web/tests/FrameTestHelpers.h
diff --git a/Source/web/tests/FrameTestHelpers.h b/Source/web/tests/FrameTestHelpers.h
index fa6200739a2ee02d52ac47fa2cef3b3745c9f881..324fab828d6bf0d899d90de5184c8cca5a6d449e 100644
--- a/Source/web/tests/FrameTestHelpers.h
+++ b/Source/web/tests/FrameTestHelpers.h
@@ -44,11 +44,24 @@ class WebViewClient;
 namespace FrameTestHelpers {
 
 void loadFrame(WebFrame*, const std::string& url);
+void runPendingTasks();
 
-WebView* createWebView(bool enableJavascript = false, WebFrameClient* = 0, WebViewClient* = 0);
-WebView* createWebViewAndLoad(const std::string& url, bool enableJavascript = false, WebFrameClient* = 0, WebViewClient* = 0);
+class WebViewHelper {
+public:
+    WebViewHelper();
+    ~WebViewHelper();
 
-void runPendingTasks();
+    WebView* initialize(bool enableJavascript = false, WebFrameClient* = 0, WebViewClient* = 0);
+    WebView* initializeAndLoad(const std::string& url, bool enableJavascript = false, WebFrameClient* = 0, WebViewClient* = 0);
+
+    void reset();
+
+    WebView* webView() { return m_webView; }
+
+private:
+    WebFrame* m_mainFrame;
+    WebView* m_webView;
+};
 
 } // namespace FrameTestHelpers
 } // namespace WebKit