Implement WebCookieJar.

Moves the implementation of cookie methods in RendererWebKitClientImpl
into RendererWebCookieJarImpl.

Moves the implementation of cookie methods in TestShellWebKitInit into
SimpleWebCookieJarImpl.

This leaves us with no longer implementing the cookie methods on
WebKitClient.  That'll allow us to delete those.

WebPluginImpl needs to access the WebCookieJar used by either the
renderer or test_shell.  To enable that, I added a GetCookieJar method
on WebPluginPageDelegate.  This interface is used whenever the
WebPluginImpl needs to talk to the RenderView or TestWebViewDelegate.

R=jorlow
BUG=35589
Review URL: http://codereview.chromium.org/661070

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

1 files changed, 5 insertions, 99 deletions

diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 68bfe06..534cd75 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -19,14 +19,12 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/plugin/npobject_util.h"
-#include "chrome/renderer/cookie_message_filter.h"
 #include "chrome/renderer/net/render_dns_master.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/renderer_webstoragenamespace_impl.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebCookie.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebStorageEventDispatcher.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
@@ -45,7 +43,6 @@
 
 using WebKit::WebApplicationCacheHost;
 using WebKit::WebApplicationCacheHostClient;
-using WebKit::WebCookie;
 using WebKit::WebFrame;
 using WebKit::WebKitClient;
 using WebKit::WebStorageArea;
@@ -73,6 +70,11 @@ WebKit::WebSandboxSupport* RendererWebKitClientImpl::sandboxSupport() {
 #endif
 }
 
+WebKit::WebCookieJar* RendererWebKitClientImpl::cookieJar() {
+  NOTREACHED() << "Use WebFrameClient::cookieJar() instead!";
+  return NULL;
+}
+
 bool RendererWebKitClientImpl::sandboxEnabled() {
   // As explained in WebKitClient.h, this function is used to decide whether to
   // allow file system operations to come out of WebKit or not.  Even if the
@@ -112,84 +114,6 @@ RendererWebKitClientImpl::createMessagePortChannel() {
   return new WebMessagePortChannelImpl();
 }
 
-void RendererWebKitClientImpl::setCookies(const WebURL& url,
-                                          const WebURL& first_party_for_cookies,
-                                          const WebString& value) {
-  // TODO(darin): Modify WebKit to pass the WebFrame.  This code may be reached
-  // when there is no active script context.
-  int32 routing_id = RenderThread::RoutingIDForCurrentContext();
-
-  std::string value_utf8;
-  UTF16ToUTF8(value.data(), value.length(), &value_utf8);
-  RenderThread::current()->Send(
-      new ViewHostMsg_SetCookie(routing_id, url, first_party_for_cookies,
-                                value_utf8));
-}
-
-WebString RendererWebKitClientImpl::cookies(
-    const WebURL& url, const WebURL& first_party_for_cookies) {
-  // TODO(darin): Modify WebKit to pass the WebFrame.  This code may be reached
-  // when there is no active script context.
-  int32 routing_id = RenderThread::RoutingIDForCurrentContext();
-
-  // TODO(darin): We should use SendAndRunNestedMessageLoop here to avoid dead-
-  // locking the browser, but this causes a performance regression.  Switching
-  // back to Send to verify.  See http://crbug.com/36310.
-
-  std::string value_utf8;
-  SendCookieMessage(
-      new ViewHostMsg_GetCookies(routing_id, url, first_party_for_cookies,
-                                 &value_utf8));
-
-  return WebString::fromUTF8(value_utf8);
-}
-
-bool RendererWebKitClientImpl::rawCookies(
-    const WebURL& url,
-    const WebURL& first_party_for_cookies,
-    WebVector<WebKit::WebCookie>* raw_cookies) {
-  // TODO(darin): Modify WebKit to pass the WebFrame.  This code may be reached
-  // when there is no active script context.
-  int32 routing_id = RenderThread::RoutingIDForCurrentContext();
-
-  std::vector<webkit_glue::WebCookie> cookies;
-  SendCookieMessage(
-      new ViewHostMsg_GetRawCookies(routing_id, url, first_party_for_cookies,
-                                    &cookies));
-
-  WebVector<WebKit::WebCookie> result(cookies.size());
-  int i = 0;
-  for (std::vector<webkit_glue::WebCookie>::iterator it = cookies.begin();
-       it != cookies.end(); ++it)
-     result[i++] = WebKit::WebCookie(WebString::fromUTF8(it->name),
-                                     WebString::fromUTF8(it->value),
-                                     WebString::fromUTF8(it->domain),
-                                     WebString::fromUTF8(it->path),
-                                     it->expires,
-                                     it->http_only,
-                                     it->secure,
-                                     it->session);
-  raw_cookies->assign(result);
-  return true;
-}
-
-void RendererWebKitClientImpl::deleteCookie(const WebURL& url,
-                                            const WebString& cookie_name) {
-  std::string cookie_name_utf8;
-  UTF16ToUTF8(cookie_name.data(), cookie_name.length(), &cookie_name_utf8);
-  RenderThread::current()->Send(
-      new ViewHostMsg_DeleteCookie(url, cookie_name_utf8));
-}
-
-bool RendererWebKitClientImpl::cookiesEnabled(
-    const WebKit::WebURL& url, const WebKit::WebURL& first_party_for_cookies) {
-  bool enabled;
-  RenderThread::current()->Send(
-      new ViewHostMsg_GetCookiesEnabled(
-            url, first_party_for_cookies, &enabled));
-  return enabled;
-}
-
 void RendererWebKitClientImpl::prefetchHostName(const WebString& hostname) {
   if (!hostname.isEmpty()) {
     std::string hostname_utf8;
@@ -414,21 +338,3 @@ WebKit::WebString RendererWebKitClientImpl::signedPublicKeyAndChallengeString(
       &signed_public_key));
   return WebString::fromUTF8(signed_public_key);
 }
-
-//------------------------------------------------------------------------------
-
-void RendererWebKitClientImpl::SendCookieMessage(IPC::SyncMessage* message) {
-  RenderThread* render_thread = RenderThread::current();
-
-  CookieMessageFilter* filter = render_thread->cookie_message_filter();
-  message->set_pump_messages_event(filter->pump_messages_event());
-  render_thread->Send(message);
-
-  // We may end up nesting calls to SendCookieMessage, so we defer the reset
-  // until we return to the top-most message loop.
-  if (filter->pump_messages_event()->IsSignaled()) {
-    MessageLoop::current()->PostNonNestableTask(FROM_HERE,
-        NewRunnableMethod(filter,
-                          &CookieMessageFilter::ResetPumpMessagesEvent));
-  }
-}