Fix Mirror header on Drive domains.

Ensure the GAIA Id is attached for Drive domains even when the path
isn't empty.
Follow-up of http://crrev.com/2343073002.

BUG=647260

Review-Url: https://codereview.chromium.org/2353923003
Cr-Commit-Position: refs/heads/master@{#420605}

components/signin/core/browser/signin_header_helper.cc

@@ -18,6 +18,7 @@
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/escape.h"
+#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
@@ -49,7 +50,7 @@ bool IsDriveOrigin(const GURL& url) {
 bool IsUrlEligibleToIncludeGaiaId(const GURL& url, bool is_header_request) {
   if (is_header_request) {
     // GAIA Id is only necessary for Drive. Don't set it otherwise.
-    return IsDriveOrigin(url);
+    return IsDriveOrigin(url.GetOrigin());
   }
 
   // Cookie requests don't have the granularity to only include the GAIA Id for
@@ -57,8 +58,10 @@ bool IsUrlEligibleToIncludeGaiaId(const GURL& url, bool is_header_request) {
   if (!url.SchemeIsCryptographic())
     return false;
 
-  const GURL kGoogleDotComURL("https://google.com");
-  return url == kGoogleDotComURL;
+  const std::string kGoogleDomain = "google.com";
+  std::string domain = net::registry_controlled_domains::GetDomainAndRegistry(
+      url, net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+  return domain == kGoogleDomain;
 }
 
 // Determines the service type that has been passed from GAIA in the header.
@@ -121,7 +124,7 @@ std::string BuildMirrorRequestIfPossible(
 
   std::vector<std::string> parts;
   if (IsUrlEligibleToIncludeGaiaId(url, is_header_request)) {
-    // Only google.com requires the GAIA ID, don't send it to other domains.
+    // Only set the GAIA Id on domains that actually requires it.
     parts.push_back(
         base::StringPrintf("%s=%s", kGaiaIdAttrName, account_id.c_str()));
   }
@@ -249,7 +252,7 @@ ManageAccountsParams BuildManageAccountsParamsIfExists(net::URLRequest* request,
 }
 
 // Checks if the url has the required properties to have an
-// X-CHROME-CONNECTED header.
+// X-Chrome-Connected header.
 bool IsUrlEligibleForXChromeConnectedHeader(const GURL& url) {
   // Only set the header for Drive and Gaia always, and other Google properties
   // if account consistency is enabled.

components/signin/core/browser/signin_header_helper.h

@@ -76,10 +76,10 @@ bool SettingsAllowSigninCookies(
     const content_settings::CookieSettings* cookie_settings);
 
 // Checks if the url has the required properties to have an
-// X-CHROME-CONNECTED header.
+// X-Chrome-Connected header.
 bool IsUrlEligibleForXChromeConnectedHeader(const GURL& url);
 
-// Returns the X-CHROME-CONNECTED cookie, or an empty string if it should not be
+// Returns the CHROME_CONNECTED cookie, or an empty string if it should not be
 // added to the request to |url|.
 std::string BuildMirrorRequestCookieIfPossible(
     const GURL& url,