Revert 145136 - Merge 144529 - Use the first_party_for_cookies URL to filter which requests the Web…

chrome/browser/extensions/api/web_request/web_request_api_unittest.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 <queue>
 #include <map>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 1467 matching lines @@
   EXPECT_TRUE(credentials_set);
   EXPECT_FALSE(auth3.Empty());
   EXPECT_EQ(username, auth1.username());
   EXPECT_EQ(password, auth1.password());
   EXPECT_EQ(1u, conflicting_extensions.size());
   EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2"));
   EXPECT_EQ(3u, event_log.size());
 }
 
 TEST(ExtensionWebRequestHelpersTest, TestHideRequestForURL) {
-  MessageLoopForIO message_loop;
-  TestURLRequestContext context;
   const char* sensitive_urls[] = {
       "http://www.google.com/chrome",
       "https://www.google.com/chrome",
       "http://www.google.com/chrome/foobar",
       "https://www.google.com/chrome/foobar",
       "http://chrome.google.com",
       "https://chrome.google.com",
       "http://client2.google.com",
       "https://client2.google.com",
       // No http version of webstore.
       "https://chrome.google.com/webstore",
       "http://clients2.google.com/service/update2/crx",
       "https://clients2.google.com/service/update2/crx",
       "http://www.gstatic.com/chrome/extensions/blacklist",
       "https://www.gstatic.com/chrome/extensions/blacklist",
       "notregisteredscheme://www.foobar.com"
   };
   const char* non_sensitive_urls[] = {
       "http://www.google.com/"
   };
-  // Check that requests are rejected based on the destination
   for (size_t i = 0; i < arraysize(sensitive_urls); ++i) {
-    GURL sensitive_url(sensitive_urls[i]);
-    TestURLRequest request(sensitive_url, NULL, &context);
-    EXPECT_TRUE(helpers::HideRequest(&request)) << sensitive_urls[i];
+    EXPECT_TRUE(helpers::HideRequestForURL(GURL(sensitive_urls[i])))
+        << sensitive_urls[i];
   }
-  // Check that requests are accepted if they don't touch sensitive urls.
   for (size_t i = 0; i < arraysize(non_sensitive_urls); ++i) {
-    GURL non_sensitive_url(non_sensitive_urls[i]);
-    TestURLRequest request(non_sensitive_url, NULL, &context);
-    EXPECT_FALSE(helpers::HideRequest(&request)) << non_sensitive_urls[i];
-  }
-  // Check that requests are rejected if their first party url is sensitive.
-  ASSERT_GE(arraysize(non_sensitive_urls), 1u);
-  GURL non_sensitive_url(non_sensitive_urls[0]);
-  for (size_t i = 0; i < arraysize(sensitive_urls); ++i) {
-    TestURLRequest request(non_sensitive_url, NULL, &context);
-    GURL sensitive_url(sensitive_urls[i]);
-    request.set_first_party_for_cookies(sensitive_url);
-    EXPECT_TRUE(helpers::HideRequest(&request)) << sensitive_urls[i];
+    EXPECT_FALSE(helpers::HideRequestForURL(GURL(non_sensitive_urls[i])))
+        << non_sensitive_urls[i];
   }
 }