| Index: extensions/renderer/user_script_injector.cc
|
| diff --git a/extensions/renderer/user_script_injector.cc b/extensions/renderer/user_script_injector.cc
|
| index 9b431dbae4e6573742e8391580ba413995179b30..da0c760e54425c7c329438150ed892501b18c6d5 100644
|
| --- a/extensions/renderer/user_script_injector.cc
|
| +++ b/extensions/renderer/user_script_injector.cc
|
| @@ -65,19 +65,21 @@ struct GreasemonkeyApiJsString {
|
| blink::WebScriptSource GetSource() const;
|
|
|
| private:
|
| - std::string source_;
|
| + blink::WebString source_;
|
| };
|
|
|
| // The below constructor, monstrous as it is, just makes a WebScriptSource from
|
| // the GreasemonkeyApiJs resource.
|
| -GreasemonkeyApiJsString::GreasemonkeyApiJsString()
|
| - : source_(ResourceBundle::GetSharedInstance()
|
| - .GetRawDataResource(IDR_GREASEMONKEY_API_JS)
|
| - .as_string()) {
|
| +GreasemonkeyApiJsString::GreasemonkeyApiJsString() {
|
| + base::StringPiece source_piece =
|
| + ResourceBundle::GetSharedInstance().GetRawDataResource(
|
| + IDR_GREASEMONKEY_API_JS);
|
| + source_ =
|
| + blink::WebString::fromUTF8(source_piece.data(), source_piece.length());
|
| }
|
|
|
| blink::WebScriptSource GreasemonkeyApiJsString::GetSource() const {
|
| - return blink::WebScriptSource(blink::WebString::fromUTF8(source_));
|
| + return blink::WebScriptSource(source_);
|
| }
|
|
|
| base::LazyInstance<GreasemonkeyApiJsString> g_greasemonkey_api =
|
|
|