net: remove CanonicalCookie ctor that takes two parameters

The problem of using the constructor is that with it there
is no way to return an error if bad arguments are passed in.

That can be done by using the static method Create, that
does some validation and returns null if an attribute value
is invalid.

BUG=57061
TEST=unit_tests, net_unittests
R=mmenke@chromium.org
TBR=bauerb@chromium.org,msw@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#383069}

8 files changed, 18 insertions, 60 deletions

diff --git a/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
index 313bd3b..7ea8335 100644
--- a/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
@@ -6,10 +6,11 @@
 
 #include "base/bind.h"
 #include "base/run_loop.h"
+#include "base/time/time.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/cookies/canonical_cookie.h"
-#include "net/cookies/parsed_cookie.h"
+#include "net/cookies/cookie_options.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -395,9 +396,8 @@ TEST_F(BrowsingDataCookieHelperTest, CannedEmpty) {
   ASSERT_TRUE(helper->empty());
 
   net::CookieList cookies;
-  net::ParsedCookie pc("a=1");
-  scoped_ptr<net::CanonicalCookie> cookie(
-      new net::CanonicalCookie(url_google, pc));
+  scoped_ptr<net::CanonicalCookie> cookie(net::CanonicalCookie::Create(
+      url_google, "a=1", base::Time::Now(), net::CookieOptions()));
   cookies.push_back(*cookie);
 
   helper->AddReadCookies(url_google, url_google, cookies);
diff --git a/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc
index b44d352..6ae519b 100644
--- a/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc
+++ b/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc
@@ -6,7 +6,8 @@
 
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "net/cookies/parsed_cookie.h"
+#include "base/time/time.h"
+#include "net/cookies/cookie_options.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 MockBrowsingDataCookieHelper::MockBrowsingDataCookieHelper(
@@ -34,8 +35,8 @@ void MockBrowsingDataCookieHelper::DeleteCookie(
 
 void MockBrowsingDataCookieHelper::AddCookieSamples(
     const GURL& url, const std::string& cookie_line) {
-  net::ParsedCookie pc(cookie_line);
-  scoped_ptr<net::CanonicalCookie> cc(new net::CanonicalCookie(url, pc));
+  scoped_ptr<net::CanonicalCookie> cc(net::CanonicalCookie::Create(
+      url, cookie_line, base::Time::Now(), net::CookieOptions()));
 
   if (cc.get()) {
     for (const auto& cookie : cookie_list_) {
diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm
index c4db6b1..7c5d252 100644
--- a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm
+++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm
@@ -4,11 +4,12 @@
 
 #include <stdint.h>
 #include "base/strings/sys_string_conversions.h"
+#include "base/time/time.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 
 #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h"
 #include "net/cookies/canonical_cookie.h"
-#include "net/cookies/parsed_cookie.h"
+#include "net/cookies/cookie_options.h"
 #import "testing/gtest_mac.h"
 #include "url/gurl.h"
 
@@ -29,9 +30,9 @@ TEST_F(CookiesDetailsTest, CreateForCookie) {
   GURL url("http://chromium.org");
   std::string cookieLine(
       "PHPSESSID=0123456789abcdef0123456789abcdef; path=/");
-  net::ParsedCookie pc(cookieLine);
-  net::CanonicalCookie cookie(url, pc);
-  details.reset([[CocoaCookieDetails alloc] initWithCookie:&cookie
+  scoped_ptr<net::CanonicalCookie> cookie(net::CanonicalCookie::Create(
+      url, cookieLine, base::Time::Now(), net::CookieOptions()));
+  details.reset([[CocoaCookieDetails alloc] initWithCookie:cookie.get()
                                          canEditExpiration:NO]);
 
   EXPECT_EQ([details.get() type], kCocoaCookieDetailsTypeCookie);
diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm
index 789e64f..f3e847c 100644
--- a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm
@@ -3,11 +3,12 @@
 // found in the LICENSE file.
 
 #include "base/strings/sys_string_conversions.h"
+#include "base/time/time.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h"
 #include "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h"
 #include "net/cookies/canonical_cookie.h"
-#include "net/cookies/parsed_cookie.h"
+#include "net/cookies/cookie_options.h"
 
 namespace {
 
@@ -18,10 +19,10 @@ static CocoaCookieDetails* CreateTestCookieDetails(BOOL canEditExpiration) {
   GURL url("http://chromium.org");
   std::string cookieLine(
       "PHPSESSID=0123456789abcdef0123456789abcdef; path=/");
-  net::ParsedCookie pc(cookieLine);
-  net::CanonicalCookie cookie(url, pc);
+  scoped_ptr<net::CanonicalCookie> cookie(net::CanonicalCookie::Create(
+      url, cookieLine, base::Time::Now(), net::CookieOptions()));
   CocoaCookieDetails* details = [CocoaCookieDetails alloc];
-  [details initWithCookie:&cookie
+  [details initWithCookie:cookie.get()
         canEditExpiration:canEditExpiration];
   return [details autorelease];
 }
diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc
index 523500e8..ef341dd 100644
--- a/chrome/browser/ui/views/cookie_info_view.cc
+++ b/chrome/browser/ui/views/cookie_info_view.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "net/cookies/canonical_cookie.h"
-#include "net/cookies/parsed_cookie.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
@@ -69,14 +68,6 @@ void CookieInfoView::SetCookie(const std::string& domain,
   Layout();
 }
 
-void CookieInfoView::SetCookieString(const GURL& url,
-                                     const std::string& cookie_line) {
-  net::ParsedCookie pc(cookie_line);
-  net::CanonicalCookie cookie(url, pc);
-  SetCookie(pc.HasDomain() ? pc.Domain() : url.host(), cookie);
-}
-
-
 void CookieInfoView::ClearCookieDisplay() {
   base::string16 no_cookie_string =
       l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_NONESELECTED);
diff --git a/chrome/browser/ui/views/cookie_info_view.h b/chrome/browser/ui/views/cookie_info_view.h
index 1140138..ec041da 100644
--- a/chrome/browser/ui/views/cookie_info_view.h
+++ b/chrome/browser/ui/views/cookie_info_view.h
@@ -36,9 +36,6 @@ class CookieInfoView : public views::View {
   void SetCookie(const std::string& domain,
                  const net::CanonicalCookie& cookie_node);
 
-  // Update the display from the specified cookie string.
-  void SetCookieString(const GURL& url, const std::string& cookie_line);
-
   // Clears the cookie display to indicate that no or multiple cookies are
   // selected.
   void ClearCookieDisplay();
diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc
index 89b5b4d..bce2b54 100644
--- a/net/cookies/canonical_cookie.cc
+++ b/net/cookies/canonical_cookie.cc
@@ -149,34 +149,6 @@ CanonicalCookie::CanonicalCookie(const GURL& url,
       same_site_(same_site),
       priority_(priority) {}
 
-CanonicalCookie::CanonicalCookie(const GURL& url, const ParsedCookie& pc)
-    : source_(url.SchemeIsFile() ? url : url.GetOrigin()),
-      name_(pc.Name()),
-      value_(pc.Value()),
-      path_(CanonPath(url, pc)),
-      creation_date_(Time::Now()),
-      last_access_date_(Time()),
-      secure_(pc.IsSecure()),
-      httponly_(pc.IsHttpOnly()),
-      same_site_(pc.SameSite()),
-      priority_(pc.Priority()) {
-  if (pc.HasExpires())
-    expiry_date_ = CanonExpiration(pc, creation_date_, creation_date_);
-
-  // Do the best we can with the domain.
-  std::string cookie_domain;
-  std::string domain_string;
-  if (pc.HasDomain()) {
-    domain_string = pc.Domain();
-  }
-  bool result
-      = cookie_util::GetCookieDomainWithString(url, domain_string,
-                                                &cookie_domain);
-  // Caller is responsible for passing in good arguments.
-  DCHECK(result);
-  domain_ = cookie_domain;
-}
-
 CanonicalCookie::CanonicalCookie(const CanonicalCookie& other) = default;
 
 CanonicalCookie::~CanonicalCookie() {
diff --git a/net/cookies/canonical_cookie.h b/net/cookies/canonical_cookie.h
index e14cf2e..f95501c 100644
--- a/net/cookies/canonical_cookie.h
+++ b/net/cookies/canonical_cookie.h
@@ -41,11 +41,6 @@ class NET_EXPORT CanonicalCookie {
                   CookieSameSite same_site,
                   CookiePriority priority);
 
-  // This constructor does canonicalization but not validation.
-  // The result of this constructor should not be relied on in contexts
-  // in which pre-validation of the ParsedCookie has not been done.
-  CanonicalCookie(const GURL& url, const ParsedCookie& pc);
-
   CanonicalCookie(const CanonicalCookie& other);
 
   ~CanonicalCookie();