Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListItemView.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListItemView.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListItemView.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListItemView.java
deleted file mode 100644
index 72ea23e2e3a88d18e4f41c7f7b85eb323a17f212..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkDrawerListItemView.java
+++ /dev/null
@@ -1,35 +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.enhancedbookmarks;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.support.v7.widget.AppCompatTextView;
-import android.util.AttributeSet;
-
-import org.chromium.base.ApiCompatibilityUtils;
-import org.chromium.chrome.R;
-import org.chromium.chrome.browser.widget.TintedDrawable;
-
-@SuppressLint("Instantiatable")
-class EnhancedBookmarkDrawerListItemView extends AppCompatTextView {
-    public EnhancedBookmarkDrawerListItemView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    void setIcon(int iconDrawableId) {
-        if (iconDrawableId == 0) {
-            setCompoundDrawablePadding(0);
-        } else {
-            setCompoundDrawablePadding(getResources().getDimensionPixelSize(
-                    R.dimen.enhanced_bookmark_drawer_drawable_padding));
-        }
-
-        Drawable drawable = TintedDrawable.constructTintedDrawable(getResources(), iconDrawableId);
-        ApiCompatibilityUtils.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                this, drawable, null, null, null);
-    }
-}