DO NOT LAND

net/http/http_auth_filter_unittest.cc

Index: net/http/http_auth_filter_unittest.cc
diff --git a/net/http/http_auth_filter_unittest.cc b/net/http/http_auth_filter_unittest.cc
index 25723c136a3ef89e7ba518b6d7461872f98ef25a..017f42498acd5d0a32f79bb33b09161025b25d3d 100644
--- a/net/http/http_auth_filter_unittest.cc
+++ b/net/http/http_auth_filter_unittest.cc
@@ -28,44 +28,72 @@ enum {
 };
 
 struct UrlData {
-  GURL url;
+  url::Origin origin;
   HttpAuth::Target target;
   bool matches;
   int match_bits;
 };
 
 static const UrlData urls[] = {
-  { GURL(std::string()), HttpAuth::AUTH_NONE, false, 0 },
-  { GURL("http://foo.cn"), HttpAuth::AUTH_PROXY, true, ALL_SERVERS_MATCH },
-  { GURL("http://foo.cn"), HttpAuth::AUTH_SERVER, false, 0 },
-  { GURL("http://slashdot.org"), HttpAuth::AUTH_NONE, false, 0 },
-  { GURL("http://www.google.com"), HttpAuth::AUTH_SERVER, true, 1 << 0 },
-  { GURL("http://www.google.com"), HttpAuth::AUTH_PROXY, true,
-    ALL_SERVERS_MATCH },
-  { GURL("https://login.facebook.com/login.php?login_attempt=1"),
-    HttpAuth::AUTH_NONE, false, 0 },
-  { GURL("http://codereview.chromium.org/634002/show"), HttpAuth::AUTH_SERVER,
-    true, 1 << 3 },
-  { GURL("http://code.google.com/p/chromium/issues/detail?id=34505"),
-    HttpAuth::AUTH_SERVER, true, 1 << 0 },
-  { GURL("http://code.google.com/p/chromium/issues/list?can=2&q=label:"
+    {url::Origin(std::string()), HttpAuth::AUTH_NONE, false, 0},
+    {url::Origin("http://foo.cn"),
+     HttpAuth::AUTH_PROXY,
+     true,
+     ALL_SERVERS_MATCH},
+    {url::Origin("http://foo.cn"), HttpAuth::AUTH_SERVER, false, 0},
+    {url::Origin("http://slashdot.org"), HttpAuth::AUTH_NONE, false, 0},
+    {url::Origin("http://www.google.com"), HttpAuth::AUTH_SERVER, true, 1 << 0},
+    {url::Origin("http://www.google.com"),
+     HttpAuth::AUTH_PROXY,
+     true,
+     ALL_SERVERS_MATCH},
+    {url::Origin("https://login.facebook.com/login.php?login_attempt=1"),
+     HttpAuth::AUTH_NONE,
+     false,
+     0},
+    {url::Origin("http://codereview.chromium.org/634002/show"),
+     HttpAuth::AUTH_SERVER,
+     true,
+     1 << 3},
+    {url::Origin("http://code.google.com/p/chromium/issues/detail?id=34505"),
+     HttpAuth::AUTH_SERVER,
+     true,
+     1 << 0},
+    {url::Origin(
+         "http://code.google.com/p/chromium/issues/list?can=2&q=label:"
          "spdy&sort=owner&colspec=ID%20Stars%20Pri%20Area%20Type%20Status%20"
          "Summary%20Modified%20Owner%20Mstone%20OS"),
-    HttpAuth::AUTH_SERVER, true, 1 << 3 },
-  { GURL("https://www.linkedin.com/secure/login?trk=hb_signin"),
-    HttpAuth::AUTH_SERVER, true, 1 << 1 },
-  { GURL("http://www.linkedin.com/mbox?displayMBoxItem=&"
+     HttpAuth::AUTH_SERVER,
+     true,
+     1 << 3},
+    {url::Origin("https://www.linkedin.com/secure/login?trk=hb_signin"),
+     HttpAuth::AUTH_SERVER,
+     true,
+     1 << 1},
+    {url::Origin(
+         "http://www.linkedin.com/mbox?displayMBoxItem=&"
          "itemID=I1717980652_2&trk=COMM_HP_MSGVW_MEBC_MEBC&goback=.hom"),
-    HttpAuth::AUTH_SERVER, true, 1 << 1 },
-  { GURL("http://news.slashdot.org/story/10/02/18/190236/"
+     HttpAuth::AUTH_SERVER,
+     true,
+     1 << 1},
+    {url::Origin(
+         "http://news.slashdot.org/story/10/02/18/190236/"
          "New-Plan-Lets-Top-HS-Students-Graduate-2-Years-Early"),
-    HttpAuth::AUTH_PROXY, true, ALL_SERVERS_MATCH },
-  { GURL("http://codereview.chromium.org/646068/diff/4001/5003"),
-    HttpAuth::AUTH_SERVER, true, 1 << 3 },
-  { GURL("http://codereview.chromium.gag/646068/diff/4001/5003"),
-    HttpAuth::AUTH_SERVER, true, 1 << 4 },
-  { GURL("http://codereview.chromium.gog/646068/diff/4001/5003"),
-    HttpAuth::AUTH_SERVER, true, 1 << 5 },
+     HttpAuth::AUTH_PROXY,
+     true,
+     ALL_SERVERS_MATCH},
+    {url::Origin("http://codereview.chromium.org/646068/diff/4001/5003"),
+     HttpAuth::AUTH_SERVER,
+     true,
+     1 << 3},
+    {url::Origin("http://codereview.chromium.gag/646068/diff/4001/5003"),
+     HttpAuth::AUTH_SERVER,
+     true,
+     1 << 4},
+    {url::Origin("http://codereview.chromium.gog/646068/diff/4001/5003"),
+     HttpAuth::AUTH_SERVER,
+     true,
+     1 << 5},
 };
 
 }   // namespace
@@ -75,8 +103,8 @@ TEST(HttpAuthFilterTest, EmptyFilter) {
   HttpAuthFilterWhitelist filter((std::string()));
   for (size_t i = 0; i < arraysize(urls); i++) {
     EXPECT_EQ(urls[i].target == HttpAuth::AUTH_PROXY,
-              filter.IsValid(urls[i].url, urls[i].target))
-        << " " << i << ": " << urls[i].url;
+              filter.IsValid(urls[i].origin, urls[i].target))
+        << " " << i << ": " << urls[i].origin;
   }
 }
 
@@ -91,8 +119,8 @@ TEST(HttpAuthFilterTest, NonEmptyFilter) {
   }
   HttpAuthFilterWhitelist filter(server_whitelist_filter_string);
   for (size_t i = 0; i < arraysize(urls); i++) {
-    EXPECT_EQ(urls[i].matches, filter.IsValid(urls[i].url, urls[i].target))
-        << " " << i << ": " << urls[i].url;
+    EXPECT_EQ(urls[i].matches, filter.IsValid(urls[i].origin, urls[i].target))
+        << " " << i << ": " << urls[i].origin;
   }
 }