chromecast: Use org.chromium.base.Function

Remove org.chromium.chromecast.base.Function

Bug: 1034012
Change-Id: Ib9cc34f95f3b4d37ac5d00f3ba1229bda3656326
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1966492
Commit-Queue: bttk <bttk@chromium.org>
Reviewed-by: Luke Halliwell (slow) <halliwell@chromium.org>
Reviewed-by: Ender <ender@google.com>
Cr-Commit-Position: refs/heads/master@{#724787}

chromecast/base/BUILD.gn

@@ -357,7 +357,6 @@ if (is_android) {
       "$java_src_dir/org/chromium/chromecast/base/BiPredicate.java",
       "$java_src_dir/org/chromium/chromecast/base/Both.java",
       "$java_src_dir/org/chromium/chromecast/base/Controller.java",
-      "$java_src_dir/org/chromium/chromecast/base/Function.java",
       "$java_src_dir/org/chromium/chromecast/base/Itertools.java",
       "$java_src_dir/org/chromium/chromecast/base/Observable.java",
       "$java_src_dir/org/chromium/chromecast/base/Observer.java",

chromecast/base/java/src/org/chromium/chromecast/base/Both.java

@@ -7,6 +7,7 @@ package org.chromium.chromecast.base;
 import android.annotation.SuppressLint;
 
 import org.chromium.base.Consumer;
+import org.chromium.base.Function;
 
 import java.util.Objects;
 

chromecast/base/java/src/org/chromium/chromecast/base/Function.java

-// Copyright 2018 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.chromecast.base;
-
-/**
- * A function that takes a single argument and returns a value.
- *
- * TODO(sanfin): replace with Java 8 library if we're ever able to use the Java 8 library.
- *
- * @param <T> The argument type.
- * @param <R> The return type.
- */
-public interface Function<T, R> { public R apply(T input); }

chromecast/base/java/src/org/chromium/chromecast/base/Observable.java

@@ -4,6 +4,8 @@
 
 package org.chromium.chromecast.base;
 
+import org.chromium.base.Function;
+
 /**
  * Interface for Observable state.
  *

chromecast/base/java/test/org/chromium/chromecast/base/BothTest.java

@@ -15,6 +15,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.BlockJUnit4ClassRunner;
 
 import org.chromium.base.Consumer;
+import org.chromium.base.Function;
 import org.chromium.chromecast.base.Inheritance.Base;
 import org.chromium.chromecast.base.Inheritance.Derived;
 

chromecast/base/java/test/org/chromium/chromecast/base/ObservableMapTest.java

@@ -8,6 +8,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.BlockJUnit4ClassRunner;
 
+import org.chromium.base.Function;
 import org.chromium.chromecast.base.Inheritance.Base;
 import org.chromium.chromecast.base.Inheritance.Derived;
 

chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsService.java

@@ -16,10 +16,10 @@ import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
 import android.widget.Toast;
 
+import org.chromium.base.Function;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.RemovableInRelease;
 import org.chromium.chromecast.base.Controller;
-import org.chromium.chromecast.base.Function;
 import org.chromium.chromecast.base.Observable;
 import org.chromium.chromecast.base.Observers;
 import org.chromium.content.browser.MediaSessionImpl;