| Index: chrome/renderer/extensions/user_script_slave.cc
|
| diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc
|
| index 6ea6201be2112071e0c726f0a9e4231d03c57b78..48e20ab051446143effa643b8fb87662a1a81b3c 100644
|
| --- a/chrome/renderer/extensions/user_script_slave.cc
|
| +++ b/chrome/renderer/extensions/user_script_slave.cc
|
| @@ -84,9 +84,10 @@ int UserScriptSlave::GetIsolatedWorldId(
|
| void UserScriptSlave::InitializeIsolatedWorld(
|
| int isolated_world_id,
|
| const Extension* extension) {
|
| - const URLPatternList& permissions =
|
| - extension->GetEffectiveHostPermissions().patterns();
|
| - for (size_t i = 0; i < permissions.size(); ++i) {
|
| + const URLPatternSet& permissions =
|
| + extension->GetEffectiveHostPermissions();
|
| + for (URLPatternSet::const_iterator i = permissions.begin();
|
| + i != permissions.end(); ++i) {
|
| const char* schemes[] = {
|
| chrome::kHttpScheme,
|
| chrome::kHttpsScheme,
|
| @@ -94,12 +95,12 @@ void UserScriptSlave::InitializeIsolatedWorld(
|
| chrome::kChromeUIScheme,
|
| };
|
| for (size_t j = 0; j < arraysize(schemes); ++j) {
|
| - if (permissions[i].MatchesScheme(schemes[j])) {
|
| + if (i->MatchesScheme(schemes[j])) {
|
| WebSecurityPolicy::addOriginAccessWhitelistEntry(
|
| extension->url(),
|
| WebString::fromUTF8(schemes[j]),
|
| - WebString::fromUTF8(permissions[i].host()),
|
| - permissions[i].match_subdomains());
|
| + WebString::fromUTF8(i->host()),
|
| + i->match_subdomains());
|
| }
|
| }
|
| }
|
| @@ -198,9 +199,10 @@ bool UserScriptSlave::UpdateScripts(base::SharedMemoryHandle shared_memory) {
|
|
|
| WebVector<WebString> patterns;
|
| std::vector<WebString> temp_patterns;
|
| - for (size_t k = 0; k < script->url_patterns().size(); ++k) {
|
| - URLPatternList explicit_patterns =
|
| - script->url_patterns()[k].ConvertToExplicitSchemes();
|
| + const URLPatternSet& url_patterns = script->url_patterns();
|
| + for (URLPatternSet::const_iterator k = url_patterns.begin();
|
| + k != url_patterns.end(); ++k) {
|
| + URLPatternList explicit_patterns = k->ConvertToExplicitSchemes();
|
| for (size_t m = 0; m < explicit_patterns.size(); ++m) {
|
| temp_patterns.push_back(WebString::fromUTF8(
|
| explicit_patterns[m].GetAsString()));
|
|
|