| Index: ios/chrome/browser/find_in_page/js_findinpage_manager.mm
|
| diff --git a/ios/chrome/browser/find_in_page/js_findinpage_manager.mm b/ios/chrome/browser/find_in_page/js_findinpage_manager.mm
|
| index 9f411e282c4b3ad78a4a637d70ef0fe32b376935..5302ec35beed85b7348e5bde2fc17badcf100e59 100644
|
| --- a/ios/chrome/browser/find_in_page/js_findinpage_manager.mm
|
| +++ b/ios/chrome/browser/find_in_page/js_findinpage_manager.mm
|
| @@ -4,13 +4,13 @@
|
|
|
| #import "ios/chrome/browser/find_in_page/js_findinpage_manager.h"
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #import "base/ios/weak_nsobject.h"
|
| #include "base/json/json_reader.h"
|
| #include "base/json/string_escape.h"
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "base/values.h"
|
| #import "ios/chrome/browser/find_in_page/find_in_page_model.h"
|
| @@ -173,7 +173,7 @@ const FindInPageEntry kFindInPageEntryZero = {{0.0, 0.0}, 0};
|
|
|
| // Parse JSONs.
|
| std::string json([result UTF8String]);
|
| - scoped_ptr<base::Value> root(base::JSONReader::Read(json, false));
|
| + std::unique_ptr<base::Value> root(base::JSONReader::Read(json, false));
|
| if (!root.get())
|
| return YES;
|
| if (!root->IsType(base::Value::TYPE_LIST))
|
| @@ -221,7 +221,7 @@ const FindInPageEntry kFindInPageEntryZero = {{0.0, 0.0}, 0};
|
|
|
| - (FindInPageEntry)findInPageEntryForJson:(NSString*)jsonStr {
|
| std::string json([jsonStr UTF8String]);
|
| - scoped_ptr<base::Value> root(base::JSONReader::Read(json, false));
|
| + std::unique_ptr<base::Value> root(base::JSONReader::Read(json, false));
|
| if (!root.get())
|
| return kFindInPageEntryZero;
|
|
|
|
|