Merge java_staging/src into java/src.

chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/layouts/LayoutProvider.java

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/layouts/LayoutProvider.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/layouts/LayoutProvider.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/layouts/LayoutProvider.java
deleted file mode 100644
index e903bf9f9b281d21986f0bbcadef84cb69dfb27b..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/compositor/layouts/LayoutProvider.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.compositor.layouts;
-
-import android.graphics.Rect;
-import android.graphics.RectF;
-
-import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
-
-/**
- * Interface that give access the active layout. This is useful to isolate the renderer of
- * all the layout logic.
- * Called from the GL thread.
- */
-public interface LayoutProvider {
-    /**
-     * @return The layout to be rendered. The caller may not keep a reference of that value
-     * internally because the value may change without notice.
-     */
-    Layout getActiveLayout();
-
-    /**
-     * @param rect RectF instance to be used to store the result and return. If null, it uses a new
-     *             RectF instance.
-     * @return The rectangle of the layout in its View in dp.
-     */
-    RectF getViewportDp(RectF rect);
-
-    /**
-     * @param rect Rect instance to be used to store the result and return. If null, it uses a new
-     *             Rect instance.
-     * @return The rectangle of the layout in its View in pixels.
-     */
-    Rect getViewportPixel(Rect rect);
-
-    /**
-     * @return The manager in charge of handling fullscreen changes.
-     */
-    ChromeFullscreenManager getFullscreenManager();
-}