Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/omnibox/TrailingTextView.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/omnibox/TrailingTextView.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/omnibox/TrailingTextView.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/omnibox/TrailingTextView.java
deleted file mode 100644
index 1e2089415a20e133071d7da2c909663671dccb0c..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/omnibox/TrailingTextView.java
+++ /dev/null
@@ -1,42 +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.omnibox;
-
-import android.content.Context;
-import android.support.v7.widget.AppCompatTextView;
-import android.util.AttributeSet;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-/**
- * A specialized TextView to be used for showing the trailing text in the URL container.
- */
-public class TrailingTextView extends AppCompatTextView {
-
-    public TrailingTextView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        setFocusable(false);
-        setFocusableInTouchMode(false);
-        setClickable(false);
-        setLongClickable(false);
-    }
-
-    @Override
-    public void onPopulateAccessibilityEvent(AccessibilityEvent event) {
-    }
-
-    @Override
-    public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
-    }
-
-    @Override
-    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
-    }
-}