Changes to support new cookie policy....

chrome/browser/automation/url_request_automation_job.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 #include "chrome/browser/automation/url_request_automation_job.h"
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/automation/automation_resource_message_filter.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "net/base/cookie_monster.h"
+#include "net/base/cookie_policy.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request_context.h"
 
 using base::Time;
 using base::TimeDelta;
 
 // The list of filtered headers that are removed from requests sent via
 // StartAsync(). These must be lower case.
@@ skipping 279 matching lines @@
     const std::string name = "Set-Cookie";
     std::string value;
 
     void* iter = NULL;
     while (headers_->EnumerateHeader(&iter, name, &value)) {
       if (request_->context()->InterceptResponseCookie(request_, value))
         response_cookies.push_back(value);
     }
 
     if (response_cookies.size()) {
-      if (ctx && ctx->cookie_store() &&
+      if (ctx && ctx->cookie_store() && ctx->cookie_policy() &&
           ctx->cookie_policy()->CanSetCookie(
               url_for_cookies, request_->first_party_for_cookies())) {
         net::CookieOptions options;
         options.set_include_httponly();
         ctx->cookie_store()->SetCookiesWithOptions(url_for_cookies,
                                                    response_cookies,
                                                    options);
       }
     }
   }
 
-  if (ctx && ctx->cookie_store() && !response.persistent_cookies.empty() &&
+  if (ctx && ctx->cookie_store() && ctx->cookie_policy() &&
+      !response.persistent_cookies.empty() &&
       ctx->cookie_policy()->CanSetCookie(
           url_for_cookies, request_->first_party_for_cookies())) {
     StringTokenizer cookie_parser(response.persistent_cookies, ";");
 
     std::vector<net::CookieMonster::CanonicalCookie> existing_cookies;
     net::CookieMonster* monster = ctx->cookie_store()->GetCookieMonster();
     DCHECK(monster);
     if (monster) {
       monster->GetRawCookies(url_for_cookies, &existing_cookies);
     }
@@ skipping 199 matching lines @@
   net::CookieMonster::ParsedCookie parsed(*cookie_string);
   if (parsed.IsValid() && !parsed.HasPath()) {
     DCHECK(cookie_string->length() > 0);
 
     // The path is not specified, add it at the end.
     if ((*cookie_string)[cookie_string->length() - 1] != ';')
       *cookie_string += ';';
     cookie_string->append(" path=/");
   }
 }