0

Remove the Model Loader API - part 2/n

Deletes all flags related to the Model Loader API. The code these flags
guarded was deleted in https://crrev.com/c/5666054

Bug: 350407897
Change-Id: I9361b000395ea076e4ff826286544ac9b32fe0cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5669977
Reviewed-by: Vladimir Levin <vmpstr@chromium.org>
Reviewed-by: Alex Gough <ajgo@chromium.org>
Commit-Queue: Charlie Reis <creis@chromium.org>
Commit-Queue: Austin Sullivan <asully@chromium.org>
Auto-Submit: Austin Sullivan <asully@chromium.org>
Reviewed-by: Charlie Reis <creis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1322334}
This commit is contained in:
Austin Sullivan
2024-07-02 18:50:52 +00:00
committed by Chromium LUCI CQ
parent 6629de0ccf
commit 1eab2dc05a
8 changed files with 0 additions and 45 deletions

@ -8718,14 +8718,6 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kCanvas2DLayersDescription, kOsAll,
SINGLE_VALUE_TYPE(switches::kEnableCanvas2DLayers)},
{"enable-machine-learning-model-loader-web-platform-api",
flag_descriptions::kEnableMachineLearningModelLoaderWebPlatformApiName,
flag_descriptions::
kEnableMachineLearningModelLoaderWebPlatformApiDescription,
kOsAll,
FEATURE_VALUE_TYPE(
features::kEnableMachineLearningModelLoaderWebPlatformApi)},
{"web-machine-learning-neural-network",
flag_descriptions::kWebMachineLearningNeuralNetworkName,
flag_descriptions::kWebMachineLearningNeuralNetworkDescription, kOsAll,

@ -2319,11 +2319,6 @@ const char kCanvas2DLayersName[] =
const char kCanvas2DLayersDescription[] =
"Enables the canvas 2D methods BeginLayer and EndLayer.";
const char kEnableMachineLearningModelLoaderWebPlatformApiName[] =
"Enables Machine Learning Model Loader Web Platform API";
const char kEnableMachineLearningModelLoaderWebPlatformApiDescription[] =
"Enables the Machine Learning Model Loader Web Platform API.";
const char kWebMachineLearningNeuralNetworkName[] = "Enables WebNN API";
const char kWebMachineLearningNeuralNetworkDescription[] =
"Enables the Web Machine Learning Neural Network (WebNN) API. Spec at "

@ -1344,9 +1344,6 @@ extern const char kUsernameFirstFlowWithIntermediateValuesVotingDescription[];
extern const char kCanvas2DLayersName[];
extern const char kCanvas2DLayersDescription[];
extern const char kEnableMachineLearningModelLoaderWebPlatformApiName[];
extern const char kEnableMachineLearningModelLoaderWebPlatformApiDescription[];
extern const char kWebMachineLearningNeuralNetworkName[];
extern const char kWebMachineLearningNeuralNetworkDescription[];

@ -39,7 +39,6 @@
#include "content/browser/media/media_web_contents_observer.h"
#include "content/browser/media/midi_host.h"
#include "content/browser/media/session/media_session_service_impl.h"
#include "content/browser/ml/ml_service_factory.h"
#include "content/browser/network/reporting_service_proxy.h"
#include "content/browser/picture_in_picture/picture_in_picture_service_impl.h"
#include "content/browser/preloading/anchor_element_interaction_host_impl.h"
@ -914,12 +913,6 @@ void PopulateFrameBinders(RenderFrameHostImpl* host, mojo::BinderMap* map) {
map->Add<handwriting::mojom::HandwritingRecognitionService>(
base::BindRepeating(&CreateHandwritingRecognitionService));
if (base::FeatureList::IsEnabled(
features::kEnableMachineLearningModelLoaderWebPlatformApi)) {
map->Add<ml::model_loader::mojom::MLService>(
base::BindRepeating(&CreateMLService));
}
if (base::FeatureList::IsEnabled(
webnn::mojom::features::kWebMachineLearningNeuralNetwork)) {
map->Add<webnn::mojom::WebNNContextProvider>(base::BindRepeating(

@ -256,9 +256,6 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
#if BUILDFLAG(IS_CHROMEOS)
{wf::EnableLockedMode, raw_ref(blink::features::kLockedMode)},
#endif
{wf::EnableMachineLearningModelLoader,
raw_ref(features::kEnableMachineLearningModelLoaderWebPlatformApi),
kSetOnlyIfOverridden},
{wf::EnableMediaCastOverlayButton,
raw_ref(media::kMediaCastOverlayButton)},
{wf::EnableMediaEngagementBypassAutoplayPolicies,

@ -352,12 +352,6 @@ BASE_FEATURE(kEnableCanvas2DLayers,
"EnableCanvas2DLayers",
base::FEATURE_DISABLED_BY_DEFAULT);
// Enables the Machine Learning Model Loader Web Platform API. Explainer:
// https://github.com/webmachinelearning/model-loader/blob/main/explainer.md
BASE_FEATURE(kEnableMachineLearningModelLoaderWebPlatformApi,
"EnableMachineLearningModelLoaderWebPlatformApi",
base::FEATURE_DISABLED_BY_DEFAULT);
// Enables service workers on chrome-untrusted:// urls.
BASE_FEATURE(kEnableServiceWorkersForChromeUntrusted,
"EnableServiceWorkersForChromeUntrusted",

@ -85,8 +85,6 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(
CONTENT_EXPORT BASE_DECLARE_FEATURE(kDrawCutoutEdgeToEdge);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kEarlyEstablishGpuChannel);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableCanvas2DLayers);
CONTENT_EXPORT BASE_DECLARE_FEATURE(
kEnableMachineLearningModelLoaderWebPlatformApi);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableServiceWorkersForChromeScheme);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableServiceWorkersForChromeUntrusted);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kFedCm);

@ -2421,17 +2421,6 @@
name: "MacFontsDeprecateFontTraitsWorkaround",
status: "stable",
},
{
name: "MachineLearningCommon",
implied_by: ["MachineLearningModelLoader", "MachineLearningNeuralNetwork"],
status: "experimental",
},
{
name: "MachineLearningModelLoader",
public: true,
status: "experimental",
base_feature: "none",
},
{
name: "MachineLearningNeuralNetwork",
public: true,