Add more Google domains to the list of domains which should have X-Chrome-Data sent to them.

BUG=379341

Review URL: https://codereview.chromium.org/307743003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274021 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/metrics/variations/variations_http_header_provider.cc

@@ -20,6 +20,24 @@
 
 namespace chrome_variations {
 
+namespace {
+
+const char* kSuffixesToSetHeadersFor[] = {
+  ".android.com",
+  ".doubleclick.com",
+  ".doubleclick.net",
+  ".ggpht.com",
+  ".googleadservices.com",
+  ".googleapis.com",
+  ".googlesyndication.com",
+  ".googleusercontent.com",
+  ".googlevideo.com",
+  ".gstatic.com",
+  ".ytimg.com",
+};
+
+}  // namespace
+
 VariationsHttpHeaderProvider* VariationsHttpHeaderProvider::GetInstance() {
   return Singleton<VariationsHttpHeaderProvider>::get();
 }
@@ -229,10 +247,9 @@ bool VariationsHttpHeaderProvider::ShouldAppendHeaders(const GURL& url) {
   // Some domains don't have international TLD extensions, so testing for them
   // is very straight forward.
   const std::string host = url.host();
-  if (EndsWith(host, ".doubleclick.net", false) ||
-      EndsWith(host, ".googlesyndication.com", false) ||
-      LowerCaseEqualsASCII(host, "www.googleadservices.com")) {
-    return true;
+  for (size_t i = 0; i < arraysize(kSuffixesToSetHeadersFor); ++i) {
+    if (EndsWith(host, kSuffixesToSetHeadersFor[i], false))
+      return true;
   }
 
   // The below mirrors logic in IsGoogleDomainUrl(), but for youtube.<TLD>.

chrome/browser/metrics/variations/variations_http_header_provider_unittest.cc

@@ -92,7 +92,8 @@ TEST_F(VariationsHttpHeaderProviderTest, ShouldAppendHeaders) {
     { "http://ad.doubleclick.net", true },
     { "https://a.b.c.doubleclick.net", true },
     { "https://a.b.c.doubleclick.net:8081", true },
-    { "http://www.doubleclick.com", false },
+    { "http://www.doubleclick.com", true },
+    { "http://www.doubleclick.org", false },
     { "http://www.doubleclick.net.com", false },
     { "https://www.doubleclick.net.com", false },
 
@@ -106,10 +107,53 @@ TEST_F(VariationsHttpHeaderProviderTest, ShouldAppendHeaders) {
     { "http://www.googleadservices.com", true },
     { "http://www.googleadservices.com:8080", true },
     { "https://www.googleadservices.com", true },
-    { "https://www.internal.googleadservices.com", false },
-    { "https://www2.googleadservices.com", false },
+    { "https://www.internal.googleadservices.com", true },
+    { "https://www2.googleadservices.com", true },
     { "https://www.googleadservices.org", false },
     { "https://www.googleadservices.com.co.uk", false },
+
+    { "http://WWW.ANDROID.COM", true },
+    { "http://www.android.com", true },
+    { "http://www.doubleclick.com", true },
+    { "http://www.doubleclick.net", true },
+    { "http://www.ggpht.com", true },
+    { "http://www.googleadservices.com", true },
+    { "http://www.googleapis.com", true },
+    { "http://www.googlesyndication.com", true },
+    { "http://www.googleusercontent.com", true },
+    { "http://www.googlevideo.com", true },
+    { "http://ssl.gstatic.com", true },
+    { "http://www.gstatic.com", true },
+    { "http://www.ytimg.com", true },
+    { "http://wwwytimg.com", false },
+    { "http://ytimg.com", false },
+
+    { "http://www.android.org", false },
+    { "http://www.doubleclick.org", false },
+    { "http://www.doubleclick.net", true },
+    { "http://www.ggpht.org", false },
+    { "http://www.googleadservices.org", false },
+    { "http://www.googleapis.org", false },
+    { "http://www.googlesyndication.org", false },
+    { "http://www.googleusercontent.org", false },
+    { "http://www.googlevideo.org", false },
+    { "http://ssl.gstatic.org", false },
+    { "http://www.gstatic.org", false },
+    { "http://www.ytimg.org", false },
+
+    { "http://a.b.android.com", true },
+    { "http://a.b.doubleclick.com", true },
+    { "http://a.b.doubleclick.net", true },
+    { "http://a.b.ggpht.com", true },
+    { "http://a.b.googleadservices.com", true },
+    { "http://a.b.googleapis.com", true },
+    { "http://a.b.googlesyndication.com", true },
+    { "http://a.b.googleusercontent.com", true },
+    { "http://a.b.googlevideo.com", true },
+    { "http://ssl.gstatic.com", true },
+    { "http://a.b.gstatic.com", true },
+    { "http://a.b.ytimg.com", true },
+
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {