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_helpers.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 "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/common/url_constants.h"
 #include "net/http/http_util.h"
-#include "net/url_request/url_request.h"
 
 namespace extension_web_request_api_helpers {
 
 namespace {
 
 static const char* kResourceTypeStrings[] = {
   "main_frame",
   "sub_frame",
   "stylesheet",
   "script",
@@ skipping 563 matching lines @@
   }
   return credentials_set;
 }
 
 namespace {
 
 // Returns true if the URL is sensitive and requests to this URL must not be
 // modified/canceled by extensions, e.g. because it is targeted to the webstore
 // to check for updates, extension blacklisting, etc.
 bool IsSensitiveURL(const GURL& url) {
-  // TODO(battre) Merge this, CanExtensionAccessURL of web_request_api.cc and
-  // Extension::CanExecuteScriptOnPage into one function.
   bool is_webstore_gallery_url =
       StartsWithASCII(url.spec(), extension_urls::kGalleryBrowsePrefix, true);
   bool sensitive_chrome_url = false;
   if (EndsWith(url.host(), "google.com", true)) {
     sensitive_chrome_url |= (url.host() == "www.google.com") &&
                             StartsWithASCII(url.path(), "/chrome", true);
     sensitive_chrome_url |= (url.host() == "chrome.google.com");
     if (StartsWithASCII(url.host(), "client", true)) {
       for (int i = 0; i < 10; ++i) {
         sensitive_chrome_url |=
@@ skipping 18 matching lines @@
           url.SchemeIs(chrome::kFileScheme) ||
           url.SchemeIs(chrome::kFileSystemScheme) ||
           url.SchemeIs(chrome::kFtpScheme) ||
           url.SchemeIs(chrome::kHttpScheme) ||
           url.SchemeIs(chrome::kHttpsScheme) ||
           url.SchemeIs(chrome::kExtensionScheme));
 }
 
 }  // namespace
 
-bool HideRequest(net::URLRequest* request) {
-  const GURL& url = request->url();
-  const GURL& first_party_url = request->first_party_for_cookies();
-  bool hide = false;
-  if (first_party_url.is_valid()) {
-    hide = IsSensitiveURL(first_party_url) ||
-           !HasWebRequestScheme(first_party_url);
-  }
-  if (!hide)
-    hide = IsSensitiveURL(url) || !HasWebRequestScheme(url);
-  return hide;
+bool HideRequestForURL(const GURL& url) {
+  return IsSensitiveURL(url) || !HasWebRequestScheme(url);
 }
 
 #define ARRAYEND(array) (array + arraysize(array))
 
 bool IsRelevantResourceType(ResourceType::Type type) {
   ResourceType::Type* iter =
       std::find(kResourceTypeValues, ARRAYEND(kResourceTypeValues), type);
   return iter != ARRAYEND(kResourceTypeValues);
 }
 
@@ skipping 10 matching lines @@
                        ResourceType::Type* type) {
   const char** iter =
       std::find(kResourceTypeStrings, ARRAYEND(kResourceTypeStrings), type_str);
   if (iter == ARRAYEND(kResourceTypeStrings))
     return false;
   *type = kResourceTypeValues[iter - kResourceTypeStrings];
   return true;
 }
 
 }  // namespace extension_web_request_api_helpers