| Index: components/dom_distiller/content/browser/distillable_page_utils_android.cc
|
| diff --git a/components/dom_distiller/content/browser/distillable_page_utils_android.cc b/components/dom_distiller/content/browser/distillable_page_utils_android.cc
|
| index ab84a56c064b72ba5ec66e9fb7f42ed33340a369..84abf2d71732a341e45438ff5f745687e0ad87f0 100644
|
| --- a/components/dom_distiller/content/browser/distillable_page_utils_android.cc
|
| +++ b/components/dom_distiller/content/browser/distillable_page_utils_android.cc
|
| @@ -4,8 +4,9 @@
|
|
|
| #include "components/dom_distiller/content/browser/distillable_page_utils_android.h"
|
|
|
| +#include <memory>
|
| +
|
| #include "base/bind.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "components/dom_distiller/content/browser/distillable_page_utils.h"
|
| #include "content/public/browser/web_contents.h"
|
| @@ -17,7 +18,7 @@ namespace dom_distiller {
|
| namespace android {
|
| namespace {
|
| void OnIsPageDistillableResult(
|
| - scoped_ptr<ScopedJavaGlobalRef<jobject>> callback_holder,
|
| + std::unique_ptr<ScopedJavaGlobalRef<jobject>> callback_holder,
|
| bool isDistillable) {
|
| Java_DistillablePageUtils_callOnIsPageDistillableResult(
|
| base::android::AttachCurrentThread(), callback_holder->obj(),
|
| @@ -40,7 +41,7 @@ static void IsPageDistillable(JNIEnv* env,
|
| const JavaParamRef<jobject>& callback) {
|
| content::WebContents* web_contents(
|
| content::WebContents::FromJavaWebContents(webContents));
|
| - scoped_ptr<ScopedJavaGlobalRef<jobject>> callback_holder(
|
| + std::unique_ptr<ScopedJavaGlobalRef<jobject>> callback_holder(
|
| new ScopedJavaGlobalRef<jobject>());
|
| callback_holder->Reset(env, callback);
|
|
|
|
|