| Index: content/renderer/text_input_client_observer.cc
|
| diff --git a/content/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc
|
| index b97be4a31bd5497b3a58e2a91615a93c90cda472..dec0181a87f0e6aab16216249a2ef88ec58cf504 100644
|
| --- a/content/renderer/text_input_client_observer.cc
|
| +++ b/content/renderer/text_input_client_observer.cc
|
| @@ -6,7 +6,8 @@
|
|
|
| #include <stddef.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "build/build_config.h"
|
| #include "content/common/text_input_client_messages.h"
|
| #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
|
| @@ -54,7 +55,7 @@ void TextInputClientObserver::OnStringAtPoint(gfx::Point point) {
|
| NSAttributedString* string = blink::WebSubstringUtil::attributedWordAtPoint(
|
| webview(), point, baselinePoint);
|
|
|
| - scoped_ptr<const mac::AttributedStringCoder::EncodedString> encoded(
|
| + std::unique_ptr<const mac::AttributedStringCoder::EncodedString> encoded(
|
| mac::AttributedStringCoder::Encode(string));
|
| Send(new TextInputClientReplyMsg_GotStringAtPoint(
|
| routing_id(), *encoded.get(), baselinePoint));
|
| @@ -99,7 +100,7 @@ void TextInputClientObserver::OnStringForRange(gfx::Range range) {
|
| string = blink::WebSubstringUtil::attributedSubstringInRange(
|
| frame, range.start(), range.length(), &baselinePoint);
|
| }
|
| - scoped_ptr<const mac::AttributedStringCoder::EncodedString> encoded(
|
| + std::unique_ptr<const mac::AttributedStringCoder::EncodedString> encoded(
|
| mac::AttributedStringCoder::Encode(string));
|
| Send(new TextInputClientReplyMsg_GotStringForRange(routing_id(),
|
| *encoded.get(), baselinePoint));
|
|
|