Merge 275988 "Move about://-related constants from //content to ..."

chrome/browser/extensions/api/web_request/web_request_permissions.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_permissions.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_renderer_state.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ skipping 50 matching lines @@
   GURL url_without_query = url.ReplaceComponents(replacements);
   return sensitive_chrome_url ||
       extension_urls::IsWebstoreUpdateUrl(url_without_query) ||
       extension_urls::IsBlacklistUpdateUrl(url);
 }
 
 // Returns true if the scheme is one we want to allow extensions to have access
 // to. Extensions still need specific permissions for a given URL, which is
 // covered by CanExtensionAccessURL.
 bool HasWebRequestScheme(const GURL& url) {
-  return (url.SchemeIs(content::kAboutScheme) ||
-          url.SchemeIs(url::kFileScheme) ||
+  return (url.SchemeIs(url::kAboutScheme) || url.SchemeIs(url::kFileScheme) ||
           url.SchemeIs(url::kFileSystemScheme) ||
-          url.SchemeIs(url::kFtpScheme) ||
-          url.SchemeIs(url::kHttpScheme) ||
+          url.SchemeIs(url::kFtpScheme) || url.SchemeIs(url::kHttpScheme) ||
           url.SchemeIs(url::kHttpsScheme) ||
           url.SchemeIs(extensions::kExtensionScheme));
 }
 
 }  // namespace
 
 // static
 bool WebRequestPermissions::HideRequest(
     const extensions::InfoMap* extension_info_map,
     const net::URLRequest* request) {
@@ skipping 39 matching lines @@
   // Check if this event crosses incognito boundaries when it shouldn't.
   if (crosses_incognito && !extension_info_map->CanCrossIncognito(extension))
     return false;
 
   switch (host_permissions_check) {
     case DO_NOT_CHECK_HOST:
       break;
     case REQUIRE_HOST_PERMISSION:
       // about: URLs are not covered in host permissions, but are allowed
       // anyway.
-      if (!((url.SchemeIs(content::kAboutScheme) ||
+      if (!((url.SchemeIs(url::kAboutScheme) ||
              extension->permissions_data()->HasHostPermission(url) ||
              url.GetOrigin() == extension->url()))) {
         return false;
       }
       break;
     case REQUIRE_ALL_URLS:
       if (!extension->permissions_data()->HasEffectiveAccessToAllHosts())
         return false;
       break;
   }
 
   return true;
 }