Remove dangerous CanonicalCookie::Create method.

content/browser/net/quota_policy_cookie_store_unittest.cc

 // Copyright 2015 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 "content/browser/net/quota_policy_cookie_store.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
@@ skipping 73 matching lines @@
                      CanonicalCookieVector* cookies) {
     scoped_refptr<net::SQLitePersistentCookieStore> sqlite_store(
         new net::SQLitePersistentCookieStore(
             temp_dir_.GetPath().Append(kTestCookiesFilename),
             client_task_runner(), background_task_runner(), true, nullptr));
     store_ = new QuotaPolicyCookieStore(sqlite_store.get(), storage_policy);
     Load(cookies);
   }
 
   // Adds a persistent cookie to store_.
-  void AddCookie(const GURL& url,
-                 const std::string& name,
+  void AddCookie(const std::string& name,
                  const std::string& value,
                  const std::string& domain,
                  const std::string& path,
                  const base::Time& creation) {
     store_->AddCookie(*net::CanonicalCookie::Create(
-        url, name, value, domain, path, creation, creation, false, false,
-        net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT));
+        name, value, domain, path, creation, creation, base::Time(), false,
+        false, net::CookieSameSite::DEFAULT_MODE,
+        net::COOKIE_PRIORITY_DEFAULT));
   }
 
   void DestroyStore() {
     store_ = nullptr;
     // Ensure that |store_|'s destructor has run by shutting down the pool and
     // then forcing the pool to be destructed. This will ensure that all the
     // tasks that block pool shutdown (e.g. |store_|'s cleanup) have run before
     // yielding control.
     pool_owner_->pool()->FlushForTesting();
     pool_owner_.reset(new base::SequencedWorkerPoolOwner(3, "Background Pool"));
@@ skipping 16 matching lines @@
   CanonicalCookieVector cookies_;
 };
 
 // Test if data is stored as expected in the QuotaPolicy database.
 TEST_F(QuotaPolicyCookieStoreTest, TestPersistence) {
   CanonicalCookieVector cookies;
   CreateAndLoad(nullptr, &cookies);
   ASSERT_EQ(0U, cookies.size());
 
   base::Time t = base::Time::Now();
-  AddCookie(GURL("http://foo.com"), "A", "B", std::string(), "/", t);
+  AddCookie("A", "B", "foo.com", "/", t);
   t += base::TimeDelta::FromInternalValue(10);
-  AddCookie(GURL("http://persistent.com"), "A", "B", std::string(), "/", t);
+  AddCookie("A", "B", "persistent.com", "/", t);
 
   // Replace the store, which forces the current store to flush data to
   // disk. Then, after reloading the store, confirm that the data was flushed by
   // making sure it loads successfully.  This ensures that all pending commits
   // are made to the store before allowing it to be closed.
   DestroyStore();
 
   // Reload and test for persistence.
   cookies.clear();
   CreateAndLoad(nullptr, &cookies);
@@ skipping 21 matching lines @@
   cookies.clear();
 }
 
 // Test if data is stored as expected in the QuotaPolicy database.
 TEST_F(QuotaPolicyCookieStoreTest, TestPolicy) {
   CanonicalCookieVector cookies;
   CreateAndLoad(nullptr, &cookies);
   ASSERT_EQ(0U, cookies.size());
 
   base::Time t = base::Time::Now();
-  AddCookie(GURL("http://foo.com"), "A", "B", std::string(), "/", t);
+  AddCookie("A", "B", "foo.com", "/", t);
   t += base::TimeDelta::FromInternalValue(10);
-  AddCookie(GURL("http://persistent.com"), "A", "B", std::string(), "/", t);
+  AddCookie("A", "B", "persistent.com", "/", t);
   t += base::TimeDelta::FromInternalValue(10);
-  AddCookie(GURL("http://nonpersistent.com"), "A", "B", std::string(), "/", t);
+  AddCookie("A", "B", "nonpersistent.com", "/", t);
 
   // Replace the store, which forces the current store to flush data to
   // disk. Then, after reloading the store, confirm that the data was flushed by
   // making sure it loads successfully.  This ensures that all pending commits
   // are made to the store before allowing it to be closed.
   DestroyStore();
   // Specify storage policy that makes "nonpersistent.com" session only.
   scoped_refptr<content::MockSpecialStoragePolicy> storage_policy =
       new content::MockSpecialStoragePolicy();
   storage_policy->AddSessionOnly(
       net::cookie_util::CookieOriginToURL("nonpersistent.com", false));
 
   // Reload and test for persistence.
   cookies.clear();
   CreateAndLoad(storage_policy.get(), &cookies);
   EXPECT_EQ(3U, cookies.size());
 
   t += base::TimeDelta::FromInternalValue(10);
-  AddCookie(GURL("http://nonpersistent.com"), "A", "B", std::string(),
-            "/second", t);
+  AddCookie("A", "B", "nonpersistent.com", "/second", t);
 
   // Now close the store, and "nonpersistent.com" should be deleted according to
   // policy.
   DestroyStore();
   cookies.clear();
   CreateAndLoad(nullptr, &cookies);
 
   EXPECT_EQ(2U, cookies.size());
   for (const auto& cookie : cookies) {
     EXPECT_NE("nonpersistent.com", cookie->Domain());
   }
   cookies.clear();
 }
 
 TEST_F(QuotaPolicyCookieStoreTest, ForceKeepSessionState) {
   CanonicalCookieVector cookies;
   CreateAndLoad(nullptr, &cookies);
   ASSERT_EQ(0U, cookies.size());
 
   base::Time t = base::Time::Now();
-  AddCookie(GURL("http://foo.com"), "A", "B", std::string(), "/", t);
+  AddCookie("A", "B", "foo.com", "/", t);
 
   // Recreate |store_| with a storage policy that makes "nonpersistent.com"
   // session only, but then instruct the store to forcibly keep all cookies.
   DestroyStore();
   scoped_refptr<content::MockSpecialStoragePolicy> storage_policy =
       new content::MockSpecialStoragePolicy();
   storage_policy->AddSessionOnly(
       net::cookie_util::CookieOriginToURL("nonpersistent.com", false));
 
   // Reload and test for persistence
   cookies.clear();
   CreateAndLoad(storage_policy.get(), &cookies);
   EXPECT_EQ(1U, cookies.size());
 
   t += base::TimeDelta::FromInternalValue(10);
-  AddCookie(GURL("http://persistent.com"), "A", "B", std::string(), "/", t);
+  AddCookie("A", "B", "persistent.com", "/", t);
   t += base::TimeDelta::FromInternalValue(10);
-  AddCookie(GURL("http://nonpersistent.com"), "A", "B", std::string(), "/", t);
+  AddCookie("A", "B", "nonpersistent.com", "/", t);
 
   // Now close the store, but the "nonpersistent.com" cookie should not be
   // deleted.
   store_->SetForceKeepSessionState();
   DestroyStore();
   cookies.clear();
   CreateAndLoad(nullptr, &cookies);
 
   EXPECT_EQ(3U, cookies.size());
   cookies.clear();
 }
 
 // Tests that the special storage policy is properly applied even when the store
 // is destroyed on a background thread.
 TEST_F(QuotaPolicyCookieStoreTest, TestDestroyOnBackgroundThread) {
   // Specify storage policy that makes "nonpersistent.com" session only.
   scoped_refptr<content::MockSpecialStoragePolicy> storage_policy =
       new content::MockSpecialStoragePolicy();
   storage_policy->AddSessionOnly(
       net::cookie_util::CookieOriginToURL("nonpersistent.com", false));
 
   CanonicalCookieVector cookies;
   CreateAndLoad(storage_policy.get(), &cookies);
   ASSERT_EQ(0U, cookies.size());
 
   base::Time t = base::Time::Now();
-  AddCookie(GURL("http://nonpersistent.com"), "A", "B", std::string(), "/", t);
+  AddCookie("A", "B", "nonpersistent.com", "/", t);
 
   // Replace the store, which forces the current store to flush data to
   // disk. Then, after reloading the store, confirm that the data was flushed by
   // making sure it loads successfully.  This ensures that all pending commits
   // are made to the store before allowing it to be closed.
   DestroyStoreOnBackgroundThread();
 
   // Reload and test for persistence.
   cookies.clear();
   CreateAndLoad(storage_policy.get(), &cookies);
   EXPECT_EQ(0U, cookies.size());
 
   cookies.clear();
 }
 
 }  // namespace
 }  // namespace content