2 files changed, 13 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 19dea28..9aa3c26 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -316,13 +316,20 @@ void TestWebViewDelegate::SetAuthorAndUserStylesEnabled(bool is_enabled) {
 }
 
 // WebViewClient -------------------------------------------------------------
-
+// TODO(atwilson): Remove this API when we push related changes upstream
 WebView* TestWebViewDelegate::createView(
     WebFrame* creator,
     const WebWindowFeatures& window_features) {
   return shell_->CreateWebView();
 }
 
+WebView* TestWebViewDelegate::createView(
+    WebFrame* creator,
+    const WebWindowFeatures& window_features,
+    const WebString& frame_name) {
+  return shell_->CreateWebView();
+}
+
 WebWidget* TestWebViewDelegate::createPopupMenu(WebPopupType popup_type) {
   // TODO(darin): Should we take into account |popup_type| (for activation
   //              purpose)?
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 1d1c4eb..a96049a42 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -76,9 +76,14 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   typedef std::vector<CapturedContextMenuEvent> CapturedContextMenuEvents;
 
   // WebKit::WebViewClient
+  // TODO(atwilson): Remove this API when we push related changes upstream
   virtual WebKit::WebView* createView(
       WebKit::WebFrame* creator,
       const WebKit::WebWindowFeatures& window_features);
+  virtual WebKit::WebView* createView(
+      WebKit::WebFrame* creator,
+      const WebKit::WebWindowFeatures& features,
+      const WebKit::WebString& frame_name);
   virtual WebKit::WebWidget* createPopupMenu(WebKit::WebPopupType popup_type);
   virtual WebKit::WebWidget* createPopupMenu(
       const WebKit::WebPopupMenuInfo& info);