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 83%
rename from content/browser/android/popup_touch_handle_drawable.h
rename to android_webview/native/popup_touch_handle_drawable.h
index 82aa3db24052729c82405f44fc2ee5363f6382cf..a55c9f37dd7404de9e855818d89b600c79fca21c 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,15 +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,
-      float dpi_scale);
+  PopupTouchHandleDrawable(JNIEnv* env, jobject obj, float dpi_scale,
+      float horizontal_padding_ratio);
   ~PopupTouchHandleDrawable() override;
 
   // ui::TouchHandleDrawable implementation.
@@ -36,12 +37,11 @@ class PopupTouchHandleDrawable : public ui::TouchHandleDrawable {
   float GetDrawableHorizontalPaddingRatio() const override;
 
  private:
-  PopupTouchHandleDrawable(JNIEnv* env, jobject obj, float dpi_scale);
 
   JavaObjectWeakGlobalRef java_ref_;
 
-  const float dpi_scale_;
-  float drawable_horizontal_padding_ratio_;
+  const float dip_scale_;
+  const float drawable_horizontal_padding_ratio_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupTouchHandleDrawable);
 };