Make CanonicalCookie::Source() private.

chrome/browser/chromeos/login/profile_auth_data.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/chromeos/login/profile_auth_data.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 26 matching lines @@
 const char kSAMLStartCookie[] = "google-accounts-saml-start";
 const char kSAMLEndCookie[] = "google-accounts-saml-end";
 
 // Import |cookies| into |cookie_store|.
 void ImportCookies(const net::CookieList& cookies,
                    net::CookieStore* cookie_store) {
   for (const auto& cookie : cookies) {
     // To re-create the original cookie, a domain should only be passed in to
     // SetCookieWithDetailsAsync if cookie.Domain() has a leading period, to
     // re-create the original cookie.
-    std::string domain;
-    if (!cookie.Domain().empty() && cookie.Domain()[0] == '.')
-      domain = cookie.Domain();
+    std::string effective_domain = cookie.Domain();

[achuithb, 2016/07/13 09:18:31]

Could we add a unit test for this?

[mmenke, 2016/07/14 17:34:57]

The no-dot path was already being tested. Added a cookie with a leading dot to
the existing test code.

+    std::string host;
+    if (effective_domain.length() > 1 && effective_domain[0] == '.') {
+      host = effective_domain.substr(1);
+    } else {
+      host = effective_domain;
+      effective_domain = "";
+    }
+
+    // Assume HTTPS - since the cookies are being restored from another store,
+    // they have already gone through the strict secure check.
+    GURL url(std::string(url::kHttpsScheme) + url::kStandardSchemeSeparator +
+             host + "/");
 
     cookie_store->SetCookieWithDetailsAsync(
-        cookie.Source(), cookie.Name(), cookie.Value(), domain, cookie.Path(),
+        url, cookie.Name(), cookie.Value(), effective_domain, cookie.Path(),
         cookie.CreationDate(), cookie.ExpiryDate(), cookie.LastAccessDate(),
         cookie.IsSecure(), cookie.IsHttpOnly(), cookie.SameSite(),
         // enforce_strict_secure should have been applied on the original
-        // cookie, prior to import.
+        // cookie, prior to import. This allows URL to be treated as an HTTP

[Mike West, 2016/07/13 09:59:26]

Nit: "... to be treated as an _HTTPS_ URL"?

[mmenke, 2016/07/14 17:34:57]

Done

+        // URL, whether the cookie was set by an HTTP or HTTPS domain (Something
+        // that can't be determined by just looking at the CanonicalCookie).
         false, cookie.Priority(), net::CookieStore::SetCookiesCallback());
   }
 }
 
 class ProfileAuthDataTransferer {
  public:
   ProfileAuthDataTransferer(
       net::URLRequestContextGetter* from_context,
       net::URLRequestContextGetter* to_context,
       bool transfer_auth_cookies_and_channel_ids_on_first_login,
@@ skipping 271 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   (new ProfileAuthDataTransferer(
        from_context,
        to_context,
        transfer_auth_cookies_and_channel_ids_on_first_login,
        transfer_saml_auth_cookies_on_subsequent_login,
        completion_callback))->BeginTransfer();
 }
 
 }  // namespace chromeos