Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java
deleted file mode 100644
index 16b59d23b46e18d6523e5d924779c765240fe98e..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.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.compositor.resources;
-
-import android.content.Context;
-
-import org.chromium.base.annotations.SuppressFBWarnings;
-import org.chromium.chrome.R;
-import org.chromium.ui.base.DeviceFormFactor;
-
-/**
- * Tracks all high priority resources that should be loaded at startup to be used by CC layers.
- * TODO(dtrainor): Add the high priority and low priority resources here as they get ported over.
- */
-public class StaticResourcePreloads {
-    /** A list of resources to load synchronously once the compositor is initialized. */
-    private static int[] sSynchronousResources = new int[] {
-            R.drawable.bg_tabstrip_tab, R.drawable.bg_tabstrip_background_tab,
-            R.drawable.btn_tab_close_normal, R.drawable.btn_tab_close_white_normal,
-            R.drawable.btn_tab_close_pressed, R.drawable.btn_tabstrip_new_tab_normal,
-            R.drawable.btn_tabstrip_new_incognito_tab_normal,
-            R.drawable.btn_tabstrip_new_tab_pressed, R.drawable.spinner, R.drawable.spinner_white,
-    };
-
-    /** A list of resources to load asynchronously once the compositor is initialized. */
-    private static int[] sAsynchronousResources = new int[] {R.drawable.logo_card_back,
-            R.drawable.btn_tabstrip_switch_normal, R.drawable.btn_tabstrip_switch_incognito};
-
-    private static int[] sEmptyList = new int[] {};
-
-    public static int[] getSynchronousResources(Context context) {
-        return DeviceFormFactor.isTablet(context) ? sSynchronousResources : sEmptyList;
-    }
-
-    @SuppressFBWarnings("MS_EXPOSE_REP")
-    public static int[] getAsynchronousResources() {
-        return sAsynchronousResources;
-    }
-}