| Index: chrome/common/pepper_permission_util.cc
|
| diff --git a/chrome/common/pepper_permission_util.cc b/chrome/common/pepper_permission_util.cc
|
| index 92cf4d44da769c1bf8b5f57a7106f1695471ba17..a8e767539da0a18ca8112348597b9119d9cc604e 100644
|
| --- a/chrome/common/pepper_permission_util.cc
|
| +++ b/chrome/common/pepper_permission_util.cc
|
| @@ -10,9 +10,9 @@
|
| #include "base/sha1.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_tokenizer.h"
|
| -#include "chrome/common/extensions/extension_set.h"
|
| #include "extensions/common/constants.h"
|
| #include "extensions/common/extension.h"
|
| +#include "extensions/common/extension_set.h"
|
| #include "extensions/common/manifest_handlers/shared_module_info.h"
|
|
|
| using extensions::Extension;
|
| @@ -36,7 +36,7 @@ bool HostIsInSet(const std::string& host, const std::set<std::string>& set) {
|
|
|
| bool IsExtensionOrSharedModuleWhitelisted(
|
| const GURL& url,
|
| - const ExtensionSet* extension_set,
|
| + const extensions::ExtensionSet* extension_set,
|
| const std::set<std::string>& whitelist) {
|
| if (!url.is_valid() || !url.SchemeIs(extensions::kExtensionScheme))
|
| return false;
|
| @@ -70,7 +70,7 @@ bool IsExtensionOrSharedModuleWhitelisted(
|
| }
|
|
|
| bool IsHostAllowedByCommandLine(const GURL& url,
|
| - const ExtensionSet* extension_set,
|
| + const extensions::ExtensionSet* extension_set,
|
| const char* command_line_switch) {
|
| if (!url.is_valid())
|
| return false;
|
|
|