Merge 164709 - Don't use CanonicalCookie::Create method for creating canonical cookies in the Brows…

chrome/browser/browsing_data/browsing_data_cookie_helper.cc

 // Copyright (c) 2012 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/browsing_data/browsing_data_cookie_helper.h"
 
 #include "utility"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 125 matching lines @@
   net::ParsedCookie parsed_cookie(cookie_line);
   if (options.exclude_httponly() && parsed_cookie.IsHttpOnly()) {
     // Return if a Javascript cookie illegally specified the HTTP only flag.
     return;
   }
 
   // This fails to create a canonical cookie, if the normalized cookie domain
   // form cookie line and the url don't have the same domain+registry, or url
   // host isn't cookie domain or one of its subdomains.
   scoped_ptr<net::CanonicalCookie> cookie(
-      net::CanonicalCookie::Create(url, parsed_cookie));
+      new net::CanonicalCookie(url, parsed_cookie));
   if (cookie.get())
     AddCookie(frame_url, *cookie);
 }
 
 void CannedBrowsingDataCookieHelper::Reset() {
   STLDeleteContainerPairSecondPointers(origin_cookie_list_map_.begin(),
                                        origin_cookie_list_map_.end());
   origin_cookie_list_map_.clear();
 }
 
@@ skipping 64 matching lines @@
 }
 
 void CannedBrowsingDataCookieHelper::AddCookie(
     const GURL& frame_url,
     const net::CanonicalCookie& cookie) {
   net::CookieList* cookie_list =
       GetCookiesFor(frame_url.GetOrigin());
   DeleteMatchingCookie(cookie, cookie_list);
   cookie_list->push_back(cookie);
 }