Add more Google domains to the list of domains which should have

chrome/browser/metrics/variations/variations_http_header_provider_unittest.cc

 // Copyright 2013 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/metrics/variations/variations_http_header_provider.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 48 matching lines @@
   VariationsHttpHeaderProviderTest() {}
 
   virtual ~VariationsHttpHeaderProviderTest() {}
 
   virtual void TearDown() OVERRIDE {
     testing::ClearAllVariationIDs();
   }
 };
 
 TEST_F(VariationsHttpHeaderProviderTest, ShouldAppendHeaders) {
+  VariationsHttpHeaderProvider provider;
   struct {
     const char* url;
     bool should_append_headers;
   } cases[] = {
     { "http://google.com", true },
     { "http://www.google.com", true },
     { "http://m.google.com", true },
     { "http://google.ca", true },
     { "https://google.ca", true },
     { "http://google.co.uk", true },
     { "http://google.co.uk:8080/", true },
     { "http://www.google.co.uk:8080/", true },
     { "http://google", false },
 
     { "http://youtube.com", true },
     { "http://www.youtube.com", true },
     { "http://www.youtube.ca", true },
     { "http://www.youtube.co.uk:8080/", true },
     { "https://www.youtube.com", true },
     { "http://youtube", false },
 
     { "http://www.yahoo.com", false },
 
     { "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 },
 
     { "http://ad.googlesyndication.com", true },
     { "https://a.b.c.googlesyndication.com", true },
     { "https://a.b.c.googlesyndication.com:8080", true },
     { "http://www.doubleclick.edu", false },
     { "http://www.googlesyndication.com.edu", false },
     { "https://www.googlesyndication.com.com", false },
 
     { "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 },

[avd, 2014/05/29 23:38:20]

thanks for adding a test case with mixed case.

[Ryan Hamilton, 2014/05/29 23:48:38]

My pleasure!

+    { "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 },

[avd, 2014/05/29 23:38:20]

+    { "http://wwwytimg.com", false },
+    { "http://ytimg.com", false },

[Ryan Hamilton, 2014/05/29 23:48:38]

Done.

+
+    { "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) {
     const GURL url(cases[i].url);
     EXPECT_EQ(cases[i].should_append_headers,
-              VariationsHttpHeaderProvider::ShouldAppendHeaders(url)) << url;
+              provider.ShouldAppendHeaders(url)) << url;
   }
 }
 
 TEST_F(VariationsHttpHeaderProviderTest, SetDefaultVariationIds_Valid) {
   base::MessageLoop loop;
   VariationsHttpHeaderProvider provider;
   GURL url("http://www.google.com");
   net::HttpRequestHeaders headers;
   std::string variations;
 
@@ skipping 60 matching lines @@
   headers.GetHeader("X-Client-Data", &variations);
 
   std::set<VariationID> variation_ids;
   std::set<VariationID> trigger_ids;
   ASSERT_TRUE(ExtractVariationIds(variations, &variation_ids, &trigger_ids));
   EXPECT_TRUE(variation_ids.find(123) != variation_ids.end());
   EXPECT_TRUE(trigger_ids.find(456) != trigger_ids.end());
 }
 
 }  // namespace chrome_variations