Cleanup AppMenu code.

chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuButtonHelper.java

 // Copyright 2013 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.
 
 package org.chromium.chrome.browser.appmenu;
 
 import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.MotionEvent;
 import android.view.View;
@@ skipping 96 matching lines @@
                 event.getActionMasked() == MotionEvent.ACTION_UP) {
             mMenuButton.setPressed(false);
         }
 
         // This will take care of showing app menu.
         boolean isTouchEventConsumed = mAppMenuGestureDetector.onTouchEvent(event);
 
         // If user starts to drag on this menu button, ACTION_DOWN and all the subsequent touch
         // events are received here. We need to forward this event to the app menu to handle
         // dragging correctly.
-        AppMenu menu = mMenuHandler.getAppMenu();
-        if (menu != null && !isTouchEventConsumed) {
-            isTouchEventConsumed |= menu.handleDragging(event);
+        AppMenuDragHelper dragHelper = mMenuHandler.getAppMenuDragHelper();
+        if (dragHelper != null && !isTouchEventConsumed) {
+            isTouchEventConsumed |= dragHelper.handleDragging(event);
         }
         return isTouchEventConsumed;
     }
 }