Commit cac3c213 authored by Sam Maier's avatar Sam Maier Committed by Chromium LUCI CQ

Revert "Keeping CastOptionsProvider to avoid crash."

This reverts commit 0f312f10.

Reason for revert: Downstream fix has rolled

Original change's description:
> Keeping CastOptionsProvider to avoid crash.
>
> Bug: 1157603
> Change-Id: I04bf94d2e2d758cd871d5328513de135c2e155de
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2585843
> Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
> Reviewed-by: mark a. foltz <mfoltz@chromium.org>
> Commit-Queue: Sam Maier <smaier@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#836743}

TBR=mfoltz@chromium.org,mlamouri@chromium.org,zqzhang@chromium.org,tguilbert@chromium.org,smaier@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: I725e928b3d5bce99df9a587e014e1ceb07f04892
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1157603
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2593452Reviewed-by: default avatarSam Maier <smaier@chromium.org>
Reviewed-by: default avatarmark a. foltz <mfoltz@chromium.org>
Reviewed-by: default avatarThomas Guilbert <tguilbert@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837144}
parent 23c4aa52
...@@ -77,7 +77,6 @@ android_library("cast_options_provider_java") { ...@@ -77,7 +77,6 @@ android_library("cast_options_provider_java") {
deps = [ deps = [
"$google_play_services_package:google_play_services_cast_framework_java", "$google_play_services_package:google_play_services_cast_framework_java",
"$google_play_services_package:google_play_services_cast_java", "$google_play_services_package:google_play_services_cast_java",
"//base:base_java",
] ]
} }
......
...@@ -11,12 +11,9 @@ import com.google.android.gms.cast.framework.CastOptions; ...@@ -11,12 +11,9 @@ import com.google.android.gms.cast.framework.CastOptions;
import com.google.android.gms.cast.framework.OptionsProvider; import com.google.android.gms.cast.framework.OptionsProvider;
import com.google.android.gms.cast.framework.SessionProvider; import com.google.android.gms.cast.framework.SessionProvider;
import org.chromium.base.annotations.UsedByReflection;
import java.util.List; import java.util.List;
/** {@link OptionsProvider} implementation for Chrome MR. */ /** {@link OptionsProvider} implementation for Chrome MR. */
@UsedByReflection("CastContext.java in cast_framework")
public class CastOptionsProvider implements OptionsProvider { public class CastOptionsProvider implements OptionsProvider {
@Override @Override
public CastOptions getCastOptions(Context context) { public CastOptions getCastOptions(Context context) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment