android_webview: Let AwContents manage TouchHandleDrawable

android_webview/native/popup_touch_handle_drawable.cc

-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/android/popup_touch_handle_drawable.h"
+#include "android_webview/native/popup_touch_handle_drawable.h"
 
 #include "content/public/browser/android/content_view_core.h"
 #include "jni/PopupTouchHandleDrawable_jni.h"
 
 using base::android::ScopedJavaLocalRef;
 
-namespace content {
+namespace android_webview {
 
 // static
 std::unique_ptr<PopupTouchHandleDrawable> PopupTouchHandleDrawable::Create(
-    ContentViewCore* content_view_core,
+    content::ContentViewCore* content_view_core,
     float dpi_scale) {
   DCHECK(content_view_core);
   base::android::ScopedJavaLocalRef<jobject> content_view_core_obj =
       content_view_core->GetJavaObject();
   if (content_view_core_obj.is_null())
     return nullptr;
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jobject> drawable_obj(
       Java_PopupTouchHandleDrawable_create(env, content_view_core_obj));
   return std::unique_ptr<PopupTouchHandleDrawable>(
@@ skipping 69 matching lines @@
       Java_PopupTouchHandleDrawable_getVisibleWidth(env, obj),
       Java_PopupTouchHandleDrawable_getVisibleHeight(env, obj));
   return gfx::ScaleRect(unscaled_rect, 1.f / dpi_scale_);
 }
 
 float PopupTouchHandleDrawable::GetDrawableHorizontalPaddingRatio() const {
   return drawable_horizontal_padding_ratio_;
 }
 
 }  // namespace content