components/signin: convert GaiaCookieManagerService to use CanonicalCookie's Create() method.

components/signin/core/browser/gaia_cookie_manager_service.cc

 // Copyright 2014 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 "components/signin/core/browser/gaia_cookie_manager_service.h"
 
 #include <stddef.h>
 
 #include <queue>
 #include <vector>
@@ skipping 360 matching lines @@
   } else if (std::find_if(requests_.begin(), requests_.end(),
                           [](const GaiaCookieRequest& request) {
                             return request.request_type() == LIST_ACCOUNTS;
                           }) == requests_.end()) {
     requests_.push_back(GaiaCookieRequest::CreateListAccountsRequest());
   }
 }
 
 void GaiaCookieManagerService::ForceOnCookieChangedProcessing() {
   GURL google_url = GaiaUrls::GetInstance()->google_url();
-  net::CanonicalCookie cookie(
-      google_url, kGaiaCookieName, "", google_url.host(), "", base::Time(),
-      base::Time(), base::Time(), false, false,
-      net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT);
-  OnCookieChanged(cookie, true);
+  std::unique_ptr<net::CanonicalCookie> cookie(net::CanonicalCookie::Create(
+      google_url, kGaiaCookieName, std::string(), "." + google_url.host(),
+      std::string(), base::Time(), base::Time(), false, false,
+      net::CookieSameSite::DEFAULT_MODE, false, net::COOKIE_PRIORITY_DEFAULT));
+  OnCookieChanged(*cookie, true);
 }
 
 void GaiaCookieManagerService::LogOutAllAccounts() {
   VLOG(1) << "GaiaCookieManagerService::LogOutAllAccounts";
 
   bool log_out_queued = false;
   if (!requests_.empty()) {
     // Track requests to keep; all other unstarted requests will be removed.
     std::vector<GaiaCookieRequest> requests_to_keep;
 
@@ skipping 51 matching lines @@
   gaia_auth_fetcher_.reset();
   uber_token_fetcher_.reset();
   requests_.clear();
   fetcher_timer_.Stop();
 }
 
 void GaiaCookieManagerService::OnCookieChanged(
     const net::CanonicalCookie& cookie,
     bool removed) {
   DCHECK_EQ(kGaiaCookieName, cookie.Name());
-  DCHECK_EQ(GaiaUrls::GetInstance()->google_url().host(), cookie.Domain());
+  DCHECK(cookie.IsDomainMatch(GaiaUrls::GetInstance()->google_url().host()));
   list_accounts_stale_ = true;
   // Ignore changes to the cookie while requests are pending.  These changes
   // are caused by the service itself as it adds accounts.  A side effects is
   // that any changes to the gaia cookie outside of this class, while requests
   // are pending, will be lost.  However, trying to process these changes could
   // cause an endless loop (see crbug.com/516070).
   if (requests_.empty()) {
     requests_.push_back(GaiaCookieRequest::CreateListAccountsRequest());
     fetcher_retries_ = 0;
     signin_client_->DelayNetworkCall(
@@ skipping 247 matching lines @@
         break;
       case GaiaCookieRequestType::LIST_ACCOUNTS:
         uber_token_fetcher_.reset();
         signin_client_->DelayNetworkCall(
             base::Bind(&GaiaCookieManagerService::StartFetchingListAccounts,
                        base::Unretained(this)));
         break;
     };
   }
 }