Revert of Fix TODOs related to SDK 24

android_webview/java/src/org/chromium/android_webview/AwSettings.java

Index: android_webview/java/src/org/chromium/android_webview/AwSettings.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java
index a49d01c85f44154ef9fd0c4559bd6c7e8b56a5f5..231091e21b03ac280b218961d6ff61ceb17b57b7 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java
@@ -33,6 +33,9 @@
 public class AwSettings {
     private static final String LOGTAG = AwSettings.class.getSimpleName();
     private static final boolean TRACE = false;
+
+    // TODO(hush): Use android.webkit.WebSettings.MENU_ITEM_*. crbug.com/546762.
+    private static final int MENU_ITEM_NONE = 0;
 
     private static final String TAG = "AwSettings";
 
@@ -86,7 +89,7 @@
     private int mMixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW;
 
     private boolean mOffscreenPreRaster;
-    private int mDisabledMenuItems = WebSettings.MENU_ITEM_NONE;
+    private int mDisabledMenuItems = MENU_ITEM_NONE;
 
     // Although this bit is stored on AwSettings it is actually controlled via the CookieManager.
     private boolean mAcceptThirdPartyCookies;