| Index: extensions/renderer/user_script_injector.cc
|
| diff --git a/extensions/renderer/user_script_injector.cc b/extensions/renderer/user_script_injector.cc
|
| index 73096868c94a4ff48f6e31aa2bc40e8e56b3a675..bd662fb7edc34a86b85a8641aa49ac79cda6d2f4 100644
|
| --- a/extensions/renderer/user_script_injector.cc
|
| +++ b/extensions/renderer/user_script_injector.cc
|
| @@ -84,7 +84,7 @@ bool ShouldInjectScripts(const UserScript::FileList& scripts,
|
| const std::set<std::string>& injected_files) {
|
| for (const std::unique_ptr<UserScript::File>& file : scripts) {
|
| // Check if the script is already injected.
|
| - if (injected_files.count(file->url().path()) == 0) {
|
| + if (injected_files.count(file->url().path().as_string()) == 0) {
|
| return true;
|
| }
|
| }
|
| @@ -227,7 +227,7 @@ std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
|
| for (const std::unique_ptr<UserScript::File>& file : js_scripts) {
|
| const GURL& script_url = file->url();
|
| // Check if the script is already injected.
|
| - if (executing_scripts->count(script_url.path()) != 0)
|
| + if (executing_scripts->count(script_url.path().as_string()) != 0)
|
| continue;
|
|
|
| sources.push_back(blink::WebScriptSource(
|
| @@ -235,7 +235,7 @@ std::vector<blink::WebScriptSource> UserScriptInjector::GetJsSources(
|
| script_url));
|
|
|
| (*num_injected_js_scripts) += 1;
|
| - executing_scripts->insert(script_url.path());
|
| + executing_scripts->insert(script_url.path().as_string());
|
| }
|
|
|
| return sources;
|
| @@ -253,7 +253,7 @@ std::vector<blink::WebString> UserScriptInjector::GetCssSources(
|
| const UserScript::FileList& css_scripts = script_->css_scripts();
|
| sources.reserve(css_scripts.size());
|
| for (const std::unique_ptr<UserScript::File>& file : script_->css_scripts()) {
|
| - const std::string& stylesheet_path = file->url().path();
|
| + const std::string& stylesheet_path = file->url().path().as_string();
|
| // Check if the stylesheet is already injected.
|
| if (injected_stylesheets->count(stylesheet_path) != 0)
|
| continue;
|
|
|