Try #2 of "make JavaScript alerts reflect the URL of the frame they came from,

not the enclosing frame." The diffrence between this one and the previous version
of this patch is the addition of test_webview_delegate.

BUG=1686837
Review URL: http://codereview.chromium.org/39163
Review URL: http://codereview.chromium.org/40175

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11026 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 8 deletions

diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 9097dbd..3358abc 100755
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -409,7 +409,7 @@ void TestWebViewDelegate::AddMessageToConsole(WebView* webview,
   }
 }
 
-void TestWebViewDelegate::RunJavaScriptAlert(WebView* webview,
+void TestWebViewDelegate::RunJavaScriptAlert(WebFrame* webframe,
                                              const std::wstring& message) {
   if (!shell_->layout_test_mode()) {
     ShowJavaScriptAlert(message);
@@ -419,7 +419,7 @@ void TestWebViewDelegate::RunJavaScriptAlert(WebView* webview,
   }
 }
 
-bool TestWebViewDelegate::RunJavaScriptConfirm(WebView* webview,
+bool TestWebViewDelegate::RunJavaScriptConfirm(WebFrame* webframe,
                                                const std::wstring& message) {
   if (shell_->layout_test_mode()) {
     // When running tests, write to stdout.
@@ -430,9 +430,10 @@ bool TestWebViewDelegate::RunJavaScriptConfirm(WebView* webview,
   return false;
 }
 
-bool TestWebViewDelegate::RunJavaScriptPrompt(WebView* webview,
-    const std::wstring& message, const std::wstring& default_value,
-    std::wstring* result) {
+bool TestWebViewDelegate::RunJavaScriptPrompt(WebFrame* webframe,
+                                              const std::wstring& message,
+                                              const std::wstring& default_value,
+                                              std::wstring* result) {
   if (shell_->layout_test_mode()) {
     // When running tests, write to stdout.
     std::string utf8_message = WideToUTF8(message);
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index aa3e521..a0dcbf9 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -87,11 +87,11 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
                        const GURL& url,
                        const GURL& referrer,
                        WindowOpenDisposition disposition);
-  virtual void RunJavaScriptAlert(WebView* webview,
+  virtual void RunJavaScriptAlert(WebFrame* webframe,
                                   const std::wstring& message);
-  virtual bool RunJavaScriptConfirm(WebView* webview,
+  virtual bool RunJavaScriptConfirm(WebFrame* webframe,
                                     const std::wstring& message);
-  virtual bool RunJavaScriptPrompt(WebView* webview,
+  virtual bool RunJavaScriptPrompt(WebFrame* webframe,
                                    const std::wstring& message,
                                    const std::wstring& default_value,
                                    std::wstring* result);