0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove-dependency-on-vision-clearcut-and-phenotype.patch

Browse source
This commit is contained in:
none 2021-03-02 20:55:30 +01:00
parent 6c7e5b08a7
commit 100cd4a73e
2 changed files with 1261 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

646
build/patches/Remove-dependency-on-com.google.android.play.patch
View file

@ -2,16 +2,10 @@ From: Wengling Chen <feiyu2817@gmail.com>
Date: Fri, 1 Nov 2019 23:01:41 +0100
Subject: Remove dependency on com.google.android.play
FILE:Remove-dependency-on-com.google.android.play.patch
---
chrome/android/BUILD.gn | 1 -
.../inline/FakeAppUpdateManagerWrapper.java | 60 +----
.../inline/InlineUpdateControllerFactory.java | 16 --
.../inline/PlayInlineUpdateController.java | 226 +-----------------
components/module_installer/android/BUILD.gn | 2 -
third_party/google_android_play_core/BUILD.gn | 5 -
6 files changed, 3 insertions(+), 307 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 9daafb322b..d814ba3d36 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -525,7 +525,6 @@ android_library("chrome_java") {
@ -22,7 +16,87 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//third_party/metrics_proto:metrics_proto_java",
"//ui/android:ui_java",
"//ui/base/mojom:mojom_java",
@@ -2203,7 +2202,6 @@ android_library("base_module_java") {
"//third_party/android_deps:androidx_annotation_annotation_java",
"//third_party/android_deps:androidx_collection_collection_java",
"//third_party/android_deps:androidx_fragment_fragment_java",
- "//third_party/google_android_play_core:com_google_android_play_core_java",
"//ui/android:ui_no_recycler_view_java",
# Deps needed for child processes.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
index 0b6ed7044b..1ded3d4169 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
@@ -8,11 +8,6 @@ import android.content.Context;
import android.preference.PreferenceManager;
import android.text.TextUtils;
-import com.google.android.play.core.splitcompat.SplitCompat;
-import com.google.android.play.core.splitinstall.SplitInstallManager;
-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
-import com.google.android.play.core.splitinstall.SplitInstallRequest;
-
import org.chromium.base.BundleUtils;
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
@@ -71,54 +66,5 @@ public class AppLocaleUtils {
public static void setAppLanguagePref(String languageName) {
SharedPreferencesManager.getInstance().writeString(
ChromePreferenceKeys.APPLICATION_OVERRIDE_LANGUAGE, languageName);
- if (BundleUtils.isBundle()) {
- ensureLanguageSplitInstalled(languageName);
- }
- }
-
- /**
- * Enable access to language split for bundle builds with an override language set.
- * @param context Activity context to enable downloaded language splits on.
- */
- public static void maybeInstallActivitySplitCompat(Context context) {
- if (GlobalAppLocaleController.getInstance().isOverridden() && BundleUtils.isBundle()) {
- Log.i(TAG, "maybeInstallActivitySplit isOverridden: %s isBundle: %s",
- GlobalAppLocaleController.getInstance().isOverridden(), BundleUtils.isBundle());
- Log.i(TAG, "Override Locale: %s", getAppLanguagePref());
- logInstalledLanguages(context);
- SplitCompat.installActivity(context);
- logInstalledLanguages(context);
- }
- }
-
- /**
- * For bundle builds ensure that the language split for languageName is downloaded.
- */
- private static void ensureLanguageSplitInstalled(String languageName) {
- SplitInstallManager splitInstallManager =
- SplitInstallManagerFactory.create(ContextUtils.getApplicationContext());
-
- // TODO(perrier): check if languageName is already installed. https://crbug.com/1103806
- if (!TextUtils.equals(languageName, SYSTEM_LANGUAGE_VALUE)) {
- SplitInstallRequest installRequest =
- SplitInstallRequest.newBuilder()
- .addLanguage(Locale.forLanguageTag(languageName))
- .build();
- splitInstallManager.startInstall(installRequest);
- }
- }
-
- /**
- * Log list of installed languages for context.
- * @param context Context to log installed languages on.
- */
- private static void logInstalledLanguages(Context context) {
- if (BundleUtils.isBundle()) {
- SplitInstallManager splitInstallManager = SplitInstallManagerFactory.create(context);
- Log.i(TAG, "Installed Languages: %s",
- TextUtils.join(", ", splitInstallManager.getInstalledLanguages()));
- } else {
- Log.i(TAG, "Installed Languages: None - not a bundle");
- }
}
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
index 34c2c399c1..5d4b8d69e0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
@@ -11,11 +11,6 @@ import android.os.Message;
@ -148,6 +222,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Fa
if (resultCode == Activity.RESULT_OK) {
execute(Event.USER_ACCEPTS_UPDATE);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
index 94e56084b6..70248ff38c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
@@ -4,8 +4,6 @@
@ -181,6 +256,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/In
// No test scenario was in place, and the inline flow has not been enabled, so use a
// controller with no functionality.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
index e376e8176d..0c2a71ea16 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
@@ -10,15 +10,6 @@ import android.content.IntentSender.SendIntentException;
@ -469,6 +545,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Pl
RecordHistogram.recordEnumeratedHistogram(
"GoogleUpdate.Inline.CallFailure", failure, CallFailure.NUM_ENTRIES);
diff --git a/components/module_installer/android/BUILD.gn b/components/module_installer/android/BUILD.gn
index 67028f66c5..64d19aade7 100644
--- a/components/module_installer/android/BUILD.gn
+++ b/components/module_installer/android/BUILD.gn
@@ -37,7 +37,6 @@ android_library("module_installer_java") {
@ -487,7 +564,557 @@ diff --git a/components/module_installer/android/BUILD.gn b/components/module_in
"//third_party/hamcrest:hamcrest_java",
]
}
diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/FakeEngine.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/FakeEngine.java
index c129ce772c..1aacbc81b5 100644
--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/FakeEngine.java
+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/FakeEngine.java
@@ -7,9 +7,6 @@ package org.chromium.components.module_installer.engine;
import android.content.Context;
import android.content.pm.PackageManager;
-import com.google.android.play.core.splitcompat.SplitCompat;
-import com.google.android.play.core.splitcompat.ingestion.Verifier;
-
import org.chromium.base.BuildInfo;
import org.chromium.base.ContextUtils;
import org.chromium.base.Log;
@@ -54,7 +51,6 @@ class FakeEngine extends SplitCompatEngine {
@Override
protected void onPostExecute(Boolean success) {
- notifyListener(listener, success);
}
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
@@ -129,18 +125,8 @@ class FakeEngine extends SplitCompatEngine {
return false;
}
- // Check that the module's signature matches Chrome's.
- try {
- Verifier verifier = new Verifier(context);
- if (!verifier.verifySplits()) {
- return false;
- }
- } catch (IOException | PackageManager.NameNotFoundException e) {
- return false;
- }
-
// Tell SplitCompat to do a full emulation of the module.
- return SplitCompat.fullInstall(context);
+ return false;
}
private File joinPaths(String... paths) {
diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java
index 0a942452f5..5170666ae5 100644
--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java
+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngine.java
@@ -8,11 +8,6 @@ import android.app.Activity;
import androidx.annotation.VisibleForTesting;
-import com.google.android.play.core.splitinstall.SplitInstallException;
-import com.google.android.play.core.splitinstall.SplitInstallRequest;
-import com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListener;
-import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
-
import org.chromium.base.ThreadUtils;
import java.util.ArrayList;
@@ -28,7 +23,6 @@ import java.util.Set;
*/
class SplitCompatEngine implements InstallEngine {
private final SplitCompatEngineFacade mFacade;
- private final SplitInstallStateUpdatedListener mUpdateListener = getStatusUpdateListener();
private static final Map<String, List<InstallListener>> sSessions = new HashMap<>();
public SplitCompatEngine() {
@@ -46,99 +40,17 @@ class SplitCompatEngine implements InstallEngine {
@Override
public boolean isInstalled(String moduleName) {
- Set<String> installedModules = mFacade.getSplitManager().getInstalledModules();
- return installedModules.contains(moduleName);
+ return false;
}
@Override
public void installDeferred(String moduleName) {
- mFacade.getSplitManager().deferredInstall(Collections.singletonList(moduleName));
mFacade.getLogger().logRequestDeferredStart(moduleName);
}
@Override
public void install(String moduleName, InstallListener listener) {
ThreadUtils.assertOnUiThread();
-
- if (sSessions.containsKey(moduleName)) {
- sSessions.get(moduleName).add(listener);
- return;
- }
-
- registerUpdateListener();
-
- sSessions.put(moduleName, new ArrayList<InstallListener>() {
- { add(listener); }
- });
-
- SplitInstallRequest request = mFacade.createSplitInstallRequest(moduleName);
-
- mFacade.getSplitManager().startInstall(request).addOnFailureListener(ex -> {
- // TODO(fredmello): look into potential issues with mixing split error code
- // with our logger codes - fix accordingly.
- mFacade.getLogger().logRequestFailure(moduleName,
- ex instanceof SplitInstallException
- ? ((SplitInstallException) ex).getErrorCode()
- : mFacade.getLogger().getUnknownRequestErrorCode());
-
- String message = String.format(Locale.US, "Request Exception: %s", ex.getMessage());
- notifyListeners(moduleName, false);
- });
-
- mFacade.getLogger().logRequestStart(moduleName);
- }
-
- private SplitInstallStateUpdatedListener getStatusUpdateListener() {
- return state -> {
- if (state.moduleNames().size() != 1) {
- throw new UnsupportedOperationException("Only one module supported.");
- }
-
- int status = state.status();
- String moduleName = state.moduleNames().get(0);
-
- switch (status) {
- case SplitInstallSessionStatus.INSTALLED:
- mFacade.updateCrashKeys();
- notifyListeners(moduleName, true);
- break;
- case SplitInstallSessionStatus.FAILED:
- notifyListeners(moduleName, false);
- mFacade.getLogger().logStatusFailure(moduleName, state.errorCode());
- break;
- }
-
- mFacade.getLogger().logStatus(moduleName, status);
- };
- }
-
- private void notifyListeners(String moduleName, Boolean success) {
- for (InstallListener listener : sSessions.get(moduleName)) {
- notifyListener(listener, success);
- }
-
- sSessions.remove(moduleName);
- unregisterUpdateListener();
- }
-
- protected void notifyListener(InstallListener listener, Boolean success) {
- if (success) {
- mFacade.notifyObservers();
- }
-
- listener.onComplete(success);
- }
-
- private void registerUpdateListener() {
- if (sSessions.size() == 0) {
- mFacade.getSplitManager().registerListener(mUpdateListener);
- }
- }
-
- private void unregisterUpdateListener() {
- if (sSessions.size() == 0) {
- mFacade.getSplitManager().unregisterListener(mUpdateListener);
- }
}
@VisibleForTesting
diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java
index 8ede45fa86..5ec404d59d 100644
--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java
+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/engine/SplitCompatEngineFacade.java
@@ -6,11 +6,6 @@ package org.chromium.components.module_installer.engine;
import android.app.Activity;
-import com.google.android.play.core.splitcompat.SplitCompat;
-import com.google.android.play.core.splitinstall.SplitInstallManager;
-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
-import com.google.android.play.core.splitinstall.SplitInstallRequest;
-
import org.chromium.base.ContextUtils;
import org.chromium.components.module_installer.logger.Logger;
import org.chromium.components.module_installer.logger.PlayCoreLogger;
@@ -21,16 +16,13 @@ import org.chromium.components.module_installer.util.ModuleUtil;
* cannot be easily mocked and simplify the engine's design.
*/
class SplitCompatEngineFacade {
- private final SplitInstallManager mSplitManager;
private final Logger mLogger;
public SplitCompatEngineFacade() {
- this(SplitInstallManagerFactory.create(ContextUtils.getApplicationContext()),
- new PlayCoreLogger());
+ this(new PlayCoreLogger());
}
- public SplitCompatEngineFacade(SplitInstallManager manager, Logger umaLogger) {
- mSplitManager = manager;
+ public SplitCompatEngineFacade(Logger umaLogger) {
mLogger = umaLogger;
}
@@ -38,24 +30,15 @@ class SplitCompatEngineFacade {
return mLogger;
}
- public SplitInstallManager getSplitManager() {
- return mSplitManager;
- }
-
public void installActivity(Activity activity) {
// Note that SplitCompat (install) needs to be called on the Application Context prior
// to calling this method - this is guaranteed by the behavior of SplitCompatEngine.
- SplitCompat.installActivity(activity);
}
public void notifyObservers() {
ModuleUtil.notifyModuleInstalled();
}
- public SplitInstallRequest createSplitInstallRequest(String moduleName) {
- return SplitInstallRequest.newBuilder().addModule(moduleName).build();
- }
-
public void updateCrashKeys() {
ModuleUtil.updateCrashKeys();
}
diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/Logger.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/Logger.java
index 3c08215015..eb506cd7cd 100644
--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/Logger.java
+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/Logger.java
@@ -4,9 +4,6 @@
package org.chromium.components.module_installer.logger;
-import com.google.android.play.core.splitinstall.model.SplitInstallErrorCode;
-import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
-
/**
* Logger for SplitCompat Engine.
*/
@@ -17,7 +14,7 @@ public interface Logger {
* @param moduleName The module name.
* @param errorCode The error code.
*/
- void logRequestFailure(String moduleName, @SplitInstallErrorCode int errorCode);
+ void logRequestFailure(String moduleName, int errorCode);
/**
* Logs exceptions that happen during the installation process.
@@ -25,7 +22,7 @@ public interface Logger {
* @param moduleName The module name.
* @param errorCode The error code.
*/
- void logStatusFailure(String moduleName, @SplitInstallErrorCode int errorCode);
+ void logStatusFailure(String moduleName, int errorCode);
/**
* Logs the status count and duration during a module installation process.
@@ -33,7 +30,7 @@ public interface Logger {
* @param moduleName The module name
* @param status The status code
*/
- void logStatus(String moduleName, @SplitInstallSessionStatus int status);
+ void logStatus(String moduleName, int status);
/**
* Logs the request start time.
diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/PlayCoreLogger.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/PlayCoreLogger.java
index 12a4a303a7..f82e39c45b 100644
--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/PlayCoreLogger.java
+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/PlayCoreLogger.java
@@ -4,9 +4,6 @@
package org.chromium.components.module_installer.logger;
-import com.google.android.play.core.splitinstall.model.SplitInstallErrorCode;
-import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
-
/**
* Concrete Logger for SplitCompat Installers (proxy to specific loggers).
*/
@@ -28,32 +25,19 @@ public class PlayCoreLogger implements Logger {
}
@Override
- public void logRequestFailure(String moduleName, @SplitInstallErrorCode int errorCode) {
+ public void logRequestFailure(String moduleName, int errorCode) {
mFailureLogger.logRequestFailure(moduleName, errorCode);
}
@Override
- public void logStatusFailure(String moduleName, @SplitInstallErrorCode int errorCode) {
+ public void logStatusFailure(String moduleName, int errorCode) {
mFailureLogger.logStatusFailure(moduleName, errorCode);
}
@Override
- public void logStatus(String moduleName, @SplitInstallSessionStatus int status) {
+ public void logStatus(String moduleName, int status) {
mStatusLogger.logStatusChange(moduleName, status);
-
- if (status == SplitInstallSessionStatus.INSTALLED) {
- mAvailabilityLogger.storeModuleInstalled(moduleName, status);
- mAvailabilityLogger.logInstallTimes(moduleName);
-
- // Keep old behavior where we log a 'success' bit with all other failures.
- mFailureLogger.logStatusSuccess(moduleName);
- } else if (status == SplitInstallSessionStatus.CANCELED) {
- // Keep old behavior where we log a 'canceled' bit with all other failures.
- mFailureLogger.logStatusCanceled(moduleName);
- } else if (status == SplitInstallSessionStatus.DOWNLOADED) {
- // Keep old behavior where we log a 'no split compat' bit with all other failures.
- mFailureLogger.logStatusNoSplitCompat(moduleName);
- }
+ mFailureLogger.logStatusCanceled(moduleName);
}
@Override
diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitAvailabilityLogger.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitAvailabilityLogger.java
index d0b2cf84a8..9266d053c1 100644
--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitAvailabilityLogger.java
+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitAvailabilityLogger.java
@@ -9,10 +9,6 @@ import android.content.SharedPreferences;
import android.os.SystemClock;
import android.util.SparseLongArray;
-import com.google.android.play.core.splitinstall.SplitInstallManager;
-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
-import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
-
import org.chromium.base.ContextUtils;
import org.chromium.base.metrics.RecordHistogram;
@@ -48,25 +44,6 @@ public class SplitAvailabilityLogger {
* Records via UMA all modules that have been requested and are currently installed.
*/
public static void logModuleAvailability() {
- SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
- Set<String> requestedModules = new HashSet<>();
- requestedModules.addAll(prefs.getStringSet(ONDEMAND_REQ_PREV, new HashSet<>()));
- requestedModules.addAll(prefs.getStringSet(DEFERRED_REQ_PREV, new HashSet<>()));
-
- Context context = ContextUtils.getApplicationContext();
- SplitInstallManager manager = SplitInstallManagerFactory.create(context);
- Set<String> installedModules = manager.getInstalledModules();
-
- for (String name : requestedModules) {
- recordAvailabilityStatus(
- name, installedModules.contains(name) ? INSTALLED_REQUESTED : REQUESTED);
- }
-
- for (String name : installedModules) {
- if (!requestedModules.contains(name)) {
- recordAvailabilityStatus(name, INSTALLED_UNREQUESTED);
- }
- }
}
private static void recordAvailabilityStatus(String moduleName, int status) {
@@ -80,14 +57,6 @@ public class SplitAvailabilityLogger {
* @param moduleName The module name.
*/
public void logInstallTimes(String moduleName) {
- recordInstallTime(moduleName, "", SplitInstallSessionStatus.UNKNOWN,
- SplitInstallSessionStatus.INSTALLED);
- recordInstallTime(moduleName, ".PendingDownload", SplitInstallSessionStatus.UNKNOWN,
- SplitInstallSessionStatus.DOWNLOADING);
- recordInstallTime(moduleName, ".Download", SplitInstallSessionStatus.DOWNLOADING,
- SplitInstallSessionStatus.INSTALLING);
- recordInstallTime(moduleName, ".Installing", SplitInstallSessionStatus.INSTALLING,
- SplitInstallSessionStatus.INSTALLED);
}
/**
@@ -167,7 +136,6 @@ public class SplitAvailabilityLogger {
public InstallTimes(boolean isCached) {
mIsCached = isCached;
- mInstallTimes.put(SplitInstallSessionStatus.UNKNOWN, SystemClock.uptimeMillis());
}
}
}
diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallFailureLogger.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallFailureLogger.java
index 5114b9bb10..c0f5daa6dc 100644
--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallFailureLogger.java
+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallFailureLogger.java
@@ -4,8 +4,6 @@
package org.chromium.components.module_installer.logger;
-import com.google.android.play.core.splitinstall.model.SplitInstallErrorCode;
-
import org.chromium.base.metrics.RecordHistogram;
class SplitInstallFailureLogger {
@@ -38,40 +36,7 @@ class SplitInstallFailureLogger {
// Keep this one at the end and increment appropriately when adding new status.
private static final int COUNT = 22;
- private int getHistogramCode(@SplitInstallErrorCode int errorCode) {
- switch (errorCode) {
- case SplitInstallErrorCode.NO_ERROR:
- return NO_ERROR;
- case SplitInstallErrorCode.ACTIVE_SESSIONS_LIMIT_EXCEEDED:
- return ACTIVE_SESSIONS_LIMIT_EXCEEDED;
- case SplitInstallErrorCode.MODULE_UNAVAILABLE:
- return MODULE_UNAVAILABLE;
- case SplitInstallErrorCode.INVALID_REQUEST:
- return INVALID_REQUEST;
- case SplitInstallErrorCode.SESSION_NOT_FOUND:
- return SESSION_NOT_FOUND;
- case SplitInstallErrorCode.API_NOT_AVAILABLE:
- return API_NOT_AVAILABLE;
- case SplitInstallErrorCode.NETWORK_ERROR:
- return NETWORK_ERROR;
- case SplitInstallErrorCode.ACCESS_DENIED:
- return ACCESS_DENIED;
- case SplitInstallErrorCode.INCOMPATIBLE_WITH_EXISTING_SESSION:
- return INCOMPATIBLE_WITH_EXISTING_SESSION;
- case SplitInstallErrorCode.SERVICE_DIED:
- return SERVICE_DIED;
- case SplitInstallErrorCode.INSUFFICIENT_STORAGE:
- return INSUFFICIENT_STORAGE;
- case SplitInstallErrorCode.SPLITCOMPAT_VERIFICATION_ERROR:
- return SPLITCOMPAT_VERIFICATION_ERROR;
- case SplitInstallErrorCode.SPLITCOMPAT_EMULATION_ERROR:
- return SPLITCOMPAT_EMULATION_ERROR;
- case SplitInstallErrorCode.SPLITCOMPAT_COPY_ERROR:
- return SPLITCOMPAT_COPY_ERROR;
- case SplitInstallErrorCode.INTERNAL_ERROR:
- return INTERNAL_ERROR;
- }
-
+ private int getHistogramCode(int errorCode) {
return -1;
}
@@ -87,12 +52,12 @@ class SplitInstallFailureLogger {
log(moduleName, NO_SPLITCOMPAT);
}
- public void logStatusFailure(String moduleName, @SplitInstallErrorCode int errorCode) {
+ public void logStatusFailure(String moduleName, int errorCode) {
Integer code = getHistogramCode(errorCode);
log(moduleName, code == -1 ? UNKNOWN_SPLITINSTALL_ERROR : code);
}
- public void logRequestFailure(String moduleName, @SplitInstallErrorCode int errorCode) {
+ public void logRequestFailure(String moduleName, int errorCode) {
Integer code = getHistogramCode(errorCode);
log(moduleName, code == -1 ? UNKNOWN_REQUEST_ERROR : code);
}
diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallStatusLogger.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallStatusLogger.java
index ddc8f7d0b8..0124b5c52a 100644
--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallStatusLogger.java
+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/logger/SplitInstallStatusLogger.java
@@ -4,8 +4,6 @@
package org.chromium.components.module_installer.logger;
-import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
-
import org.chromium.base.metrics.RecordHistogram;
class SplitInstallStatusLogger {
@@ -28,32 +26,11 @@ class SplitInstallStatusLogger {
// Keep this one at the end and increment appropriately when adding new status.
private static final int COUNT = 12;
- private int getHistogramCode(@SplitInstallSessionStatus int code) {
- switch (code) {
- case SplitInstallSessionStatus.PENDING:
- return PENDING;
- case SplitInstallSessionStatus.DOWNLOADING:
- return DOWNLOADING;
- case SplitInstallSessionStatus.DOWNLOADED:
- return DOWNLOADED;
- case SplitInstallSessionStatus.INSTALLING:
- return INSTALLING;
- case SplitInstallSessionStatus.INSTALLED:
- return INSTALLED;
- case SplitInstallSessionStatus.FAILED:
- return FAILED;
- case SplitInstallSessionStatus.CANCELING:
- return CANCELING;
- case SplitInstallSessionStatus.CANCELED:
- return CANCELED;
- case SplitInstallSessionStatus.REQUIRES_USER_CONFIRMATION:
- return REQUIRES_USER_CONFIRMATION;
- }
-
+ private int getHistogramCode(int code) {
return UNKNOWN_CODE;
}
- public void logStatusChange(String moduleName, @SplitInstallSessionStatus int status) {
+ public void logStatusChange(String moduleName, int status) {
recordInstallStatus(moduleName, getHistogramCode(status));
}
diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/util/CrashKeyRecorder.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/util/CrashKeyRecorder.java
index be7ab573cf..b72e4c9d1f 100644
--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/util/CrashKeyRecorder.java
+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/util/CrashKeyRecorder.java
@@ -10,9 +10,6 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.text.TextUtils;
-import com.google.android.play.core.splitinstall.SplitInstallManager;
-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
-
import org.chromium.base.BuildInfo;
import org.chromium.base.ContextUtils;
import org.chromium.components.crash.CrashKeyIndex;
@@ -50,9 +47,6 @@ class CrashKeyRecorder {
// are emulated. Therefore, use an empty set in that case.
Set<String> emulatedModules = new TreeSet<>();
if (SplitCompatInitializer.isInitialized()) {
- SplitInstallManager manager = SplitInstallManagerFactory.create(context);
- emulatedModules.addAll(manager.getInstalledModules());
- emulatedModules.removeAll(fullyInstalledModules);
}
ck.set(CrashKeyIndex.INSTALLED_MODULES, encodeCrashKeyValue(fullyInstalledModules));
diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/util/SplitCompatInitializer.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/util/SplitCompatInitializer.java
index 4c73f0b4f1..beb1444066 100644
--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/util/SplitCompatInitializer.java
+++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/util/SplitCompatInitializer.java
@@ -4,8 +4,6 @@
package org.chromium.components.module_installer.util;
-import com.google.android.play.core.splitcompat.SplitCompat;
-
import org.chromium.base.ContextUtils;
import org.chromium.base.StrictModeContext;
import org.chromium.base.ThreadUtils;
@@ -23,10 +21,6 @@ class SplitCompatInitializer {
return;
}
- // SplitCompat.install may copy modules into Chrome's internal folder or clean them up.
- try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) {
- SplitCompat.install(ContextUtils.getApplicationContext());
- }
sIsInitialized = true;
}
diff --git a/third_party/google_android_play_core/BUILD.gn b/third_party/google_android_play_core/BUILD.gn
index d053015958..a8ac72ea45 100644
--- a/third_party/google_android_play_core/BUILD.gn
+++ b/third_party/google_android_play_core/BUILD.gn
@@ -3,8 +3,3 @@
@ -499,6 +1126,3 @@ diff --git a/third_party/google_android_play_core/BUILD.gn b/third_party/google_
- aar_path = "core-1.6.4.aar"
- info_path = "com_google_android_play_core.info"
-}
--
2.17.1

635
build/patches/Remove-dependency-on-vision-clearcut-and-phenotype.patch
View file

@ -3,15 +3,538 @@ Date: Fri, 1 Nov 2019 23:10:47 +0100
Subject: Remove dependency on vision, clearcut and phenotype
---
BUILD.gn | 5 -
chrome/android/BUILD.gn | 14 --
chrome/android/chrome_java_sources.gni | 1 -
...ome_public_bundle.AndroidManifest.expected | 1 -
...ome_chrome_bundle.AndroidManifest.expected | 1 -
.../features/cablev2_authenticator/BUILD.gn | 2 -
chrome/android/java/AndroidManifest.xml | 6 -
chrome/browser/BUILD.gn | 4 -
chrome/browser/apps/platform_apps/BUILD.gn | 1 -
chrome/browser/chrome_browser_main.cc | 1 -
.../browser/chrome_content_browser_client.cc | 17 ---
chrome/browser/extensions/BUILD.gn | 2 -
.../browser/media/cast_remoting_connector.cc | 26 ----
...hrome_browser_main_extra_parts_profiles.cc | 2 -
chrome/browser/ui/BUILD.gn | 1 -
chrome/test/BUILD.gn | 3 -
chrome/test/media_router/BUILD.gn | 3 -
components/BUILD.gn | 5 -
components/media_router/browser/BUILD.gn | 2 +
.../media_router/browser/android/BUILD.gn | 15 +--
.../test/android/cast_emulator/BUILD.gn | 1 -
services/BUILD.gn | 4 -
services/shape_detection/BUILD.gn | 2 -
.../shape_detection/BarcodeDetectionImpl.java | 114 +-----------------
.../shape_detection/BarcodeDetectionImpl.java | 114 +---------------
.../BarcodeDetectionProviderImpl.java | 31 +----
.../FaceDetectionImplGmsCore.java | 96 +--------------
.../shape_detection/TextDetectionImpl.java | 58 +--------
third_party/android_deps/BUILD.gn | 86 -------------
7 files changed, 10 insertions(+), 381 deletions(-)
.../FaceDetectionImplGmsCore.java | 96 +-------------
.../shape_detection/TextDetectionImpl.java | 58 +-------
third_party/android_deps/BUILD.gn | 125 ------------------
weblayer/BUILD.gn | 1 -
weblayer/browser/java/BUILD.gn | 4 -
weblayer/public/java/AndroidManifest.xml | 6 -
31 files changed, 14 insertions(+), 540 deletions(-)
diff --git a/BUILD.gn b/BUILD.gn
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -17,7 +17,6 @@ import("//build/config/ui.gni")
import("//build/gn_logs.gni")
import("//build/util/generate_wrapper.gni")
import("//chrome/browser/buildflags.gni")
-import("//chrome/browser/media/router/features.gni")
import("//components/nacl/features.gni")
import("//device/vr/buildflags/buildflags.gni")
import("//extensions/buildflags/buildflags.gni")
@@ -228,10 +227,6 @@ group("gn_all") {
]
}
- if (enable_openscreen) {
- deps += [ "//chrome/browser/media/router:openscreen_unittests" ]
- }
-
if (!is_ios && !is_fuchsia) {
deps += [
"//chrome/test:telemetry_perf_unittests",
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -215,7 +215,6 @@ android_resources("chrome_app_java_resources") {
"//components/browser_ui/widget/android:java_resources",
"//components/find_in_page/android:java_resources",
"//components/javascript_dialogs/android:java_resources",
- "//components/media_router/browser/android:java_resources",
"//components/messages/android:java_resources",
"//components/omnibox/browser:java_resources",
"//components/page_info/android:java_resources",
@@ -278,8 +277,6 @@ android_library("chrome_java") {
":usage_stats_proto_java",
"$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_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_fido_java",
"$google_play_services_package:google_play_services_iid_java",
"$google_play_services_package:google_play_services_tasks_java",
@@ -418,7 +415,6 @@ android_library("chrome_java") {
"//components/language/android:language_bridge_java",
"//components/location/android:location_java",
"//components/location/android:settings_java",
- "//components/media_router/browser/android:java",
"//components/messages/android:factory_java",
"//components/messages/android:java",
"//components/messages/android:manager_java",
@@ -683,7 +679,6 @@ group("jni_headers") {
"//chrome/browser/ui/messages/android:jni_headers",
"//chrome/browser/util:jni_headers",
"//chrome/browser/webauthn/android:jni_headers",
- "//components/media_router/browser/android:jni_headers",
]
}
@@ -782,8 +777,6 @@ junit_binary("chrome_junit_tests") {
":partner_location_descriptor_proto_java",
"$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_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_fido_java",
"//base:base_java",
"//base:base_java_test_support",
@@ -1027,8 +1020,6 @@ android_library("chrome_test_java") {
":partner_location_descriptor_proto_java",
"$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_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_fido_java",
"$google_play_services_package:google_play_services_iid_java",
"$google_play_services_package:google_play_services_tasks_java",
@@ -1172,8 +1163,6 @@ android_library("chrome_test_java") {
"//components/infobars/core:infobar_enums_java",
"//components/javascript_dialogs/android:java",
"//components/location/android:location_java",
- "//components/media_router/browser/android:java",
- "//components/media_router/browser/android:test_support_java",
"//components/messages/android:java",
"//components/messages/android:javatests",
"//components/metrics:metrics_java",
@@ -2196,7 +2185,6 @@ android_library("base_module_java") {
"//chrome/browser/version:java",
"//components/crash/android:java",
"//components/embedder_support/android:application_java",
- "//components/media_router/browser/android:cast_options_provider_java",
"//components/minidump_uploader:minidump_uploader_java",
"//components/module_installer/android:module_installer_java",
"//third_party/android_deps:androidx_annotation_annotation_java",
@@ -2220,7 +2208,6 @@ android_library("base_module_java") {
# Deps to pull services into base module.
# TODO(crbug.com/1126301): Consider moving these to the chrome module to
# reduce base dex size.
- "$google_play_services_package:google_play_services_cast_framework_java",
"//components/background_task_scheduler:background_task_scheduler_java",
"//components/payments/content/android:service_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
@@ -3349,7 +3336,6 @@ generate_jni("chrome_jni_headers") {
"java/src/org/chromium/chrome/browser/login/ChromeHttpAuthHandler.java",
"java/src/org/chromium/chrome/browser/media/MediaCaptureDevicesDispatcherAndroid.java",
"java/src/org/chromium/chrome/browser/media/PictureInPictureActivity.java",
- "java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterClient.java",
"java/src/org/chromium/chrome/browser/metrics/BackgroundTaskMemoryMetricsEmitter.java",
"java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java",
"java/src/org/chromium/chrome/browser/metrics/PageLoadMetrics.java",
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -777,7 +777,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/media/PictureInPictureActivity.java",
"java/src/org/chromium/chrome/browser/media/PictureInPictureController.java",
"java/src/org/chromium/chrome/browser/media/remote/RecordCastAction.java",
- "java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterClient.java",
"java/src/org/chromium/chrome/browser/media/ui/ChromeMediaNotificationControllerDelegate.java",
"java/src/org/chromium/chrome/browser/media/ui/ChromeMediaNotificationManager.java",
"java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java",
diff --git a/chrome/android/expectations/monochrome_public_bundle.AndroidManifest.expected b/chrome/android/expectations/monochrome_public_bundle.AndroidManifest.expected
--- a/chrome/android/expectations/monochrome_public_bundle.AndroidManifest.expected
+++ b/chrome/android/expectations/monochrome_public_bundle.AndroidManifest.expected
@@ -823,7 +823,6 @@
<meta-data android:name="android.allow_multiple_resumed_activities" android:value="true"/>
<meta-data android:name="android.content.APP_RESTRICTIONS" android:resource="@xml/app_restrictions"/>
<meta-data android:name="com.android.webview.WebViewLibrary" android:value="libmonochrome.so"/>
- <meta-data android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME" android:value="org.chromium.components.media_router.caf.CastOptionsProvider"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
<meta-data android:name="com.google.ar.core" android:value="optional"/>
<meta-data android:name="com.google.ar.core.min_apk_version" android:value="200501000"/>
diff --git a/chrome/android/expectations/trichrome_chrome_bundle.AndroidManifest.expected b/chrome/android/expectations/trichrome_chrome_bundle.AndroidManifest.expected
--- a/chrome/android/expectations/trichrome_chrome_bundle.AndroidManifest.expected
+++ b/chrome/android/expectations/trichrome_chrome_bundle.AndroidManifest.expected
@@ -777,7 +777,6 @@
</activity-alias> # DIFF-ANCHOR: 7c349c4f
<meta-data android:name="android.allow_multiple_resumed_activities" android:value="true"/>
<meta-data android:name="android.content.APP_RESTRICTIONS" android:resource="@xml/app_restrictions"/>
- <meta-data android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME" android:value="org.chromium.components.media_router.caf.CastOptionsProvider"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
<meta-data android:name="com.google.ar.core" android:value="optional"/>
<meta-data android:name="com.google.ar.core.min_apk_version" android:value="200501000"/>
diff --git a/chrome/android/features/cablev2_authenticator/BUILD.gn b/chrome/android/features/cablev2_authenticator/BUILD.gn
--- a/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -20,8 +20,6 @@ android_library("java") {
"$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_fido_java",
"$google_play_services_package:google_play_services_tasks_java",
- "$google_play_services_package:google_play_services_vision_common_java",
- "$google_play_services_package:google_play_services_vision_java",
"//base:base_java",
"//base:jni_java",
"//content/public/android:content_java",
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -1143,12 +1143,6 @@ by a child template that "extends" this file.
<meta-data android:name="com.google.ar.core" android:value="optional" />
{% endif %}
- <!-- Cast support -->
- <meta-data
- android:name=
- "com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
- android:value="org.chromium.components.media_router.caf.CastOptionsProvider"/>
-
<!-- These providers are declared in the base module to give the chrome
split preloader more time to work. -->
<provider android:name="org.chromium.chrome.browser.util.ChromeFileProvider"
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1972,7 +1972,6 @@ static_library("browser") {
"//chrome/browser/media:mojo_bindings",
"//chrome/browser/media/feeds:mojo_bindings",
"//chrome/browser/media/feeds:proto",
- "//chrome/browser/media/router",
"//chrome/browser/metrics:expired_histograms_array",
"//chrome/browser/metrics/variations:chrome_ui_string_overrider_factory",
"//chrome/browser/net:probe_message_proto",
@@ -3053,8 +3052,6 @@ static_library("browser") {
"media/android/cdm/media_drm_storage_factory.h",
"media/android/cdm/per_device_provisioning_permission.cc",
"media/android/cdm/per_device_provisioning_permission.h",
- "media/android/router/chrome_media_router_client.cc",
- "media/android/router/chrome_media_router_client.h",
"media/webrtc/screen_capture_infobar_delegate_android.cc",
"media/webrtc/screen_capture_infobar_delegate_android.h",
"memory_details_android.cc",
@@ -5279,7 +5276,6 @@ static_library("browser") {
deps += [
"//chrome/browser/ui/webui/discards:mojo_bindings",
"//components/autofill/content/browser/webauthn",
- "//components/media_router/browser",
"//components/mirroring/browser",
"//components/mirroring/mojom:host",
"//components/mirroring/mojom:service",
diff --git a/chrome/browser/apps/platform_apps/BUILD.gn b/chrome/browser/apps/platform_apps/BUILD.gn
--- a/chrome/browser/apps/platform_apps/BUILD.gn
+++ b/chrome/browser/apps/platform_apps/BUILD.gn
@@ -54,7 +54,6 @@ source_set("platform_apps") {
"//chrome/app:command_ids",
"//chrome/browser:browser_process",
"//chrome/browser/extensions",
- "//chrome/browser/media/router/discovery",
"//chrome/browser/sharing/proto:proto",
"//chrome/browser/web_applications/components:components",
"//chrome/browser/web_applications/extensions",
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1077,7 +1077,6 @@ void ChromeBrowserMainParts::PreProfileInit() {
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
InstallChromeJavaScriptAppModalDialogViewFactory();
- media_router::ChromeMediaRouterFactory::DoPlatformInit();
}
void ChromeBrowserMainParts::PostProfileInit() {
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -74,7 +74,6 @@
#include "chrome/browser/lifetime/browser_shutdown.h"
#include "chrome/browser/lookalikes/lookalike_url_navigation_throttle.h"
#include "chrome/browser/media/audio_service_util.h"
-#include "chrome/browser/media/router/media_router_feature.h"
#include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h"
#include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
#include "chrome/browser/media/webrtc/webrtc_logging_controller.h"
@@ -231,8 +230,6 @@
#include "components/keep_alive_registry/keep_alive_types.h"
#include "components/keep_alive_registry/scoped_keep_alive.h"
#include "components/language/core/browser/pref_names.h"
-#include "components/media_router/browser/presentation/presentation_service_delegate_impl.h"
-#include "components/media_router/browser/presentation/receiver_presentation_service_delegate_impl.h"
#include "components/metrics/client_info.h"
#include "components/metrics_services_manager/metrics_services_manager.h"
#include "components/net_log/chrome_net_log.h"
@@ -3948,26 +3945,12 @@ void ChromeContentBrowserClient::OpenURL(
content::ControllerPresentationServiceDelegate*
ChromeContentBrowserClient::GetControllerPresentationServiceDelegate(
content::WebContents* web_contents) {
- if (media_router::MediaRouterEnabled(web_contents->GetBrowserContext())) {
- return media_router::PresentationServiceDelegateImpl::
- GetOrCreateForWebContents(web_contents);
- }
return nullptr;
}
content::ReceiverPresentationServiceDelegate*
ChromeContentBrowserClient::GetReceiverPresentationServiceDelegate(
content::WebContents* web_contents) {
- if (media_router::MediaRouterEnabled(web_contents->GetBrowserContext())) {
- // ReceiverPresentationServiceDelegateImpl exists only for WebContents
- // created for offscreen presentations. The WebContents must belong to
- // an incognito profile.
- if (auto* impl = media_router::ReceiverPresentationServiceDelegateImpl::
- FromWebContents(web_contents)) {
- DCHECK(web_contents->GetBrowserContext()->IsOffTheRecord());
- return impl;
- }
- }
return nullptr;
}
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -782,8 +782,6 @@ static_library("extensions") {
"//chrome/browser/browsing_data:constants",
"//chrome/browser/devtools",
"//chrome/browser/image_decoder",
- "//chrome/browser/media/router",
- "//chrome/browser/media/router/discovery",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
"//chrome/browser/resource_coordinator:mojo_bindings",
"//chrome/browser/safe_browsing",
diff --git a/chrome/browser/media/cast_remoting_connector.cc b/chrome/browser/media/cast_remoting_connector.cc
--- a/chrome/browser/media/cast_remoting_connector.cc
+++ b/chrome/browser/media/cast_remoting_connector.cc
@@ -139,32 +139,6 @@ CastRemotingConnector* CastRemotingConnector::Get(
if (!connector) {
if (!media_router::MediaRouterEnabled(contents->GetBrowserContext()))
return nullptr;
- connector = new CastRemotingConnector(
- media_router::MediaRouterFactory::GetApiForBrowserContext(
- contents->GetBrowserContext()),
- user_prefs::UserPrefs::Get(contents->GetBrowserContext()),
- sessions::SessionTabHelper::IdForTab(contents),
-#if defined(TOOLKIT_VIEWS)
- base::BindRepeating(
- [](content::WebContents* contents,
- PermissionResultCallback result_callback) {
- media_router::MediaRemotingDialogView::GetPermission(
- contents, std::move(result_callback));
- return media_router::MediaRemotingDialogView::IsShowing()
- ? base::BindOnce(
- &media_router::MediaRemotingDialogView::
- HideDialog)
- : CancelPermissionRequestCallback();
- },
- contents)
-#else
- base::BindRepeating([](PermissionResultCallback result_callback) {
- std::move(result_callback).Run(true);
- return CancelPermissionRequestCallback();
- })
-#endif
- );
- contents->SetUserData(kUserDataKey, base::WrapUnique(connector));
}
return connector;
}
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -327,8 +327,6 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
if (base::FeatureList::IsEnabled(media::kUseMediaHistoryStore))
media_history::MediaHistoryKeyedServiceFactory::GetInstance();
- media_router::ChromeLocalPresentationManagerFactory::GetInstance();
- media_router::ChromeMediaRouterFactory::GetInstance();
#if !defined(OS_ANDROID)
media_router::MediaRouterUIServiceFactory::GetInstance();
#endif
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1517,7 +1517,6 @@ static_library("ui") {
"//chrome/browser:theme_properties",
"//chrome/browser/browsing_data:constants",
"//chrome/browser/cart:mojo_bindings",
- "//chrome/browser/media/router",
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/promo_browser_command:mojo_bindings",
"//chrome/browser/resource_coordinator:tab_metrics_event_proto",
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1738,7 +1738,6 @@ if (!is_android) {
"//ash/keyboard/ui:test_support",
"//chrome/browser/chromeos:arc_test_support",
"//chrome/browser/chromeos:test_support",
- "//chrome/browser/media/router:test_support",
"//chrome/browser/resources/chromeos/accessibility:browser_tests",
"//chrome/browser/ui/ash/holding_space:browser_tests",
"//chrome/services/file_util/public/cpp:browser_tests",
@@ -4179,7 +4178,6 @@ test("unit_tests") {
"//chrome:child_dependencies",
"//chrome:resources",
"//chrome:strings",
- "//chrome/browser/media/router:unittests",
"//chrome/browser/notifications:unit_tests",
"//chrome/browser/payments:unittests",
"//chrome/browser/persisted_state_db:persisted_state_db",
@@ -6739,7 +6737,6 @@ if (!is_android) {
if (is_chromeos_ash) {
deps += [
- "//chrome/browser/media/router:test_support",
"//chromeos/dbus",
"//chromeos/ui/frame:test_support",
]
diff --git a/chrome/test/media_router/BUILD.gn b/chrome/test/media_router/BUILD.gn
--- a/chrome/test/media_router/BUILD.gn
+++ b/chrome/test/media_router/BUILD.gn
@@ -29,7 +29,6 @@ source_set("browser_tests") {
"//build:chromeos_buildflags",
"//chrome/app:generated_resources",
"//chrome/browser",
- "//chrome/browser/media/router",
"//chrome/browser/ui",
"//chrome/common",
"//chrome/test:test_support",
@@ -135,8 +134,6 @@ source_set("test_support") {
"//extensions/browser",
]
deps = [
- "//chrome/browser/media/router",
- "//chrome/browser/media/router:test_support",
"//chrome/common:constants",
"//chrome/test:test_support",
"//chrome/test:test_support_ui",
diff --git a/components/BUILD.gn b/components/BUILD.gn
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -272,8 +272,6 @@ test("components_unittests") {
"//components/keyed_service/content:unit_tests",
"//components/language/content/browser:unit_tests",
"//components/link_header_util:unit_tests",
- "//components/media_router/browser:unit_tests",
- "//components/media_router/common:unit_tests",
"//components/navigation_interception:unit_tests",
"//components/network_hints/renderer:unit_tests",
"//components/no_state_prefetch/browser:unit_tests",
@@ -366,8 +364,6 @@ test("components_unittests") {
"//components/gcm_driver/instance_id/android:instance_id_driver_java",
"//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
"//components/invalidation/impl",
- "//components/media_router/browser/android:java",
- "//components/media_router/browser/android:test_support_java",
"//components/offline_items_collection/core:native_java_unittests_java",
"//components/paint_preview/browser/android:java",
"//components/paint_preview/player/android:unit_tests",
@@ -815,7 +811,6 @@ if (is_android) {
"//components/content_capture/android/junit:components_content_capture_junit_tests",
"//components/embedder_support/android:components_embedder_support_junit_tests",
"//components/gcm_driver/android:components_gcm_driver_junit_tests",
- "//components/media_router/browser/android:junit",
"//components/messages/android:junit",
"//components/messages/android/internal:junit",
"//components/payments/content/android:junit",
diff --git a/components/media_router/browser/BUILD.gn b/components/media_router/browser/BUILD.gn
--- a/components/media_router/browser/BUILD.gn
+++ b/components/media_router/browser/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+if(false) {
source_set("browser") {
sources = [
"issue_manager.cc",
@@ -141,3 +142,4 @@ source_set("unit_tests") {
sources += [ "logger_impl_unittest.cc" ]
}
}
+}
\ No newline at end of file
diff --git a/components/media_router/browser/android/BUILD.gn b/components/media_router/browser/android/BUILD.gn
--- a/components/media_router/browser/android/BUILD.gn
+++ b/components/media_router/browser/android/BUILD.gn
@@ -7,14 +7,13 @@ import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//tools/grit/grit_rule.gni")
+if(false) {
android_library("java") {
resources_package = "org.chromium.components.media_router"
deps = [
":java_resources",
"$google_play_services_package:google_play_services_base_java",
"$google_play_services_package:google_play_services_basement_java",
- "$google_play_services_package:google_play_services_cast_framework_java",
- "$google_play_services_package:google_play_services_cast_java",
"//base:base_java",
"//base:jni_java",
"//components/browser_ui/media/android:java",
@@ -33,7 +32,6 @@ android_library("java") {
"java/src/org/chromium/components/media_router/BrowserMediaRouter.java",
"java/src/org/chromium/components/media_router/BrowserMediaRouterDialogController.java",
"java/src/org/chromium/components/media_router/CastRequestIdGenerator.java",
- "java/src/org/chromium/components/media_router/CastSessionUtil.java",
"java/src/org/chromium/components/media_router/ClientRecord.java",
"java/src/org/chromium/components/media_router/DiscoveryCallback.java",
"java/src/org/chromium/components/media_router/DiscoveryDelegate.java",
@@ -72,14 +70,6 @@ android_library("java") {
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
}
-android_library("cast_options_provider_java") {
- sources = [ "java/src/org/chromium/components/media_router/caf/CastOptionsProvider.java" ]
- deps = [
- "$google_play_services_package:google_play_services_cast_framework_java",
- "$google_play_services_package:google_play_services_cast_java",
- ]
-}
-
generate_jni("jni_headers") {
sources = [
"java/src/org/chromium/components/media_router/BrowserMediaRouter.java",
@@ -143,8 +133,6 @@ java_library("junit") {
":java",
":test_support_java",
"$google_play_services_package:google_play_services_basement_java",
- "$google_play_services_package:google_play_services_cast_framework_java",
- "$google_play_services_package:google_play_services_cast_java",
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
@@ -194,3 +182,4 @@ java_strings_grd("java_strings_grd") {
android_bundle_locales_as_resources,
[ "values-{{source_name_part}}/android_chrome_media_router_strings.xml" ])
}
+}
\ No newline at end of file
diff --git a/components/media_router/test/android/cast_emulator/BUILD.gn b/components/media_router/test/android/cast_emulator/BUILD.gn
--- a/components/media_router/test/android/cast_emulator/BUILD.gn
+++ b/components/media_router/test/android/cast_emulator/BUILD.gn
@@ -20,7 +20,6 @@ android_library("cast_emulator_java") {
"src/org/chromium/components/media_router/cast_emulator/router/DummyRoutePublisher.java",
]
deps = [
- "$google_play_services_package:google_play_services_cast_java",
"//base:base_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
"//third_party/android_deps:androidx_mediarouter_mediarouter_java",
diff --git a/services/BUILD.gn b/services/BUILD.gn
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@ -291,7 +814,7 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect
}
@Override
public void detect(org.chromium.skia.mojom.Bitmap bitmapData, DetectResponse callback) {
public void detect(org.chromium.skia.mojom.BitmapN32 bitmapData, DetectResponse callback) {
- // The vision library will be downloaded the first time the API is used
- // on the device; this happens "fast", but it might have not completed,
- // bail in this case.
@ -404,7 +927,7 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect
}
@Override
public void detect(org.chromium.skia.mojom.Bitmap bitmapData, DetectResponse callback) {
public void detect(org.chromium.skia.mojom.BitmapN32 bitmapData, DetectResponse callback) {
- // The vision library will be downloaded the first time the API is used
- // on the device; this happens "fast", but it might have not completed,
- // bail in this case. Also, the API was disabled between and v.9.0 and
@ -471,7 +994,53 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
@@ -1299,36 +1299,6 @@ android_aar_prebuilt("google_play_services_tasks_java") {
@@ -1191,45 +1191,6 @@ android_aar_prebuilt("google_play_services_basement_java") {
"//build/android/bytecode:fragment_activity_replacer"
}
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_cast_java") {
- aar_path = "libs/com_google_android_gms_play_services_cast/play-services-cast-17.0.0.aar"
- info_path = "libs/com_google_android_gms_play_services_cast/com_google_android_gms_play_services_cast.info"
- deps = [
- ":androidx_core_core_java",
- ":androidx_mediarouter_mediarouter_java",
- ":google_play_services_base_java",
- ":google_play_services_basement_java",
- ":google_play_services_flags_java",
- ":google_play_services_tasks_java",
- ]
-
- # Removing drawables from GMS .aars as they are unused bloat.
- strip_drawables = true
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_cast_framework_java") {
- aar_path = "libs/com_google_android_gms_play_services_cast_framework/play-services-cast-framework-17.0.0.aar"
- info_path = "libs/com_google_android_gms_play_services_cast_framework/com_google_android_gms_play_services_cast_framework.info"
- deps = [
- ":androidx_appcompat_appcompat_java",
- ":androidx_collection_collection_java",
- ":androidx_core_core_java",
- ":androidx_fragment_fragment_java",
- ":androidx_media_media_java",
- ":androidx_mediarouter_mediarouter_java",
- ":androidx_recyclerview_recyclerview_java",
- ":google_play_services_base_java",
- ":google_play_services_basement_java",
- ":google_play_services_cast_java",
- ]
-
- # Removing all resources from cast framework as they are unused bloat.
- # Can only safely remove them when R8 will strip the path that accesses them.
- strip_resources = !is_java_debug
-}
-
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_fido_java") {
aar_path = "libs/com_google_android_gms_play_services_fido/play-services-fido-18.1.0.aar"
@@ -1318,36 +1279,6 @@ android_aar_prebuilt("google_play_services_tasks_java") {
strip_drawables = true
}
@ -508,7 +1077,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_google_android_material_material_java") {
aar_path =
@@ -2281,62 +2251,6 @@ java_prebuilt("com_github_kevinstern_software_and_algorithms_java") {
@@ -2305,62 +2236,6 @@ java_prebuilt("com_github_kevinstern_software_and_algorithms_java") {
visibility = [ ":*" ]
}
@ -571,6 +1140,54 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_places_placereport_java") {
aar_path = "libs/com_google_android_gms_play_services_places_placereport/play-services-places-placereport-17.0.0.aar"
diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn
--- a/weblayer/BUILD.gn
+++ b/weblayer/BUILD.gn
@@ -639,7 +639,6 @@ source_set("weblayer_lib_base") {
"//components/infobars/content",
"//components/javascript_dialogs",
"//components/location/android:settings",
- "//components/media_router/browser",
"//components/metrics",
"//components/minidump_uploader",
"//components/navigation_interception",
diff --git a/weblayer/browser/java/BUILD.gn b/weblayer/browser/java/BUILD.gn
--- a/weblayer/browser/java/BUILD.gn
+++ b/weblayer/browser/java/BUILD.gn
@@ -232,8 +232,6 @@ android_library("java") {
"//components/infobars/core:infobar_enums_java",
"//components/javascript_dialogs/android:java",
"//components/location/android:settings_java",
- "//components/media_router/browser/android:cast_options_provider_java",
- "//components/media_router/browser/android:java",
"//components/metrics:metrics_java",
"//components/minidump_uploader:minidump_uploader_java",
"//components/navigation_interception/android:navigation_interception_java",
@@ -321,8 +319,6 @@ android_library("test_java") {
"//base:jni_java",
"//components/infobars/android:java",
"//components/location/android:location_java",
- "//components/media_router/browser/android:java",
- "//components/media_router/browser/android:test_support_java",
"//components/permissions/android:java",
"//content/public/test/android:content_java_test_support",
"//net/android:net_java",
diff --git a/weblayer/public/java/AndroidManifest.xml b/weblayer/public/java/AndroidManifest.xml
--- a/weblayer/public/java/AndroidManifest.xml
+++ b/weblayer/public/java/AndroidManifest.xml
@@ -104,12 +104,6 @@
android:isolatedProcess="true"
android:process=":decoder_service" />
- <!-- Cast support -->
- <!-- TODO(crbug.com/1148410): remove this. -->
- <meta-data
- android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
- android:value="org.chromium.components.media_router.caf.CastOptionsProvider"/>
-
<!-- GooglePay payment app support -->
<meta-data
android:name="com.google.android.gms.wallet.api.enabled"
--
2.17.1