| Index: chrome/browser/extensions/api/web_request/web_request_permissions.cc
|
| diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions.cc b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
|
| index d483ce5dd3916a6677a533b659be151630128aaa..93430fb739d0371893e8dd7ece222bfeb495d475 100644
|
| --- a/chrome/browser/extensions/api/web_request/web_request_permissions.cc
|
| +++ b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
|
| @@ -6,13 +6,13 @@
|
|
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/stringprintf.h"
|
| -#include "chrome/browser/extensions/extension_info_map.h"
|
| #include "chrome/browser/extensions/extension_renderer_state.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/extensions/extension_constants.h"
|
| #include "chrome/common/extensions/permissions/permissions_data.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "content/public/browser/resource_request_info.h"
|
| +#include "extensions/browser/info_map.h"
|
| #include "extensions/common/constants.h"
|
| #include "net/url_request/url_request.h"
|
| #include "url/gurl.h"
|
| @@ -79,7 +79,7 @@ bool HasWebRequestScheme(const GURL& url) {
|
|
|
| // static
|
| bool WebRequestPermissions::HideRequest(
|
| - const ExtensionInfoMap* extension_info_map,
|
| + const extensions::InfoMap* extension_info_map,
|
| const net::URLRequest* request) {
|
| // Hide requests from the Chrome WebStore App or signin process.
|
| const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
|
| @@ -106,7 +106,7 @@ bool WebRequestPermissions::HideRequest(
|
|
|
| // static
|
| bool WebRequestPermissions::CanExtensionAccessURL(
|
| - const ExtensionInfoMap* extension_info_map,
|
| + const extensions::InfoMap* extension_info_map,
|
| const std::string& extension_id,
|
| const GURL& url,
|
| bool crosses_incognito,
|
|
|