Revert 212498 "Remove unused WebFrameClient overrides"

This change broke Blink layout tests.

> Remove unused WebFrameClient overrides
> 
> Most of these were obsoleted in http://src.chromium.org/viewvc/blink?view=revision&revision=154432,
> but a couple have been dead longer.
> 
> BUG=none
> 
> Review URL: https://chromiumcodereview.appspot.com/19564010

TBR=japhet@chromium.org

Review URL: https://codereview.chromium.org/19785002

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

4 files changed, 90 insertions, 0 deletions

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index facbd9b..83e86e8 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -137,6 +137,24 @@ WebKit::WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
       frame, request, type, default_policy, is_redirect);
 }
 
+WebKit::WebURLError RenderFrameImpl::cannotHandleRequestError(
+    WebKit::WebFrame* frame,
+    const WebKit::WebURLRequest& request) {
+  return render_view_->cannotHandleRequestError(frame, request);
+}
+
+WebKit::WebURLError RenderFrameImpl::cancelledError(
+    WebKit::WebFrame* frame,
+    const WebKit::WebURLRequest& request) {
+  return render_view_->cancelledError(frame, request);
+}
+
+void RenderFrameImpl::unableToImplementPolicyWithError(
+    WebKit::WebFrame* frame,
+    const WebKit::WebURLError& error) {
+  render_view_->unableToImplementPolicyWithError(frame, error);
+}
+
 void RenderFrameImpl::willSendSubmitEvent(WebKit::WebFrame* frame,
                                           const WebKit::WebFormElement& form) {
   render_view_->willSendSubmitEvent(frame, form);
@@ -254,6 +272,12 @@ void RenderFrameImpl::didFinishResourceLoad(WebKit::WebFrame* frame,
   render_view_->didFinishResourceLoad(frame, identifier);
 }
 
+void RenderFrameImpl::didFailResourceLoad(WebKit::WebFrame* frame,
+                                          unsigned identifier,
+                                          const WebKit::WebURLError& error) {
+  render_view_->didFailResourceLoad(frame, identifier, error);
+}
+
 void RenderFrameImpl::didLoadResourceFromMemoryCache(
     WebKit::WebFrame* frame,
     const WebKit::WebURLRequest& request,
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 81a52b0..b8e75da 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -75,6 +75,15 @@ class CONTENT_EXPORT RenderFrameImpl
       WebKit::WebNavigationType type,
       WebKit::WebNavigationPolicy default_policy,
       bool is_redirect);
+  virtual WebKit::WebURLError cannotHandleRequestError(
+      WebKit::WebFrame* frame,
+      const WebKit::WebURLRequest& request);
+  virtual WebKit::WebURLError cancelledError(
+      WebKit::WebFrame* frame,
+      const WebKit::WebURLRequest& request);
+  virtual void unableToImplementPolicyWithError(
+      WebKit::WebFrame* frame,
+      const WebKit::WebURLError& error);
   virtual void willSendSubmitEvent(WebKit::WebFrame* frame,
                                    const WebKit::WebFormElement& form);
   virtual void willSubmitForm(WebKit::WebFrame* frame,
@@ -123,6 +132,9 @@ class CONTENT_EXPORT RenderFrameImpl
       const WebKit::WebURLResponse& response);
   virtual void didFinishResourceLoad(WebKit::WebFrame* frame,
                                      unsigned identifier);
+  virtual void didFailResourceLoad(WebKit::WebFrame* frame,
+                                   unsigned identifier,
+                                   const WebKit::WebURLError& error);
   virtual void didLoadResourceFromMemoryCache(
       WebKit::WebFrame* frame,
       const WebKit::WebURLRequest& request,
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 961bd3b..b716cc7 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3277,6 +3277,33 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
                                    request, type, default_policy, is_redirect);
 }
 
+bool RenderViewImpl::canHandleRequest(
+    WebFrame* frame, const WebURLRequest& request) {
+  // We allow WebKit to think that everything can be handled even though
+  // browser-side we limit what we load.
+  return true;
+}
+
+WebURLError RenderViewImpl::cannotHandleRequestError(
+    WebFrame* frame, const WebURLRequest& request) {
+  NOTREACHED();  // Since we said we can handle all requests.
+  return WebURLError();
+}
+
+WebURLError RenderViewImpl::cancelledError(
+    WebFrame* frame, const WebURLRequest& request) {
+  WebURLError error;
+  error.domain = WebString::fromUTF8(net::kErrorDomain);
+  error.reason = net::ERR_ABORTED;
+  error.unreachableURL = request.url();
+  return error;
+}
+
+void RenderViewImpl::unableToImplementPolicyWithError(
+    WebFrame*, const WebURLError&) {
+  NOTREACHED();  // Since we said we can handle all requests.
+}
+
 void RenderViewImpl::willSendSubmitEvent(WebKit::WebFrame* frame,
     const WebKit::WebFormElement& form) {
   // Some login forms have onSubmit handlers that put a hash of the password
@@ -3957,6 +3984,11 @@ void RenderViewImpl::didUpdateCurrentHistoryItem(WebFrame* frame) {
   StartNavStateSyncTimerIfNecessary();
 }
 
+void RenderViewImpl::assignIdentifierToRequest(
+    WebFrame* frame, unsigned identifier, const WebURLRequest& request) {
+  // Ignore
+}
+
 void RenderViewImpl::willSendRequest(WebFrame* frame,
                                      unsigned identifier,
                                      WebURLRequest& request,
@@ -4150,6 +4182,11 @@ void RenderViewImpl::didFinishResourceLoad(
   }
 }
 
+void RenderViewImpl::didFailResourceLoad(
+    WebFrame* frame, unsigned identifier, const WebURLError& error) {
+  // Ignore
+}
+
 void RenderViewImpl::didLoadResourceFromMemoryCache(
     WebFrame* frame, const WebURLRequest& request,
     const WebURLResponse& response) {
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index c453b7b..911ecbe 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -566,6 +566,17 @@ class CONTENT_EXPORT RenderViewImpl
       WebKit::WebNavigationType type,
       WebKit::WebNavigationPolicy default_policy,
       bool is_redirect);
+  virtual bool canHandleRequest(WebKit::WebFrame* frame,
+                                const WebKit::WebURLRequest& request);
+  virtual WebKit::WebURLError cannotHandleRequestError(
+      WebKit::WebFrame* frame,
+      const WebKit::WebURLRequest& request);
+  virtual WebKit::WebURLError cancelledError(
+      WebKit::WebFrame* frame,
+      const WebKit::WebURLRequest& request);
+  virtual void unableToImplementPolicyWithError(
+      WebKit::WebFrame* frame,
+      const WebKit::WebURLError& error);
   virtual void willSendSubmitEvent(WebKit::WebFrame* frame,
                                    const WebKit::WebFormElement& form);
   virtual void willSubmitForm(WebKit::WebFrame* frame,
@@ -602,6 +613,9 @@ class CONTENT_EXPORT RenderViewImpl
   virtual void didNavigateWithinPage(WebKit::WebFrame* frame,
                                      bool is_new_navigation);
   virtual void didUpdateCurrentHistoryItem(WebKit::WebFrame* frame);
+  virtual void assignIdentifierToRequest(WebKit::WebFrame* frame,
+                                         unsigned identifier,
+                                         const WebKit::WebURLRequest& request);
   virtual void willSendRequest(WebKit::WebFrame* frame,
                                unsigned identifier,
                                WebKit::WebURLRequest& request,
@@ -611,6 +625,9 @@ class CONTENT_EXPORT RenderViewImpl
                                   const WebKit::WebURLResponse& response);
   virtual void didFinishResourceLoad(WebKit::WebFrame* frame,
                                      unsigned identifier);
+  virtual void didFailResourceLoad(WebKit::WebFrame* frame,
+                                   unsigned identifier,
+                                   const WebKit::WebURLError& error);
   virtual void didLoadResourceFromMemoryCache(
       WebKit::WebFrame* frame,
       const WebKit::WebURLRequest& request,