android_webview: Let AwContents manage TouchHandleDrawable

android_webview/native/popup_touch_handle_drawable.h

Index: android_webview/native/popup_touch_handle_drawable.h
diff --git a/content/browser/android/popup_touch_handle_drawable.h b/android_webview/native/popup_touch_handle_drawable.h
similarity index 87%
rename from content/browser/android/popup_touch_handle_drawable.h
rename to android_webview/native/popup_touch_handle_drawable.h
index 82aa3db24052729c82405f44fc2ee5363f6382cf..eba836c5fd65209177becef1349ef3a9bcf0a815 100644
--- a/content/browser/android/popup_touch_handle_drawable.h
+++ b/android_webview/native/popup_touch_handle_drawable.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -14,14 +14,16 @@
 #include "base/macros.h"
 
 namespace content {
-
 class ContentViewCore;
+}
+
+namespace android_webview {
 
 // Touch handle drawable backed by an Android PopupWindow.
 class PopupTouchHandleDrawable : public ui::TouchHandleDrawable {
  public:
   static std::unique_ptr<PopupTouchHandleDrawable> Create(
-      ContentViewCore* content_view_core,
+      content::ContentViewCore* content_view_core,
       float dpi_scale);
   ~PopupTouchHandleDrawable() override;
 
@@ -35,6 +37,8 @@ class PopupTouchHandleDrawable : public ui::TouchHandleDrawable {
   gfx::RectF GetVisibleBounds() const override;
   float GetDrawableHorizontalPaddingRatio() const override;
 
+  const JavaObjectWeakGlobalRef GetJavaObj() const { return java_ref_; };
+
  private:
   PopupTouchHandleDrawable(JNIEnv* env, jobject obj, float dpi_scale);