Move modal dialogs from WebViewClient to WebFrameClient, part 1.5/3.

content/shell/renderer/test_runner/WebTestProxy.h

 // Copyright 2013 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_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_
 
 #include <map>
 #include <string>
 
@@ skipping 149 matching lines @@
     blink::WebMIDIClient* webMIDIClient();
     blink::WebSpeechInputController* speechInputController(blink::WebSpeechInputListener*);
     blink::WebSpeechRecognizer* speechRecognizer();
     bool requestPointerLock();
     void requestPointerUnlock();
     bool isPointerLocked();
     void didFocus();
     void didBlur();
     void setToolTipText(const blink::WebString&, blink::WebTextDirection);
     void didAddMessageToConsole(const blink::WebConsoleMessage&, const blink::WebString& sourceName, unsigned sourceLine);
-    void runModalAlertDialog(blink::WebLocalFrame*, const blink::WebString&);
-    bool runModalConfirmDialog(blink::WebLocalFrame*, const blink::WebString&);
-    bool runModalPromptDialog(blink::WebLocalFrame*, const blink::WebString& message, const blink::WebString& defaultValue, blink::WebString* actualValue);
-    bool runModalBeforeUnloadDialog(blink::WebLocalFrame*, const blink::WebString&);
-
     void didStartProvisionalLoad(blink::WebLocalFrame*);
     void didReceiveServerRedirectForProvisionalLoad(blink::WebLocalFrame*);
     bool didFailProvisionalLoad(blink::WebLocalFrame*, const blink::WebURLError&);
     void didCommitProvisionalLoad(blink::WebLocalFrame*, bool isNewNavigation);
     void didReceiveTitle(blink::WebLocalFrame*, const blink::WebString& title, blink::WebTextDirection);
     void didChangeIcon(blink::WebLocalFrame*, blink::WebIconURL::Type);
     void didFinishDocumentLoad(blink::WebLocalFrame*);
     void didHandleOnloadEvents(blink::WebLocalFrame*);
     void didFailLoad(blink::WebLocalFrame*, const blink::WebURLError&);
     void didFinishLoad(blink::WebLocalFrame*);
@@ skipping 250 matching lines @@
     virtual void didChangeResourcePriority(blink::WebLocalFrame* frame, unsigned identifier, const blink::WebURLRequest::Priority& priority, int intra_priority_value)
     {
         WebTestProxyBase::didChangeResourcePriority(frame, identifier, priority, intra_priority_value);
         Base::didChangeResourcePriority(frame, identifier, priority, intra_priority_value);
     }
     virtual void didFinishResourceLoad(blink::WebLocalFrame* frame, unsigned identifier)
     {
         WebTestProxyBase::didFinishResourceLoad(frame, identifier);
         Base::didFinishResourceLoad(frame, identifier);
     }
-    virtual void runModalAlertDialog(blink::WebLocalFrame* frame, const blink::WebString& message)
-    {
-        WebTestProxyBase::runModalAlertDialog(frame, message);
-        Base::runModalAlertDialog(frame, message);
-    }
-    virtual bool runModalConfirmDialog(blink::WebLocalFrame* frame, const blink::WebString& message)
-    {
-        WebTestProxyBase::runModalConfirmDialog(frame, message);
-        return Base::runModalConfirmDialog(frame, message);
-    }
-    virtual bool runModalPromptDialog(blink::WebLocalFrame* frame, const blink::WebString& message, const blink::WebString& defaultValue, blink::WebString* actualValue)
-    {
-        WebTestProxyBase::runModalPromptDialog(frame, message, defaultValue, actualValue);
-        return Base::runModalPromptDialog(frame, message, defaultValue, actualValue);
-    }
-    virtual bool runModalBeforeUnloadDialog(blink::WebLocalFrame* frame, const blink::WebString& message)
-    {
-        return WebTestProxyBase::runModalBeforeUnloadDialog(frame, message);
-    }
     virtual bool willCheckAndDispatchMessageEvent(blink::WebLocalFrame* sourceFrame, blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMessageEvent event)
     {
         if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event))
             return true;
         return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event);
     }
     virtual blink::WebColorChooser* createColorChooser(blink::WebColorChooserClient* client, const blink::WebColor& color)
     {
         return WebTestProxyBase::createColorChooser(client, color);
     }
@@ skipping 22 matching lines @@
         WebTestProxyBase::postSpellCheckEvent(eventName);
     }
 
 private:
     DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
 };
 
 }
 
 #endif  // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_