commit 5f450e5c6fc98a762cebb38cd080731bedd61ae3
author amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jul 28 13:28:11 2009
committer amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Jul 28 13:28:11 2009
tree de1e6a257709c220222a6ab9defac23aade6e45c
parent 60147f3b071444f0abfb320e62a0c9f2b666d443

Navigation and cookies for Automation

Give Automation better visibility and control over navigations. 
Also, make it possible for automation to implement a dummy cookie
store to go with dummy request serving over automation.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/159189

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

net/url_request/url_request_http_job.cc

diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index 20c7d88..cf2b63c 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -13,7 +13,6 @@
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "net/base/cert_status_flags.h"
-#include "net/base/cookie_monster.h"
 #include "net/base/filter.h"
 #include "net/base/force_tls_state.h"
 #include "net/base/load_flags.h"
@@ -529,7 +528,7 @@
         ctx->cookie_policy()->CanSetCookie(
             request_->url(), request_->first_party_for_cookies())) {
       FetchResponseCookies();
-      net::CookieMonster::CookieOptions options;
+      net::CookieOptions options;
       options.set_include_httponly();
       ctx->cookie_store()->SetCookiesWithOptions(request_->url(),
                                                  response_cookies_,
@@ -663,7 +662,7 @@
 
   URLRequestContext* context = request_->context();
   if (context) {
-    if (context->allowSendingCookies(request_))
+    if (context->AllowSendingCookies(request_))
       request_info_.extra_headers += AssembleRequestCookies();
     if (!context->accept_language().empty())
       request_info_.extra_headers += "Accept-Language: " +
@@ -681,7 +680,7 @@
     if (context->cookie_store() &&
         context->cookie_policy()->CanGetCookies(
             request_->url(), request_->first_party_for_cookies())) {
-      net::CookieMonster::CookieOptions options;
+      net::CookieOptions options;
       options.set_include_httponly();
       std::string cookies = request_->context()->cookie_store()->
           GetCookiesWithOptions(request_->url(), options);
@@ -701,7 +700,7 @@
 
   void* iter = NULL;
   while (response_info_->headers->EnumerateHeader(&iter, name, &value))
-    if (request_->context()->interceptCookie(request_, &value))
+    if (request_->context()->InterceptCookie(request_, &value))
       response_cookies_.push_back(value);
 }