Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Unified Diff: components/dom_distiller/content/browser/distillable_page_utils_android.cc

Issue 1879613003: Convert //components/dom_distiller from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/dom_distiller/content/browser/distillable_page_utils_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | components/dom_distiller/content/browser/distillable_page_utils_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698