Shifted creation of unvalidated CanonicalCookies over to a constructor.

net/cookies/cookie_monster_unittest.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 "net/cookies/cookie_monster.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 1021 matching lines @@
   base::RunLoop loop;
   EXPECT_CALL(set_cookies_callback, Run(true)).WillOnce(QuitRunLoop(&loop));
 
   CompleteLoading();
   loop.Run();
 }
 
 TEST_F(DeferredCookieTaskTest, DeferredSetAllCookies) {
   MockSetCookiesCallback set_cookies_callback;
   CookieList list;
-  list.push_back(*CanonicalCookie::Create(
-      "A", "B", "." + http_www_google_.domain(), "/", base::Time::Now(),
-      base::Time(), base::Time(), false, true, CookieSameSite::DEFAULT_MODE,
-      COOKIE_PRIORITY_DEFAULT));
-  list.push_back(*CanonicalCookie::Create(
-      "C", "D", "." + http_www_google_.domain(), "/", base::Time::Now(),
-      base::Time(), base::Time(), false, true, CookieSameSite::DEFAULT_MODE,
-      COOKIE_PRIORITY_DEFAULT));
+  list.push_back(CanonicalCookie("A", "B", "." + http_www_google_.domain(), "/",
+                                 base::Time::Now(), base::Time(), base::Time(),
+                                 false, true, CookieSameSite::DEFAULT_MODE,
+                                 COOKIE_PRIORITY_DEFAULT));
+  list.push_back(CanonicalCookie("C", "D", "." + http_www_google_.domain(), "/",
+                                 base::Time::Now(), base::Time(), base::Time(),
+                                 false, true, CookieSameSite::DEFAULT_MODE,
+                                 COOKIE_PRIORITY_DEFAULT));
 
   BeginWith(
       SetAllCookiesAction(&cookie_monster(), list, &set_cookies_callback));
 
   WaitForLoadCall();
 
   EXPECT_CALL(set_cookies_callback, Run(true))
       .WillOnce(
           SetAllCookiesAction(&cookie_monster(), list, &set_cookies_callback));
   base::RunLoop loop;
@@ skipping 1466 matching lines @@
 TEST_F(CookieMonsterTest, SetAllCookies) {
   scoped_refptr<FlushablePersistentStore> store(new FlushablePersistentStore());
   std::unique_ptr<CookieMonster> cm(new CookieMonster(store.get(), nullptr));
   cm->SetPersistSessionCookies(true);
 
   EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "U=V; path=/"));
   EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "W=X; path=/foo"));
   EXPECT_TRUE(SetCookie(cm.get(), http_www_google_.url(), "Y=Z; path=/"));
 
   CookieList list;
-  list.push_back(*CanonicalCookie::Create(
+  list.push_back(CanonicalCookie(
       "A", "B", "." + http_www_google_.url().host(), "/", base::Time::Now(),
       base::Time(), base::Time(), false, false, CookieSameSite::DEFAULT_MODE,
       COOKIE_PRIORITY_DEFAULT));
-  list.push_back(*CanonicalCookie::Create(
+  list.push_back(CanonicalCookie(
       "W", "X", "." + http_www_google_.url().host(), "/bar", base::Time::Now(),
       base::Time(), base::Time(), false, false, CookieSameSite::DEFAULT_MODE,
       COOKIE_PRIORITY_DEFAULT));
-  list.push_back(*CanonicalCookie::Create(
+  list.push_back(CanonicalCookie(
       "Y", "Z", "." + http_www_google_.url().host(), "/", base::Time::Now(),
       base::Time(), base::Time(), false, false, CookieSameSite::DEFAULT_MODE,
       COOKIE_PRIORITY_DEFAULT));
 
   // SetAllCookies must not flush.
   ASSERT_EQ(0, store->flush_count());
   EXPECT_TRUE(SetAllCookies(cm.get(), list));
   EXPECT_EQ(0, store->flush_count());
 
   CookieList cookies = GetAllCookies(cm.get());
@@ skipping 14 matching lines @@
   EXPECT_EQ("Y", it->Name());
   EXPECT_EQ("Z", it->Value());
 }
 
 TEST_F(CookieMonsterTest, ComputeCookieDiff) {
   std::unique_ptr<CookieMonster> cm(new CookieMonster(nullptr, nullptr));
 
   base::Time now = base::Time::Now();
   base::Time creation_time = now - base::TimeDelta::FromSeconds(1);
 
-  std::unique_ptr<CanonicalCookie> cookie1(CanonicalCookie::Create(
+  std::unique_ptr<CanonicalCookie> cookie1(base::MakeUnique<CanonicalCookie>(
       "A", "B", "." + http_www_google_.url().host(), "/", creation_time,
       base::Time(), base::Time(), false, false, CookieSameSite::DEFAULT_MODE,
       COOKIE_PRIORITY_DEFAULT));
-  std::unique_ptr<CanonicalCookie> cookie2(CanonicalCookie::Create(
+  std::unique_ptr<CanonicalCookie> cookie2(base::MakeUnique<CanonicalCookie>(
       "C", "D", "." + http_www_google_.url().host(), "/", creation_time,
       base::Time(), base::Time(), false, false, CookieSameSite::DEFAULT_MODE,
       COOKIE_PRIORITY_DEFAULT));
-  std::unique_ptr<CanonicalCookie> cookie3(CanonicalCookie::Create(
+  std::unique_ptr<CanonicalCookie> cookie3(base::MakeUnique<CanonicalCookie>(
       "E", "F", "." + http_www_google_.url().host(), "/", creation_time,
       base::Time(), base::Time(), false, false, CookieSameSite::DEFAULT_MODE,
       COOKIE_PRIORITY_DEFAULT));
-  std::unique_ptr<CanonicalCookie> cookie4(CanonicalCookie::Create(
+  std::unique_ptr<CanonicalCookie> cookie4(base::MakeUnique<CanonicalCookie>(
       "G", "H", "." + http_www_google_.url().host(), "/", creation_time,
       base::Time(), base::Time(), false, false, CookieSameSite::DEFAULT_MODE,
       COOKIE_PRIORITY_DEFAULT));
   std::unique_ptr<CanonicalCookie> cookie4_with_new_value(
-      CanonicalCookie::Create(
+      base::MakeUnique<CanonicalCookie>(
           "G", "iamnew", "." + http_www_google_.url().host(), "/",
           creation_time, base::Time(), base::Time(), false, false,
           CookieSameSite::DEFAULT_MODE, COOKIE_PRIORITY_DEFAULT));
-  std::unique_ptr<CanonicalCookie> cookie5(CanonicalCookie::Create(
+  std::unique_ptr<CanonicalCookie> cookie5(base::MakeUnique<CanonicalCookie>(
       "I", "J", "." + http_www_google_.url().host(), "/", creation_time,
       base::Time(), base::Time(), false, false, CookieSameSite::DEFAULT_MODE,
       COOKIE_PRIORITY_DEFAULT));
   std::unique_ptr<CanonicalCookie> cookie5_with_new_creation_time(
-      CanonicalCookie::Create("I", "J", "." + http_www_google_.url().host(),
-                              "/", now, base::Time(), base::Time(), false,
-                              false, CookieSameSite::DEFAULT_MODE,
-                              COOKIE_PRIORITY_DEFAULT));
-  std::unique_ptr<CanonicalCookie> cookie6(CanonicalCookie::Create(
+      base::MakeUnique<CanonicalCookie>(
+          "I", "J", "." + http_www_google_.url().host(), "/", now, base::Time(),
+          base::Time(), false, false, CookieSameSite::DEFAULT_MODE,
+          COOKIE_PRIORITY_DEFAULT));
+  std::unique_ptr<CanonicalCookie> cookie6(base::MakeUnique<CanonicalCookie>(
       "K", "L", "." + http_www_google_.url().host(), "/foo", creation_time,
       base::Time(), base::Time(), false, false, CookieSameSite::DEFAULT_MODE,
       COOKIE_PRIORITY_DEFAULT));
   std::unique_ptr<CanonicalCookie> cookie6_with_new_path(
-      CanonicalCookie::Create("K", "L", "." + http_www_google_.url().host(),
-                              "/bar", creation_time, base::Time(), base::Time(),
-                              false, false, CookieSameSite::DEFAULT_MODE,
-                              COOKIE_PRIORITY_DEFAULT));
-  std::unique_ptr<CanonicalCookie> cookie7(CanonicalCookie::Create(
+      base::MakeUnique<CanonicalCookie>(
+          "K", "L", "." + http_www_google_.url().host(), "/bar", creation_time,
+          base::Time(), base::Time(), false, false,
+          CookieSameSite::DEFAULT_MODE, COOKIE_PRIORITY_DEFAULT));
+  std::unique_ptr<CanonicalCookie> cookie7(base::MakeUnique<CanonicalCookie>(
       "M", "N", "." + http_www_google_.url().host(), "/foo", creation_time,
       base::Time(), base::Time(), false, false, CookieSameSite::DEFAULT_MODE,
       COOKIE_PRIORITY_DEFAULT));
   std::unique_ptr<CanonicalCookie> cookie7_with_new_path(
-      CanonicalCookie::Create("M", "N", "." + http_www_google_.url().host(),
-                              "/bar", creation_time, base::Time(), base::Time(),
-                              false, false, CookieSameSite::DEFAULT_MODE,
-                              COOKIE_PRIORITY_DEFAULT));
+      base::MakeUnique<CanonicalCookie>(
+          "M", "N", "." + http_www_google_.url().host(), "/bar", creation_time,
+          base::Time(), base::Time(), false, false,
+          CookieSameSite::DEFAULT_MODE, COOKIE_PRIORITY_DEFAULT));
 
   CookieList old_cookies;
   old_cookies.push_back(*cookie1);
   old_cookies.push_back(*cookie2);
   old_cookies.push_back(*cookie4);
   old_cookies.push_back(*cookie5);
   old_cookies.push_back(*cookie6);
   old_cookies.push_back(*cookie7);
 
   CookieList new_cookies;
@@ skipping 191 matching lines @@
   const std::string path("/path");
 
   scoped_refptr<MockPersistentCookieStore> store(new MockPersistentCookieStore);
 
   std::vector<std::unique_ptr<CanonicalCookie>> initial_cookies;
 
   AddCookieToList(url, "foo=bar; path=" + path, now1, &initial_cookies);
 
   // We have to manually build this cookie because it contains a control
   // character, and our cookie line parser rejects control characters.
-  std::unique_ptr<CanonicalCookie> cc = CanonicalCookie::Create(
+  std::unique_ptr<CanonicalCookie> cc = base::MakeUnique<CanonicalCookie>(
       "baz",
       "\x05"
       "boo",
       "." + domain, path, now2, later, base::Time(), false, false,
       CookieSameSite::DEFAULT_MODE, COOKIE_PRIORITY_DEFAULT);
   initial_cookies.push_back(std::move(cc));
 
   AddCookieToList(url, "hello=world; path=" + path, now3, &initial_cookies);
 
   // Inject our initial cookies into the mock PersistentCookieStore.
@@ skipping 522 matching lines @@
       monster()->AddCallbackForCookie(
           test_url_, "abc",
           base::Bind(&RecordCookieChanges, &cookies1, nullptr)));
   SetCookie(monster(), test_url_, "abc=def");
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1U, cookies0.size());
   EXPECT_EQ(1U, cookies0.size());
 }
 
 }  // namespace net