Index: content/browser/android/popup_touch_handle_drawable.cc |
diff --git a/content/browser/android/popup_touch_handle_drawable.cc b/content/browser/android/popup_touch_handle_drawable.cc |
index 28b0525361f45ce0e3dc6773ea8a094b9d5e1931..e5cce0370b29702348682db61cf7af3435347cb1 100644 |
--- a/content/browser/android/popup_touch_handle_drawable.cc |
+++ b/content/browser/android/popup_touch_handle_drawable.cc |
@@ -10,7 +10,7 @@ |
namespace content { |
// static |
-scoped_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create( |
+std::unique_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create( |
ContentViewCore* content_view_core) { |
DCHECK(content_view_core); |
base::android::ScopedJavaLocalRef<jobject> content_view_core_obj = |
@@ -20,7 +20,7 @@ scoped_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create( |
JNIEnv* env = base::android::AttachCurrentThread(); |
base::android::ScopedJavaLocalRef<jobject> drawable_obj( |
Java_PopupTouchHandleDrawable_create(env, content_view_core_obj.obj())); |
- return scoped_ptr<PopupTouchHandleDrawable>(new PopupTouchHandleDrawable( |
+ return std::unique_ptr<PopupTouchHandleDrawable>(new PopupTouchHandleDrawable( |
env, drawable_obj.obj(), content_view_core->GetDpiScale())); |
} |