Remove the ChromeFrame specific cookie code between the renderer and browser process.

BUG=316496
R=ananta@chromium.org

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

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

9 files changed, 0 insertions, 115 deletions

diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index bcf4f06..9e79033 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -985,24 +985,6 @@ bool ChromeFrameAutomationClient::ProcessUrlRequestMessage(TabProxy* tab,
         return true;
       }
       break;
-
-    case AutomationMsg_GetCookiesFromHost::ID:
-      if (ui_thread || (url_fetcher_flags_ &
-                          PluginUrlRequestManager::COOKIE_REQUEST_THREADSAFE)) {
-        AutomationMsg_GetCookiesFromHost::Dispatch(&msg, url_fetcher_, this,
-            &PluginUrlRequestManager::GetCookiesFromHost);
-        return true;
-      }
-      break;
-
-    case AutomationMsg_SetCookieAsync::ID:
-      if (ui_thread || (url_fetcher_flags_ &
-                          PluginUrlRequestManager::COOKIE_REQUEST_THREADSAFE)) {
-        AutomationMsg_SetCookieAsync::Dispatch(&msg, url_fetcher_, this,
-            &PluginUrlRequestManager::SetCookiesInHost);
-        return true;
-      }
-      break;
   }
 
   PostTask(
@@ -1287,9 +1269,3 @@ void ChromeFrameAutomationClient::OnResponseEnd(
   automation_server_->Send(new AutomationMsg_RequestEnd(
       tab_->handle(), request_id, status));
 }
-
-void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success,
-    const GURL& url, const std::string& cookie_string, int cookie_id) {
-  automation_server_->Send(new AutomationMsg_GetCookiesHostResponse(
-      tab_->handle(), success, url, cookie_string, cookie_id));
-}
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index e92967a..57b4b00 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -453,8 +453,6 @@ class ChromeFrameAutomationClient
   virtual void OnReadComplete(int request_id, const std::string& data);
   virtual void OnResponseEnd(int request_id,
                              const net::URLRequestStatus& status);
-  virtual void OnCookiesRetrieved(bool success, const GURL& url,
-      const std::string& cookie_string, int cookie_id);
 
   bool is_initialized() const {
     return init_state_ == INITIALIZED;
diff --git a/chrome_frame/chrome_frame_delegate.cc b/chrome_frame/chrome_frame_delegate.cc
index cd586b6..ab5adee 100644
--- a/chrome_frame/chrome_frame_delegate.cc
+++ b/chrome_frame/chrome_frame_delegate.cc
@@ -28,11 +28,9 @@ bool ChromeFrameDelegateImpl::IsTabMessage(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_RequestRead, NO_CODE)
     IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_RequestEnd, NO_CODE)
     IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_DownloadRequestInHost, NO_CODE)
-    IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_SetCookieAsync, NO_CODE)
     IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_AttachExternalTab, NO_CODE)
     IPC_MESSAGE_HANDLER_GENERIC(
         AutomationMsg_RequestGoToHistoryEntryOffset, NO_CODE)
-    IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_GetCookiesFromHost, NO_CODE)
     IPC_MESSAGE_HANDLER_GENERIC(AutomationMsg_CloseExternalTab, NO_CODE)
     IPC_MESSAGE_UNHANDLED(is_tab_message = false);
   IPC_END_MESSAGE_MAP()
@@ -71,11 +69,9 @@ bool ChromeFrameDelegateImpl::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(AutomationMsg_RequestEnd, OnRequestEnd)
     IPC_MESSAGE_HANDLER(AutomationMsg_DownloadRequestInHost,
                         OnDownloadRequestInHost)
-    IPC_MESSAGE_HANDLER(AutomationMsg_SetCookieAsync, OnSetCookieAsync)
     IPC_MESSAGE_HANDLER(AutomationMsg_AttachExternalTab, OnAttachExternalTab)
     IPC_MESSAGE_HANDLER(AutomationMsg_RequestGoToHistoryEntryOffset,
         OnGoToHistoryEntryOffset)
-    IPC_MESSAGE_HANDLER(AutomationMsg_GetCookiesFromHost, OnGetCookiesFromHost)
     IPC_MESSAGE_HANDLER(AutomationMsg_CloseExternalTab, OnCloseTab)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
diff --git a/chrome_frame/chrome_frame_delegate.h b/chrome_frame/chrome_frame_delegate.h
index d880d59..0bee663 100644
--- a/chrome_frame/chrome_frame_delegate.h
+++ b/chrome_frame/chrome_frame_delegate.h
@@ -113,12 +113,9 @@ class ChromeFrameDelegateImpl : public ChromeFrameDelegate {
   virtual void OnRequestEnd(int request_id,
                             const net::URLRequestStatus& status) {}
   virtual void OnDownloadRequestInHost(int request_id) {}
-  virtual void OnSetCookieAsync(const GURL& url, const std::string& cookie) {}
   virtual void OnAttachExternalTab(
       const AttachExternalTabParams& attach_params) {}
   virtual void OnGoToHistoryEntryOffset(int offset) {}
-
-  virtual void OnGetCookiesFromHost(const GURL& url, int cookie_id) {}
   virtual void OnCloseTab() {}
 };
 
diff --git a/chrome_frame/plugin_url_request.h b/chrome_frame/plugin_url_request.h
index acfc49d..edd724a 100644
--- a/chrome_frame/plugin_url_request.h
+++ b/chrome_frame/plugin_url_request.h
@@ -36,9 +36,6 @@ class DECLSPEC_NOVTABLE PluginUrlRequestDelegate {  // NOLINT
   virtual void AddPrivacyDataForUrl(const std::string& url,
                                     const std::string& policy_ref,
                                     int32 flags) {}
-  virtual void OnCookiesRetrieved(bool success, const GURL& url,
-                                  const std::string& cookie_string,
-                                  int cookie_id) = 0;
  protected:
   PluginUrlRequestDelegate() {}
   ~PluginUrlRequestDelegate() {}
@@ -92,14 +89,6 @@ class DECLSPEC_NOVTABLE PluginUrlRequestManager {  // NOLINT
     StopAll();
   }
 
-  void GetCookiesFromHost(const GURL& url, int cookie_id) {
-    GetCookiesForUrl(url, cookie_id);
-  }
-
-  void SetCookiesInHost(const GURL& url, const std::string& cookie) {
-    SetCookiesForUrl(url, cookie);
-  }
-
  protected:
   PluginUrlRequestDelegate* delegate_;
   bool enable_frame_busting_;
@@ -111,8 +100,6 @@ class DECLSPEC_NOVTABLE PluginUrlRequestManager {  // NOLINT
   virtual void EndRequest(int request_id) = 0;
   virtual void DownloadRequestInHost(int request_id) = 0;
   virtual void StopAll() = 0;
-  virtual void GetCookiesForUrl(const GURL& url, int cookie_id) = 0;
-  virtual void SetCookiesForUrl(const GURL& url, const std::string& cookie) = 0;
 };
 
 // Used as base class. Holds Url request properties (url, method, referrer..)
diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h
index ccb84d7..1abedf4 100644
--- a/chrome_frame/test/automation_client_mock.h
+++ b/chrome_frame/test/automation_client_mock.h
@@ -57,8 +57,6 @@ struct MockCFDelegate : public ChromeFrameDelegateImpl {
   MOCK_METHOD2(OnRequestRead, void(int request_id, int bytes_to_read));
   MOCK_METHOD2(OnRequestEnd, void(int request_id,
       const net::URLRequestStatus& status));
-  MOCK_METHOD2(OnSetCookieAsync, void(const GURL& url,
-      const std::string& cookie));
 
   // Use for sending network responses
   void SetRequestDelegate(PluginUrlRequestDelegate* request_delegate) {
diff --git a/chrome_frame/test/url_request_test.cc b/chrome_frame/test/url_request_test.cc
index 8da74bc..85ee388 100644
--- a/chrome_frame/test/url_request_test.cc
+++ b/chrome_frame/test/url_request_test.cc
@@ -45,8 +45,6 @@ class MockUrlDelegate : public PluginUrlRequestDelegate {
   MOCK_METHOD2(OnReadComplete, void(int request_id, const std::string& data));
   MOCK_METHOD2(OnResponseEnd, void(int request_id,
                                    const net::URLRequestStatus& status));
-  MOCK_METHOD4(OnCookiesRetrieved, void(bool success, const GURL& url,
-      const std::string& cookie, int cookie_id));
 
   void PostponeReadRequest(chrome_frame_test::TimedMsgLoop* loop,
                    UrlmonUrlRequest* request, int bytes_to_read) {
diff --git a/chrome_frame/urlmon_url_request.cc b/chrome_frame/urlmon_url_request.cc
index 293adbf..ec592c8 100644
--- a/chrome_frame/urlmon_url_request.cc
+++ b/chrome_frame/urlmon_url_request.cc
@@ -1206,60 +1206,6 @@ void UrlmonUrlRequestManager::BindTerminated(IMoniker* moniker,
         reinterpret_cast<WPARAM>(download_params), 0);
 }
 
-void UrlmonUrlRequestManager::GetCookiesForUrl(const GURL& url, int cookie_id) {
-  DWORD cookie_size = 0;
-  bool success = true;
-  std::string cookie_string;
-
-  int32 cookie_action = COOKIEACTION_READ;
-  BOOL result = InternetGetCookieA(url.spec().c_str(), NULL, NULL,
-                                   &cookie_size);
-  DWORD error = 0;
-  if (cookie_size) {
-    scoped_ptr<char[]> cookies(new char[cookie_size + 1]);
-    if (!InternetGetCookieA(url.spec().c_str(), NULL, cookies.get(),
-                            &cookie_size)) {
-      success = false;
-      error = GetLastError();
-      NOTREACHED() << "InternetGetCookie failed. Error: " << error;
-    } else {
-      cookie_string = cookies.get();
-    }
-  } else {
-    success = false;
-    error = GetLastError();
-    DVLOG(1) << "InternetGetCookie failed. Error: " << error;
-  }
-
-  OnCookiesRetrieved(success, url, cookie_string, cookie_id);
-  if (!success && !error)
-    cookie_action = COOKIEACTION_SUPPRESS;
-
-  AddPrivacyDataForUrl(url.spec(), "", cookie_action);
-}
-
-void UrlmonUrlRequestManager::SetCookiesForUrl(const GURL& url,
-                                               const std::string& cookie) {
-  DCHECK(container_);
-  // Grab a reference on the container to ensure that we don't get destroyed in
-  // case the InternetSetCookie call below puts up a dialog box, which can
-  // happen if the cookie policy is set to prompt.
-  if (container_) {
-    container_->AddRef();
-  }
-
-  InternetCookieState cookie_state = static_cast<InternetCookieState>(
-      InternetSetCookieExA(url.spec().c_str(), NULL, cookie.c_str(),
-                           INTERNET_COOKIE_EVALUATE_P3P, NULL));
-
-  int32 cookie_action = MapCookieStateToCookieAction(cookie_state);
-  AddPrivacyDataForUrl(url.spec(), "", cookie_action);
-
-  if (container_) {
-    container_->Release();
-  }
-}
-
 void UrlmonUrlRequestManager::EndRequest(int request_id) {
   DVLOG(1) << __FUNCTION__ << " id: " << request_id;
   scoped_refptr<UrlmonUrlRequest> request = LookupRequest(request_id,
@@ -1383,12 +1329,6 @@ void UrlmonUrlRequestManager::OnResponseEnd(
   delegate_->OnResponseEnd(request_id, status);
 }
 
-void UrlmonUrlRequestManager::OnCookiesRetrieved(bool success, const GURL& url,
-    const std::string& cookie_string, int cookie_id) {
-  DCHECK(url.is_valid());
-  delegate_->OnCookiesRetrieved(success, url, cookie_string, cookie_id);
-}
-
 scoped_refptr<UrlmonUrlRequest> UrlmonUrlRequestManager::LookupRequest(
     int request_id, RequestMap* request_map) {
   RequestMap::iterator it = request_map->find(request_id);
diff --git a/chrome_frame/urlmon_url_request.h b/chrome_frame/urlmon_url_request.h
index 24d8f5e..2138fe1 100644
--- a/chrome_frame/urlmon_url_request.h
+++ b/chrome_frame/urlmon_url_request.h
@@ -86,8 +86,6 @@ class UrlmonUrlRequestManager
   virtual void EndRequest(int request_id);
   virtual void DownloadRequestInHost(int request_id);
   virtual void StopAll();
-  virtual void GetCookiesForUrl(const GURL& url, int cookie_id);
-  virtual void SetCookiesForUrl(const GURL& url, const std::string& cookie);
 
   // PluginUrlRequestDelegate implementation
   virtual void OnResponseStarted(
@@ -98,9 +96,6 @@ class UrlmonUrlRequestManager
   virtual void OnReadComplete(int request_id, const std::string& data);
   virtual void OnResponseEnd(int request_id,
                              const net::URLRequestStatus& status);
-  virtual void OnCookiesRetrieved(bool success, const GURL& url,
-                                  const std::string& cookie_string,
-                                  int cookie_id);
 
   // This method is passed as a callback to UrlmonUrlRequest::TerminateBind.
   // We simply forward moniker and bind_ctx to host ActiveX/ActiveDocument,