Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/widget/VerticallyFixedEditText.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/widget/VerticallyFixedEditText.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/widget/VerticallyFixedEditText.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/widget/VerticallyFixedEditText.java
deleted file mode 100644
index 079809d0999413276ce09062f6aa2329b78cd9f8..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/widget/VerticallyFixedEditText.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015 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.widget;
-
-import android.content.Context;
-import android.support.v7.widget.AppCompatEditText;
-import android.util.AttributeSet;
-import android.widget.EditText;
-
-/**
- * This custom {@link EditText} does not allow the user to scroll the text vertically.  This is
- * can be useful when the EditText is put into a layout where it is smaller than it's normal height.
- */
-public class VerticallyFixedEditText extends AppCompatEditText {
-
-    public VerticallyFixedEditText(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    private boolean mBringingPointIntoView = false;
-
-    @Override
-    public boolean bringPointIntoView(int offset) {
-        try {
-            mBringingPointIntoView = true;
-            return super.bringPointIntoView(offset);
-        } finally {
-            mBringingPointIntoView = false;
-        }
-    }
-
-    @Override
-    public void scrollTo(int x, int y) {
-        // To prevent vertical scroll on touch events, only allow
-        // TextView.bringPointIntoView(...) to change the vertical scroll.
-        super.scrollTo(x, mBringingPointIntoView ? y : getScrollY());
-    }
-
-}