From: uazo Date: Tue, 25 Jan 2022 12:22:52 +0000 Subject: Disable all predictors code Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- chrome/browser/BUILD.gn | 1 - chrome/browser/about_flags.cc | 2 + .../chrome_autocomplete_provider_client.cc | 4 +- chrome/browser/autofill/BUILD.gn | 4 +- ...ld_classification_model_service_factory.cc | 14 +-- .../background_download_service_factory.cc | 2 +- .../history_embeddings_utils.cc | 5 + .../preloading_model_keyed_service.cc | 2 + .../preloading_model_keyed_service_factory.cc | 4 +- chrome/browser/optimization_guide/BUILD.gn | 4 +- .../chrome_hints_manager.cc | 1 + .../optimization_guide_global_state.cc | 2 +- .../optimization_guide_global_state.h | 4 +- .../model_validator_keyed_service.cc | 8 ++ .../optimization_guide_keyed_service.cc | 114 ++---------------- .../optimization_guide_keyed_service.h | 8 +- .../private_ai_model_execution_fetcher.cc | 47 +------- .../password_change_delegate_impl.cc | 2 + ...ld_classification_model_handler_factory.cc | 11 +- chrome/browser/permissions/BUILD.gn | 24 ++-- .../permissions/chrome_permissions_client.cc | 2 - .../passage_embedder_delegate.cc | 2 + .../permissions_ai_ui_selector.cc | 5 + .../permissions_ai_ui_selector.h | 5 +- .../prediction_model_handler_provider.cc | 15 ++- .../prediction_model_handler_provider.h | 2 + .../quiet_notification_permission_ui_state.cc | 4 +- .../autocomplete_action_predictor.cc | 2 + .../predictors/loading_predictor_config.cc | 4 +- .../browser/predictors/predictors_features.cc | 3 +- .../search_prefetch/field_trial_settings.cc | 4 + .../search_prefetch_url_loader_interceptor.cc | 1 + ...hrome_browser_main_extra_parts_profiles.cc | 3 +- chrome/browser/safe_browsing/BUILD.gn | 9 +- ...ction_intelligent_scan_delegate_factory.cc | 3 +- ...ation_content_detection_service_factory.cc | 6 + .../preloading/AndroidPrerenderManager.java | 1 + .../ui/autofill/chrome_autofill_client.cc | 13 +- chrome/browser/ui/tab_helpers.cc | 1 - .../autofill_ml_internals_page_handler.cc | 2 + .../autofill_ml_internals_page_handler.h | 3 + .../autofill_ml_internals_ui.cc | 3 + .../new_tab_page/new_tab_page_handler.cc | 10 +- .../webui/new_tab_page/new_tab_page_handler.h | 4 +- .../ui/webui/omnibox/omnibox_page_handler.cc | 5 +- .../ui/webui/on_device_internals/BUILD.gn | 4 +- .../on_device_internals_page_handler.h | 2 + .../read_anything/read_aloud_app_model.cc | 16 ++- .../read_anything/read_aloud_app_model.h | 9 +- .../read_anything_app_controller.cc | 10 ++ .../read_anything_app_controller.h | 4 + chrome/test/BUILD.gn | 2 - chrome/utility/BUILD.gn | 2 +- chrome/utility/services.cc | 8 -- components/BUILD.gn | 2 +- components/autofill/core/browser/BUILD.gn | 30 ++--- .../browser/foundations/autofill_manager.cc | 14 ++- .../browser/foundations/autofill_manager.h | 3 + .../autofill_optimization_guide_decider.cc | 5 +- .../field_classification_model_handler.cc | 12 +- .../field_classification_model_handler.h | 10 +- .../core/history_embeddings_features.cc | 1 + .../aim_eligibility_service_features.cc | 1 + .../browser/autocomplete_controller.cc | 6 + .../omnibox/browser/base_search_provider.cc | 4 +- .../omnibox/browser/omnibox_field_trial.cc | 2 +- .../prediction_model_download_manager.cc | 6 +- .../delivery/prediction_model_fetcher_impl.cc | 1 + .../core/hints/hints_fetcher.cc | 1 + .../core/hints/hints_manager.cc | 2 + .../core/optimization_guide_features.cc | 13 +- components/optimization_guide/features.gni | 2 +- .../page_category_classifier_bridge_impl.cc | 4 + .../page_category_classifier_bridge_impl.h | 3 + .../core/page_content_annotations_features.cc | 8 ++ .../page_content_annotations_model_manager.cc | 1 + .../core/page_content_annotations_service.cc | 6 + .../core/page_content_annotations_service.h | 9 +- .../permissions/prediction_service/BUILD.gn | 34 +++--- .../browser/client_side_phishing_model.cc | 4 +- .../notification_content_detection/BUILD.gn | 4 - .../core/language_detection/BUILD.gn | 1 - components/viz/service/BUILD.gn | 4 +- components/viz/service/gl/gpu_service_impl.cc | 21 ---- content/browser/BUILD.gn | 6 +- content/browser/gpu/gpu_process_host.cc | 6 +- .../service_worker_main_resource_loader.cc | 1 + content/utility/services.cc | 10 -- .../Disable-all-predictors-code.inc | 2 + .../Disable-all-predictors-code.inc | 1 + .../Disable-all-predictors-code.inc | 1 + .../Disable-all-predictors-code.inc | 1 + .../Disable-all-predictors-code.inc | 5 + .../Disable-all-predictors-code.inc | 1 + .../Disable-all-predictors-code.inc | 1 + .../Disable-all-predictors-code.inc | 2 + media/webrtc/BUILD.gn | 1 + media/webrtc/helpers.cc | 1 + services/on_device_model/BUILD.gn | 6 +- services/on_device_model/fake/BUILD.gn | 10 +- .../fake/fake_chrome_ml_api.cc | 4 + .../fake/on_device_model_fake.cc | 4 +- services/on_device_model/ml/BUILD.gn | 2 + services/on_device_model/ml/chrome_ml_api.h | 4 + services/on_device_model/ml/ts_model.cc | 4 +- services/on_device_model/on_device_model.gni | 4 +- .../on_device_model_service.cc | 9 +- .../on_device_model/public/cpp/features.cc | 2 + .../public/cpp/test_support/BUILD.gn | 2 +- .../on_device_model/public/mojom/BUILD.gn | 2 +- services/on_device_model/safety/BUILD.gn | 2 +- .../passage_embeddings_service.cc | 4 + services/webnn/BUILD.gn | 2 +- services/webnn/features.gni | 2 +- services/webnn/webnn_context_provider_impl.cc | 30 +---- .../core/html/parser/html_document_parser.cc | 1 + .../document_speculation_rules.cc | 1 + .../platform/runtime_enabled_features.json5 | 2 +- 118 files changed, 368 insertions(+), 414 deletions(-) create mode 100644 cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/components/password_manager/core/browser/features/password_features_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -2081,7 +2081,6 @@ static_library("browser") { "//components/resources", "//components/safe_browsing/content/browser", "//components/safe_browsing/content/browser:safe_browsing_service", - "//components/safe_browsing/content/browser/notification_content_detection", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/content/common/proto:download_file_types_proto", diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -9005,6 +9005,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( ntp_features::kCustomizeChromeWallpaperSearchInspirationCard)}, +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ {"wallpaper-search-settings-visibility", flag_descriptions::kWallpaperSearchSettingsVisibilityName, flag_descriptions::kWallpaperSearchSettingsVisibilityDescription, @@ -9012,6 +9013,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(optimization_guide::features::internal:: kWallpaperSearchSettingsVisibility)}, #endif +#endif #if BUILDFLAG(IS_CHROMEOS) {"enable-component-updater-test-request", diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc @@ -441,12 +441,12 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager() AutocompleteScoringModelService* ChromeAutocompleteProviderClient::GetAutocompleteScoringModelService() const { - return AutocompleteScoringModelServiceFactory::GetForProfile(profile_); + return nullptr; } OnDeviceTailModelService* ChromeAutocompleteProviderClient::GetOnDeviceTailModelService() const { - return OnDeviceTailModelServiceFactory::GetForProfile(profile_); + return nullptr; } ProviderStateService* diff --git a/chrome/browser/autofill/BUILD.gn b/chrome/browser/autofill/BUILD.gn --- a/chrome/browser/autofill/BUILD.gn +++ b/chrome/browser/autofill/BUILD.gn @@ -32,8 +32,8 @@ static_library("autofill") { "gmail_otp_backend_factory.h", "merchant_promo_code_manager_factory.cc", "merchant_promo_code_manager_factory.h", - "ml_log_router_factory.cc", - "ml_log_router_factory.h", + # "ml_log_router_factory.cc", + # "ml_log_router_factory.h", "one_time_token_service_factory.cc", "one_time_token_service_factory.h", "personal_data_manager_factory.cc", diff --git a/chrome/browser/autofill/autofill_field_classification_model_service_factory.cc b/chrome/browser/autofill/autofill_field_classification_model_service_factory.cc --- a/chrome/browser/autofill/autofill_field_classification_model_service_factory.cc +++ b/chrome/browser/autofill/autofill_field_classification_model_service_factory.cc @@ -29,8 +29,7 @@ AutofillFieldClassificationModelServiceFactory::GetInstance() { FieldClassificationModelHandler* AutofillFieldClassificationModelServiceFactory::GetForBrowserContext( content::BrowserContext* context) { - return static_cast( - GetInstance()->GetServiceForBrowserContext(context, /*create=*/true)); + return nullptr; } AutofillFieldClassificationModelServiceFactory:: @@ -58,16 +57,7 @@ AutofillFieldClassificationModelServiceFactory::GetBrowserContextToUse( std::unique_ptr AutofillFieldClassificationModelServiceFactory:: BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { - OptimizationGuideKeyedService* optimization_guide = - OptimizationGuideKeyedServiceFactory::GetForProfile( - Profile::FromBrowserContext(context)); - MlLogRouter* log_router = MlLogRouterFactory::GetForProfile( - Profile::FromBrowserContext(context)); - return std::make_unique( - optimization_guide, - optimization_guide::proto::OptimizationTarget:: - OPTIMIZATION_TARGET_AUTOFILL_FIELD_CLASSIFICATION, - log_router); + return nullptr; } } // namespace autofill diff --git a/chrome/browser/download/background_download_service_factory.cc b/chrome/browser/download/background_download_service_factory.cc --- a/chrome/browser/download/background_download_service_factory.cc +++ b/chrome/browser/download/background_download_service_factory.cc @@ -179,7 +179,7 @@ BackgroundDownloadServiceFactory::BuildServiceInstanceFor( } #endif // BUILDFLAG(IS_CHROMEOS) - if (!key->IsOffTheRecord()) { + if (((false)) && !key->IsOffTheRecord()) { clients->insert(std::make_pair( download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS, std::make_unique( diff --git a/chrome/browser/history_embeddings/history_embeddings_utils.cc b/chrome/browser/history_embeddings/history_embeddings_utils.cc --- a/chrome/browser/history_embeddings/history_embeddings_utils.cc +++ b/chrome/browser/history_embeddings/history_embeddings_utils.cc @@ -58,6 +58,7 @@ constexpr auto kEnabledByDefaultForDesktopOnly = // These are the kill switches for the launched history embeddings features. BASE_FEATURE(kLaunchedHistoryEmbeddings, kEnabledByDefaultForDesktopOnly); +SET_CROMITE_FEATURE_DISABLED(kLaunchedHistoryEmbeddings); bool IsHistoryEmbeddingsEnabledForProfile(Profile* profile) { if (!IsHistoryEmbeddingsFeatureEnabled()) { @@ -77,6 +78,7 @@ bool IsHistoryEmbeddingsAnswersEnabledForProfile(Profile* profile) { return false; } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (optimization_guide:: GetGenAILocalFoundationalModelEnterprisePolicySettings( g_browser_process->local_state()) == @@ -91,6 +93,9 @@ bool IsHistoryEmbeddingsAnswersEnabledForProfile(Profile* profile) { optimization_guide_keyed_service ->ShouldFeatureAllowModelExecutionForSignedInUser( optimization_guide::UserVisibleFeatureKey::kHistorySearch); +#else + return false; +#endif } bool IsHistoryEmbeddingsSettingVisible(Profile* profile) { diff --git a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc --- a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc +++ b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc @@ -32,6 +32,7 @@ PreloadingModelKeyedService::Inputs::operator=(const Inputs& other) = default; PreloadingModelKeyedService::PreloadingModelKeyedService( OptimizationGuideKeyedService* optimization_guide_keyed_service) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ auto* model_provider = static_cast( optimization_guide_keyed_service); @@ -40,6 +41,7 @@ PreloadingModelKeyedService::PreloadingModelKeyedService( preloading_model_handler_ = std::make_unique(model_provider); } +#endif } PreloadingModelKeyedService::~PreloadingModelKeyedService() = default; diff --git a/chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.cc b/chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.cc --- a/chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.cc +++ b/chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.cc @@ -42,7 +42,5 @@ std::unique_ptr blink::features::kPreloadingHeuristicsMLModel)) { return nullptr; } - auto* profile = Profile::FromBrowserContext(context); - return std::make_unique( - OptimizationGuideKeyedServiceFactory::GetForProfile(profile)); + return nullptr; } diff --git a/chrome/browser/optimization_guide/BUILD.gn b/chrome/browser/optimization_guide/BUILD.gn --- a/chrome/browser/optimization_guide/BUILD.gn +++ b/chrome/browser/optimization_guide/BUILD.gn @@ -56,7 +56,7 @@ source_set("impl") { sources = [ "chrome_browser_main_extra_parts_optimization_guide.cc", "chrome_hints_manager.cc", - "chrome_model_quality_logs_uploader_service.cc", + # "chrome_model_quality_logs_uploader_service.cc", "model_execution/optimization_guide_global_state.cc", "model_validator_keyed_service.cc", "model_validator_keyed_service_factory.cc", @@ -109,7 +109,7 @@ source_set("impl") { source_set("optimization_guide_on_device_model_installer") { sources = [ - "../component_updater/optimization_guide_on_device_model_installer.cc", + # "../component_updater/optimization_guide_on_device_model_installer.cc", "../component_updater/optimization_guide_on_device_model_installer.h", ] diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/browser/optimization_guide/chrome_hints_manager.cc --- a/chrome/browser/optimization_guide/chrome_hints_manager.cc +++ b/chrome/browser/optimization_guide/chrome_hints_manager.cc @@ -25,6 +25,7 @@ namespace { // Returns true if we can make a request for hints for |prediction|. bool IsAllowedToFetchForNavigationPrediction( const NavigationPredictorKeyedService::Prediction& prediction) { + if ((true)) return false; if (prediction.prediction_source() != NavigationPredictorKeyedService::PredictionSource:: kAnchorElementsParsedFromWebPage) { diff --git a/chrome/browser/optimization_guide/model_execution/optimization_guide_global_state.cc b/chrome/browser/optimization_guide/model_execution/optimization_guide_global_state.cc --- a/chrome/browser/optimization_guide/model_execution/optimization_guide_global_state.cc +++ b/chrome/browser/optimization_guide/model_execution/optimization_guide_global_state.cc @@ -170,7 +170,7 @@ OptimizationGuideGlobalState::OptimizationGuideGlobalState( #else OptimizationGuideGlobalState::OptimizationGuideGlobalState() : on_device_capability_( -#if BUILDFLAG(IS_ANDROID) +#if false && BUILDFLAG(IS_ANDROID) *g_browser_process->local_state(), prediction_manager_.prediction_manager() #endif // BUILDFLAG(IS_ANDROID) diff --git a/chrome/browser/optimization_guide/model_execution/optimization_guide_global_state.h b/chrome/browser/optimization_guide/model_execution/optimization_guide_global_state.h --- a/chrome/browser/optimization_guide/model_execution/optimization_guide_global_state.h +++ b/chrome/browser/optimization_guide/model_execution/optimization_guide_global_state.h @@ -98,8 +98,8 @@ class OptimizationGuideGlobalState final ModelBrokerState on_device_capability_; std::unique_ptr component_state_manager_observer_; -#elif BUILDFLAG(IS_ANDROID) - ModelBrokerAndroid on_device_capability_; +// #elif BUILDFLAG(IS_ANDROID) +// ModelBrokerAndroid on_device_capability_; #else OnDeviceCapability on_device_capability_; #endif // BUILDFLAG(USE_ON_DEVICE_MODEL_SERVICE) diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc b/chrome/browser/optimization_guide/model_validator_keyed_service.cc --- a/chrome/browser/optimization_guide/model_validator_keyed_service.cc +++ b/chrome/browser/optimization_guide/model_validator_keyed_service.cc @@ -32,6 +32,7 @@ namespace { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ std::unique_ptr ParseRequestFromFile(base::FilePath path) { std::string serialized_request; @@ -45,6 +46,7 @@ ParseRequestFromFile(base::FilePath path) { } return request; } +#endif void WriteResponseToFile( base::FilePath path, @@ -64,6 +66,7 @@ namespace optimization_guide { ModelValidatorKeyedService::ModelValidatorKeyedService(Profile* profile) : profile_(profile) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ DCHECK(ShouldStartModelValidator()); auto* opt_guide_service = OptimizationGuideKeyedServiceFactory::GetForProfile(profile); @@ -103,6 +106,7 @@ ModelValidatorKeyedService::ModelValidatorKeyedService(Profile* profile) &ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation, weak_ptr_factory_.GetWeakPtr())); } +#endif } ModelValidatorKeyedService::~ModelValidatorKeyedService() = default; @@ -129,6 +133,7 @@ void ModelValidatorKeyedService::OnPrimaryAccountChanged( void ModelValidatorKeyedService::StartModelExecutionValidation() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ auto* opt_guide_service = OptimizationGuideKeyedServiceFactory::GetForProfile(profile_); if (!opt_guide_service) { @@ -147,6 +152,7 @@ void ModelValidatorKeyedService::StartModelExecutionValidation() { /*options=*/{}, base::BindOnce(&ModelValidatorKeyedService::OnModelExecuteResponse, weak_ptr_factory_.GetWeakPtr())); +#endif } void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation( @@ -164,6 +170,7 @@ void ModelValidatorKeyedService::StartOnDeviceModelExecutionValidation( void ModelValidatorKeyedService::PerformOnDeviceModelExecutionValidation( std::unique_ptr input) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); auto* opt_guide_service = OptimizationGuideKeyedServiceFactory::GetForProfile(profile_); @@ -211,6 +218,7 @@ void ModelValidatorKeyedService::ExecuteModel( *metadata, base::BindRepeating( &ModelValidatorKeyedService::OnDeviceModelExecuteResponse, weak_ptr_factory_.GetWeakPtr(), std::move(request))); +#endif } void ModelValidatorKeyedService::OnDeviceModelExecuteResponse( diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc @@ -173,7 +173,7 @@ class FetcherDelegate : public ModelExecutionManager::Delegate { }; #endif -ModelExecutionFeaturesController::SettingsVisibilityResult +[[maybe_unused]] ModelExecutionFeaturesController::SettingsVisibilityResult ShouldHideHistorySearch(PrefService* local_state) { using SettingsVisibilityResult = ModelExecutionFeaturesController::SettingsVisibilityResult; @@ -253,11 +253,7 @@ void OptimizationGuideKeyedService::BindModelBroker( std::unique_ptr OptimizationGuideKeyedService::CreateModelBrokerClient() { - mojo::PendingRemote remote; - GetGlobalState().on_device_capability().BindModelBroker( - remote.InitWithNewPipeAndPassReceiver()); - return std::make_unique( - std::move(remote), optimization_guide_logger_->GetWeakPtr()); + return nullptr; } #if BUILDFLAG(IS_ANDROID) @@ -367,32 +363,11 @@ void OptimizationGuideKeyedService::InitializeModelExecution(Profile* profile) { ->GetURLLoaderFactoryForBrowserProcess(); if (!profile->IsOffTheRecord() && !profile->IsGuestSession()) { - auto* variations_service = g_browser_process->variations_service(); - auto dogfood_status = - variations_service && variations_service->IsLikelyDogfoodClient() - ? ModelExecutionFeaturesController::DogfoodStatus::DOGFOOD - : ModelExecutionFeaturesController::DogfoodStatus::NON_DOGFOOD; - bool is_official_build = g_is_official_build_for_testing.value_or( - version_info::IsOfficialBuild()); - model_execution_features_controller_ = - std::make_unique( - profile->GetPrefs(), IdentityManagerFactory::GetForProfile(profile), - policy::ManagementServiceFactory::GetForProfile(profile), - dogfood_status, is_official_build, - base::BindRepeating(&ShouldHideHistorySearch, - g_browser_process->local_state())); - // Don't create logs uploader service when feature is disabled. All the // logs upload get route through this service which exists one per // profile. if (base::FeatureList::IsEnabled( optimization_guide::features::kModelQualityLogging)) { - model_quality_logs_uploader_service_ = std::make_unique< - optimization_guide::ChromeModelQualityLogsUploaderService>( - url_loader_factory, g_browser_process->local_state(), - model_execution_features_controller_ - ? model_execution_features_controller_->GetWeakPtr() - : nullptr); } RecordModelExecutionFeatureSyntheticFieldTrial( optimization_guide::UserVisibleFeatureKey::kHistorySearch, @@ -406,13 +381,6 @@ void OptimizationGuideKeyedService::InitializeModelExecution(Profile* profile) { delegate = std::make_unique(browser_context_); } #endif - - model_execution_manager_ = std::make_unique( - url_loader_factory, IdentityManagerFactory::GetForProfile(profile), - std::move(delegate), optimization_guide_logger_.get(), - model_quality_logs_uploader_service_ - ? model_quality_logs_uploader_service_->GetWeakPtr() - : nullptr); } optimization_guide::ChromeHintsManager* @@ -464,7 +432,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel( void OptimizationGuideKeyedService::RegisterOptimizationTypes( const std::vector& optimization_types) { - hints_manager_->RegisterOptimizationTypes(optimization_types); } optimization_guide::OptimizationGuideDecision @@ -529,7 +496,6 @@ void OptimizationGuideKeyedService::ExecuteModel( optimization_guide::OptimizationGuideModelExecutionResultCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!model_execution_manager_) { std::move(callback).Run( optimization_guide::OptimizationGuideModelExecutionResult( base::unexpected( @@ -540,12 +506,6 @@ void OptimizationGuideKeyedService::ExecuteModel( ModelExecutionError::kGenericFailure)), nullptr), nullptr); - return; - } - model_execution_manager_->ExecuteModel( - feature, request_metadata, options.execution_timeout, - /*log_ai_data_request=*/nullptr, options.service_type, - std::move(callback)); } void OptimizationGuideKeyedService::AddOnDeviceModelAvailabilityChangeObserver( @@ -597,8 +557,6 @@ void OptimizationGuideKeyedService::AddOnDemandHintForTesting( void OptimizationGuideKeyedService::AddExecutionResultForTesting( optimization_guide::ModelBasedCapabilityKey feature, optimization_guide::OptimizationGuideModelExecutionResult result) { - model_execution_manager_->AddExecutionResultForTesting(feature, // IN-TEST - std::move(result)); } void OptimizationGuideKeyedService::ClearData() { @@ -607,9 +565,6 @@ void OptimizationGuideKeyedService::ClearData() { void OptimizationGuideKeyedService::Shutdown() { hints_manager_->Shutdown(); - if (model_execution_manager_) { - model_execution_manager_->Shutdown(); - } } void OptimizationGuideKeyedService::OverrideTargetModelForTesting( @@ -623,7 +578,6 @@ void OptimizationGuideKeyedService:: SetModelQualityLogsUploaderServiceForTesting( std::unique_ptr uploader) { - model_quality_logs_uploader_service_ = std::move(uploader); } optimization_guide::ModelExecutionFeaturesController* @@ -633,8 +587,6 @@ OptimizationGuideKeyedService::GetModelExecutionFeaturesController() { void OptimizationGuideKeyedService::AllowUnsignedUserForTesting( optimization_guide::UserVisibleFeatureKey feature) { - model_execution_features_controller_->AllowUnsignedUserForTesting( - feature); // IN-TEST } bool OptimizationGuideKeyedService::ShouldFeatureBeCurrentlyEnabledForUser( @@ -643,8 +595,7 @@ bool OptimizationGuideKeyedService::ShouldFeatureBeCurrentlyEnabledForUser( if (!model_execution_features_controller_) { return false; } - return model_execution_features_controller_ - ->ShouldFeatureBeCurrentlyEnabledForUser(feature); + return false; } bool OptimizationGuideKeyedService:: @@ -653,84 +604,33 @@ bool OptimizationGuideKeyedService:: if (!model_execution_features_controller_) { return false; } - return model_execution_features_controller_ - ->ShouldFeatureAllowModelExecutionForSignedInUser(feature); + return false; } bool OptimizationGuideKeyedService::ShouldFeatureBeCurrentlyAllowedForFeedback( optimization_guide::proto::LogAiDataRequest::FeatureCase feature) const { - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - - // If logging is enabled, feedback is always also enabled. - const optimization_guide::MqlsFeatureMetadata* metadata = - optimization_guide::MqlsFeatureRegistry::GetInstance().GetFeature( - feature); - DCHECK(metadata); - if (model_execution_features_controller_ && - model_execution_features_controller_ - ->ShouldFeatureBeCurrentlyAllowedForLogging(metadata)) { - return true; - } - - // Otherwise, feedback is disabled, with one exception: On dogfood clients, - // feedback is always enabled (as long as the feature is enabled). - auto* variations_service = g_browser_process->variations_service(); - return !!variations_service && variations_service->IsLikelyDogfoodClient(); + return false; } bool OptimizationGuideKeyedService::ShouldModelExecutionBeAllowedForUser() const { - return model_execution_features_controller_ && - model_execution_features_controller_ - ->ShouldModelExecutionBeAllowedForUser(); + return false; } bool OptimizationGuideKeyedService::IsSettingVisible( optimization_guide::UserVisibleFeatureKey feature) const { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!model_execution_features_controller_) { - return false; - } - -#if !BUILDFLAG(IS_ANDROID) - if (base::FeatureList::IsEnabled( - optimization_guide::features::kAiSettingsPageForceAvailable)) { - return true; - } -#endif - - using SettingsVisibilityResult = - ModelExecutionFeaturesController::SettingsVisibilityResult; - const SettingsVisibilityResult visibility = - model_execution_features_controller_->GetSettingsVisibility(feature); - - base::UmaHistogramEnumeration( - base::StrCat( - {"OptimizationGuide.ModelExecution.SettingsVisibilityResult.", - GetStringNameForModelExecutionFeature(feature)}), - visibility); - - return visibility == - SettingsVisibilityResult::kVisibleFeatureAlreadyEnabled || - visibility == SettingsVisibilityResult::kVisibleFieldTrialEnabled; + return true; } void OptimizationGuideKeyedService::AddModelExecutionSettingsEnabledObserver( optimization_guide::SettingsEnabledObserver* observer) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!model_execution_features_controller_) { - return; - } - model_execution_features_controller_->AddObserver(observer); } void OptimizationGuideKeyedService::RemoveModelExecutionSettingsEnabledObserver( optimization_guide::SettingsEnabledObserver* observer) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - if (!model_execution_features_controller_) { - return; - } - model_execution_features_controller_->RemoveObserver(observer); } void OptimizationGuideKeyedService:: diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.h b/chrome/browser/optimization_guide/optimization_guide_keyed_service.h --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.h +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.h @@ -264,7 +264,7 @@ class OptimizationGuideKeyedService optimization_guide::ModelQualityLogsUploaderService* GetModelQualityLogsUploaderService() { - return model_quality_logs_uploader_service_.get(); + return nullptr; // model_quality_logs_uploader_service_.get(); } virtual optimization_guide::ModelExecutionFeaturesController* @@ -321,7 +321,7 @@ class OptimizationGuideKeyedService } optimization_guide::ModelExecutionManager* GetModelExecutionManager() { - return model_execution_manager_.get(); + return nullptr; //model_execution_manager_.get(); } // Notifies |hints_manager_| that the navigation associated with @@ -390,17 +390,21 @@ class OptimizationGuideKeyedService // Manages the storing, loading, and fetching of hints. std::unique_ptr hints_manager_; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // Manages the model execution. Not created for off the record profiles. std::unique_ptr model_execution_manager_; +#endif std::unique_ptr model_execution_features_controller_; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // Manages the model quality logs uploader service. Not created for off the // record profiles. std::unique_ptr model_quality_logs_uploader_service_; +#endif #if BUILDFLAG(IS_ANDROID) // Manage and fetch the java object that wraps this OptimizationGuide on diff --git a/chrome/browser/optimization_guide/private_ai_model_execution_fetcher.cc b/chrome/browser/optimization_guide/private_ai_model_execution_fetcher.cc --- a/chrome/browser/optimization_guide/private_ai_model_execution_fetcher.cc +++ b/chrome/browser/optimization_guide/private_ai_model_execution_fetcher.cc @@ -25,6 +25,7 @@ namespace { using ModelExecutionError = OptimizationGuideModelExecutionError::ModelExecutionError; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ private_ai::proto::FeatureName ToPrivateAiFeatureName( ModelBasedCapabilityKey feature) { switch (feature) { @@ -54,6 +55,7 @@ OptimizationGuideModelExecutionError ToModelExecutionError( ModelExecutionError::kUnknown); } } +#endif } // namespace @@ -71,48 +73,9 @@ void PrivateAiModelExecutionFetcher::ExecuteModel( const google::protobuf::MessageLite& request_metadata, std::optional timeout, ModelExecuteResponseCallback callback) { - auto private_ai_feature_name = ToPrivateAiFeatureName(feature); - - private_ai::proto::PaicMessage paic_message; - paic_message.set_feature_name(private_ai_feature_name); - *paic_message.mutable_execute_request_ext() = - ToExecuteRequest(feature, request_metadata); - - private_ai::Client::RequestOptions options; - if (timeout) { - options.timeout = *timeout; - } - - private_ai_client_->SendPaicRequest( - private_ai_feature_name, paic_message, - base::BindOnce( - [](ModelBasedCapabilityKey feature, - ModelExecuteResponseCallback callback, - base::expected result) { - if (!result.has_value()) { - RecordRequestStatusHistogram( - feature, FetcherRequestStatus::kResponseError); - std::move(callback).Run( - base::unexpected(ToModelExecutionError(result.error()))); - return; - } - - if (!result->has_execute_response_ext()) { - RecordRequestStatusHistogram( - feature, FetcherRequestStatus::kResponseError); - std::move(callback).Run(base::unexpected( - OptimizationGuideModelExecutionError::FromModelExecutionError( - ModelExecutionError::kUnknown))); - return; - } - - RecordRequestStatusHistogram(feature, - FetcherRequestStatus::kSuccess); - std::move(callback).Run(base::ok(result->execute_response_ext())); - }, - feature, std::move(callback)), - options); + std::move(callback).Run(base::unexpected( + OptimizationGuideModelExecutionError::FromModelExecutionError( + ModelExecutionError::kGenericFailure))); } } // namespace optimization_guide diff --git a/chrome/browser/password_manager/password_change_delegate_impl.cc b/chrome/browser/password_manager/password_change_delegate_impl.cc --- a/chrome/browser/password_manager/password_change_delegate_impl.cc +++ b/chrome/browser/password_manager/password_change_delegate_impl.cc @@ -342,12 +342,14 @@ void PasswordChangeDelegateImpl::StartPasswordChangeFlow() { // a local ML model for field classification. // TODO(452883239): Clean this up when model is downloaded on start-up for // everybody. +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (base::FeatureList::IsEnabled( password_manager::features:: kProactivelyDownloadModelForPasswordChange)) { PasswordFieldClassificationModelHandlerFactory::GetForBrowserContext( originator_->GetBrowserContext()); } +#endif } void PasswordChangeDelegateImpl::OnLoginStateCheckResult( diff --git a/chrome/browser/password_manager/password_field_classification_model_handler_factory.cc b/chrome/browser/password_manager/password_field_classification_model_handler_factory.cc --- a/chrome/browser/password_manager/password_field_classification_model_handler_factory.cc +++ b/chrome/browser/password_manager/password_field_classification_model_handler_factory.cc @@ -99,14 +99,5 @@ PasswordFieldClassificationModelHandlerFactory::GetBrowserContextToUse( std::unique_ptr PasswordFieldClassificationModelHandlerFactory:: BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { - Profile* profile = Profile::FromBrowserContext(context); - OptimizationGuideKeyedService* optimization_guide = - OptimizationGuideKeyedServiceFactory::GetForProfile(profile); - autofill::MlLogRouter* log_router = - autofill::MlLogRouterFactory::GetForProfile(profile); - return std::make_unique( - optimization_guide, - optimization_guide::proto::OptimizationTarget:: - OPTIMIZATION_TARGET_PASSWORD_MANAGER_FORM_CLASSIFICATION, - log_router); + return nullptr; } diff --git a/chrome/browser/permissions/BUILD.gn b/chrome/browser/permissions/BUILD.gn --- a/chrome/browser/permissions/BUILD.gn +++ b/chrome/browser/permissions/BUILD.gn @@ -43,12 +43,10 @@ source_set("permissions") { "prediction_service/language_detection_observer.h", "prediction_service/passage_embedder_delegate.cc", "prediction_service/passage_embedder_delegate.h", - "prediction_service/permissions_ai_ui_selector.cc", - "prediction_service/permissions_ai_ui_selector.h", "prediction_service/prediction_model_handler_provider.cc", "prediction_service/prediction_model_handler_provider.h", - "prediction_service/prediction_model_handler_provider_factory.cc", - "prediction_service/prediction_model_handler_provider_factory.h", + # "prediction_service/prediction_model_handler_provider_factory.cc", + # "prediction_service/prediction_model_handler_provider_factory.h", "prediction_service/prediction_service_factory.cc", "prediction_service/prediction_service_factory.h", "prediction_service/prediction_service_request.cc", @@ -86,7 +84,7 @@ source_set("permissions") { "//chrome/browser/metrics", "//chrome/browser/nfc", "//chrome/browser/optimization_guide", - "//chrome/browser/passage_embeddings", + # "//chrome/browser/passage_embeddings", "//chrome/browser/profiles", "//chrome/browser/profiles:profile", "//chrome/browser/resource_coordinator", @@ -116,7 +114,7 @@ source_set("permissions") { "//components/language_detection/core", "//components/optimization_guide/core", "//components/optimization_guide/proto:optimization_guide_proto", - "//components/passage_embeddings/core", + # "//components/passage_embeddings/core", "//components/permissions", "//components/permissions/prediction_service", "//components/pref_registry", @@ -125,7 +123,7 @@ source_set("permissions") { "//components/safe_browsing/core/browser/db:database_manager", "//components/safe_browsing/core/common", "//components/safe_browsing/core/common:safe_browsing_prefs", - "//components/segmentation_platform/internal:optimization_guide_segmentation_handler", + # "//components/segmentation_platform/internal:optimization_guide_segmentation_handler", "//components/site_engagement/content", "//components/subresource_filter/content/browser", "//components/supervised_user/core/common:features", @@ -188,12 +186,12 @@ source_set("permissions") { } } - if (!is_android) { - deps += [ - "//chrome/browser/ui/permission_bubble", - "//third_party/tflite_support", - ] - } + # if (!is_android) { + # deps += [ + # "//chrome/browser/ui/permission_bubble", + # "//third_party/tflite_support", + # ] + # } if (safe_browsing_mode != 0) { sources += [ diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc --- a/chrome/browser/permissions/chrome_permissions_client.cc +++ b/chrome/browser/permissions/chrome_permissions_client.cc @@ -475,8 +475,6 @@ ChromePermissionsClient::CreatePermissionUiSelectors( #endif selectors.emplace_back(std::make_unique( Profile::FromBrowserContext(browser_context))); - selectors.emplace_back(std::make_unique( - Profile::FromBrowserContext(browser_context))); return selectors; } diff --git a/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc b/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc --- a/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc +++ b/chrome/browser/permissions/prediction_service/passage_embedder_delegate.cc @@ -26,6 +26,7 @@ PassageEmbedderDelegate::PassageEmbedderDelegate(Profile* profile) : profile_(profile) {} Embedder* PassageEmbedderDelegate::GetPassageEmbedder() { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (auto* prediction_model_handler_provider = PredictionModelHandlerProviderFactory::GetForBrowserContext( profile_)) { @@ -39,6 +40,7 @@ Embedder* PassageEmbedderDelegate::GetPassageEmbedder() { return prediction_model_handler_provider->GetPassageEmbedder(); } PermissionUmaUtil::RecordPassageEmbedderMetadataValid(false); +#endif return nullptr; } diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc --- a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc +++ b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.cc @@ -383,6 +383,7 @@ void PermissionsAiUiSelector::SelectUiToUse( } } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void PermissionsAiUiSelector::OnGetInnerTextForOnDeviceModel( ModelExecutionData model_data, ModelExecutionCallback model_execution_callback, @@ -437,6 +438,7 @@ void PermissionsAiUiSelector::OnGetInnerTextForOnDeviceModel( InquireServerModel(model_data.features, std::move(model_data.request_metadata)); } +#endif void PermissionsAiUiSelector::OnTimeout() { VLOG(1) << "[CPSS] Overall timeout for prediction reached."; @@ -647,6 +649,7 @@ bool PermissionsAiUiSelector::ShouldHoldBack( PredictionSource PermissionsAiUiSelector::GetPredictionTypeToUse( permissions::RequestType request_type) { + if ((true)) return PredictionSource::kNoCpssModel; const bool is_msbb_enabled = profile_->GetPrefs()->GetBoolean( unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled); @@ -715,6 +718,7 @@ PredictionSource PermissionsAiUiSelector::GetPredictionTypeToUse( return PredictionSource::kNoCpssModel; } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void PermissionsAiUiSelector::set_language_detection_observer_for_testing( std::unique_ptr language_detection_observer) { @@ -727,6 +731,7 @@ void PermissionsAiUiSelector::set_inner_text_for_testing( CHECK_IS_TEST(); inner_text_for_testing_ = std::move(inner_text_); } +#endif void PermissionsAiUiSelector::set_snapshot_for_testing(SkBitmap snapshot) { CHECK_IS_TEST(); diff --git a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.h b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.h --- a/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.h +++ b/chrome/browser/permissions/prediction_service/permissions_ai_ui_selector.h @@ -111,13 +111,14 @@ class PermissionsAiUiSelector : public permissions::PermissionUiSelector { void set_snapshot_for_testing(SkBitmap snapshot); +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void set_inner_text_for_testing( content_extraction::InnerTextResult inner_text); void set_language_detection_observer_for_testing( std::unique_ptr language_detection_observer); - +#endif void set_callback_for_testing(DecisionMadeCallback callback) { callback_ = std::move(callback); } @@ -168,10 +169,12 @@ class PermissionsAiUiSelector : public permissions::PermissionUiSelector { // later. When the text is fetched asynchronously with success, // model_execution_callback will get called to continue the chain of // asynchronously added input data. +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void OnGetInnerTextForOnDeviceModel( ModelExecutionData model_data, ModelExecutionCallback model_execution_callback, std::unique_ptr result); +#endif bool ShouldHoldBack(const PredictionRequestMetadata& request_metadata) const; diff --git a/chrome/browser/permissions/prediction_service/prediction_model_handler_provider.cc b/chrome/browser/permissions/prediction_service/prediction_model_handler_provider.cc --- a/chrome/browser/permissions/prediction_service/prediction_model_handler_provider.cc +++ b/chrome/browser/permissions/prediction_service/prediction_model_handler_provider.cc @@ -26,6 +26,7 @@ using optimization_guide::proto::OptimizationTarget; namespace { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ inline OptimizationTarget getGeolocationAiv4OptTarget() { #if BUILDFLAG(IS_ANDROID) return OptimizationTarget:: @@ -44,6 +45,7 @@ inline OptimizationTarget getNotificationsAiv4OptTarget() { OPTIMIZATION_TARGET_PERMISSIONS_AIV4_NOTIFICATIONS_DESKTOP; #endif } +#endif } // namespace @@ -51,7 +53,10 @@ PredictionModelHandlerProvider::PredictionModelHandlerProvider( optimization_guide::OptimizationGuideModelProvider* optimization_guide, passage_embeddings::EmbedderMetadataProvider* embedder_metadata_provider, passage_embeddings::Embedder* passage_embedder) - : passage_embedder_(passage_embedder) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ + : passage_embedder_(passage_embedder) +#endif + { VLOG(1) << "[PermissionsAI] PredictionModelHandlerProvider ctor " "passage_embedder available: " << (passage_embedder ? "true" : "false"); @@ -76,6 +81,7 @@ PredictionModelHandlerProvider::PredictionModelHandlerProvider( // This feature is enabled by default; we add the check here to fix internally // failing tests. +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (base::FeatureList::IsEnabled( permissions::features::kPermissionOnDeviceNotificationPredictions)) { notification_prediction_model_handler_ = @@ -84,9 +90,11 @@ PredictionModelHandlerProvider::PredictionModelHandlerProvider( OptimizationTarget:: OPTIMIZATION_TARGET_NOTIFICATION_PERMISSION_PREDICTIONS); } +#endif // This feature is enabled by default; we add the check here to fix internally // failing tests. +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (base::FeatureList::IsEnabled( permissions::features::kPermissionOnDeviceGeolocationPredictions)) { geolocation_prediction_model_handler_ = @@ -95,7 +103,9 @@ PredictionModelHandlerProvider::PredictionModelHandlerProvider( OptimizationTarget:: OPTIMIZATION_TARGET_GEOLOCATION_PERMISSION_PREDICTIONS); } +#endif +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (IsAIv4FeatureEnabled()) { VLOG(1) << "[PermissionsAI] PredictionModelHandlerProvider init AIv4"; #if BUILDFLAG(IS_ANDROID) @@ -116,6 +126,7 @@ PredictionModelHandlerProvider::PredictionModelHandlerProvider( RequestType::kGeolocation, scheduling_params); return; } +#endif } PredictionModelHandlerProvider::~PredictionModelHandlerProvider() = default; @@ -129,12 +140,14 @@ void PredictionModelHandlerProvider::Shutdown() { // LINT.ThenChange(//chrome/browser/permissions/prediction_service/prediction_model_handler_provider.h:ModelHandlers) } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void PredictionModelHandlerProvider::EmbedderMetadataUpdated( passage_embeddings::EmbedderMetadata metadata) { is_passage_embedder_ready_ = metadata.IsValid(); VLOG(1) << "[PermissionsAI] Passage embedder readiness updated to: " << is_passage_embedder_ready_; } +#endif bool PredictionModelHandlerProvider::IsPassageEmbedderReady() const { return is_passage_embedder_ready_; diff --git a/chrome/browser/permissions/prediction_service/prediction_model_handler_provider.h b/chrome/browser/permissions/prediction_service/prediction_model_handler_provider.h --- a/chrome/browser/permissions/prediction_service/prediction_model_handler_provider.h +++ b/chrome/browser/permissions/prediction_service/prediction_model_handler_provider.h @@ -54,9 +54,11 @@ class PredictionModelHandlerProvider passage_embeddings::Embedder* passage_embedder_); private: +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // EmbedderMetadataObserver: void EmbedderMetadataUpdated( passage_embeddings::EmbedderMetadata metadata) override; +#endif // LINT.IfChange(ModelHandlers) std::unique_ptr diff --git a/chrome/browser/permissions/quiet_notification_permission_ui_state.cc b/chrome/browser/permissions/quiet_notification_permission_ui_state.cc --- a/chrome/browser/permissions/quiet_notification_permission_ui_state.cc +++ b/chrome/browser/permissions/quiet_notification_permission_ui_state.cc @@ -24,9 +24,9 @@ void QuietNotificationPermissionUiState::RegisterProfilePrefs( registry->RegisterTimePref(prefs::kQuietNotificationPermissionUiDisabledTime, base::Time()); registry->RegisterBooleanPref(prefs::kEnableNotificationCPSS, - /*default_value=*/true); + /*default_value=*/false); registry->RegisterBooleanPref(prefs::kEnableGeolocationCPSS, - /*default_value=*/true); + /*default_value=*/false); registry->RegisterBooleanPref( prefs::kDidMigrateAdaptiveNotifiationQuietingToCPSS, /*default_value=*/false); diff --git a/chrome/browser/predictors/autocomplete_action_predictor.cc b/chrome/browser/predictors/autocomplete_action_predictor.cc --- a/chrome/browser/predictors/autocomplete_action_predictor.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor.cc @@ -211,6 +211,8 @@ void AutocompleteActionPredictor::StartPrerendering( SetIsNavigationInDomainCallback(preloading_data); + if ((true)) return; // was kOmniboxTriggerForPrerender2 + // Create new PreloadingAttempt and pass all the values corresponding to this // prerendering attempt for Prerender. content::PreloadingAttempt* preloading_attempt = diff --git a/chrome/browser/predictors/loading_predictor_config.cc b/chrome/browser/predictors/loading_predictor_config.cc --- a/chrome/browser/predictors/loading_predictor_config.cc +++ b/chrome/browser/predictors/loading_predictor_config.cc @@ -13,8 +13,8 @@ namespace predictors { bool IsLoadingPredictorEnabled(Profile* profile) { - // Disabled for off-the-record. Policy choice, not a technical limitation. - return profile && !profile->IsOffTheRecord(); + // Disabled for all profiles + return false; } bool IsPreconnectAllowed(Profile* profile) { diff --git a/chrome/browser/predictors/predictors_features.cc b/chrome/browser/predictors/predictors_features.cc --- a/chrome/browser/predictors/predictors_features.cc +++ b/chrome/browser/predictors/predictors_features.cc @@ -12,8 +12,7 @@ namespace features { namespace { constexpr base::FeatureState kFeatureEnabledOnlyOnAndroid = - BUILDFLAG(IS_ANDROID) ? base::FEATURE_ENABLED_BY_DEFAULT - : base::FEATURE_DISABLED_BY_DEFAULT; + base::FEATURE_DISABLED_BY_DEFAULT; } // namespace diff --git a/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc b/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc --- a/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc +++ b/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc @@ -258,3 +258,7 @@ bool ShouldSuppressPrefetchForUnsupportedMode(const AutocompleteMatch& match) { } return ShouldSuppressPrefetchForUnsupportedMode(match.destination_url); } + +SET_CROMITE_FEATURE_DISABLED(kSearchPrefetchServicePrefetching); +SET_CROMITE_FEATURE_DISABLED(kSearchPrefetchWithNoVarySearchDiskCache); +SET_CROMITE_FEATURE_DISABLED(kSearchNavigationPrefetch); diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc --- a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc +++ b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc @@ -84,6 +84,7 @@ SearchPrefetchURLLoader::RequestHandler SearchPrefetchURLLoaderInterceptor::MaybeCreateLoaderForRequest( const network::ResourceRequest& tentative_resource_request, content::FrameTreeNodeId frame_tree_node_id) { + if ((true)) return {}; // Do not intercept non-main frame navigations. if (!tentative_resource_request.is_outermost_main_frame) { // Use the is_outermost_main_frame flag instead of obtaining the 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 @@ -757,7 +757,7 @@ void ChromeBrowserMainExtraPartsProfiles:: autofill::AutofillOfferManagerFactory::GetInstance(); autofill::AutofillOptimizationGuideDeciderFactory::GetInstance(); autofill::MerchantPromoCodeManagerFactory::GetInstance(); - autofill::MlLogRouterFactory::GetInstance(); + // autofill::MlLogRouterFactory::GetInstance(); autofill::PersonalDataManagerFactory::GetInstance(); autofill::ValuablesDataManagerFactory::GetInstance(); autofill::WalletPassAccessManagerFactory::GetInstance(); @@ -1261,7 +1261,6 @@ void ChromeBrowserMainExtraPartsProfiles:: #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) policy::UserPolicyOidcSigninServiceFactory::GetInstance(); #endif - PredictionModelHandlerProviderFactory::GetInstance(); PredictionServiceFactory::GetInstance(); predictors::AutocompleteActionPredictorFactory::GetInstance(); predictors::LoadingPredictorFactory::GetInstance(); diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn --- a/chrome/browser/safe_browsing/BUILD.gn +++ b/chrome/browser/safe_browsing/BUILD.gn @@ -64,7 +64,6 @@ static_library("safe_browsing") { "//components/resources:components_resources_grit", "//components/safe_browsing:buildflags", "//components/safe_browsing/content/browser", - "//components/safe_browsing/content/browser/notification_content_detection", "//components/safe_browsing/content/browser/triggers:suspicious_site_trigger", "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core/browser", @@ -248,10 +247,10 @@ static_library("safe_browsing") { "user_interaction_observer.h", ] if (is_android) { - sources += [ - "android/client_side_detection_intelligent_scan_delegate_android.cc", - "android/client_side_detection_intelligent_scan_delegate_android.h", - ] + # sources += [ + # "android/client_side_detection_intelligent_scan_delegate_android.cc", + # "android/client_side_detection_intelligent_scan_delegate_android.h", + # ] } else { sources += [ "client_side_detection_intelligent_scan_delegate_desktop.cc", diff --git a/chrome/browser/safe_browsing/client_side_detection_intelligent_scan_delegate_factory.cc b/chrome/browser/safe_browsing/client_side_detection_intelligent_scan_delegate_factory.cc --- a/chrome/browser/safe_browsing/client_side_detection_intelligent_scan_delegate_factory.cc +++ b/chrome/browser/safe_browsing/client_side_detection_intelligent_scan_delegate_factory.cc @@ -57,8 +57,7 @@ ClientSideDetectionIntelligentScanDelegateFactory:: return nullptr; } #if BUILDFLAG(IS_ANDROID) - return std::make_unique( - *profile->GetPrefs(), opt_guide->CreateModelBrokerClient(), opt_guide); + return nullptr; #else return std::make_unique( *profile->GetPrefs(), opt_guide); diff --git a/chrome/browser/safe_browsing/notification_content_detection/notification_content_detection_service_factory.cc b/chrome/browser/safe_browsing/notification_content_detection/notification_content_detection_service_factory.cc --- a/chrome/browser/safe_browsing/notification_content_detection/notification_content_detection_service_factory.cc +++ b/chrome/browser/safe_browsing/notification_content_detection/notification_content_detection_service_factory.cc @@ -16,6 +16,7 @@ #include "components/safe_browsing/content/browser/notification_content_detection/notification_content_detection_service.h" #include "components/safe_browsing/core/browser/db/database_manager.h" #include "components/safe_browsing/core/common/features.h" +#include "components/optimization_guide/machine_learning_tflite_buildflags.h" #include "content/public/browser/browser_context.h" namespace safe_browsing { @@ -51,6 +52,7 @@ NotificationContentDetectionServiceFactory:: std::unique_ptr NotificationContentDetectionServiceFactory:: BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { + if ((true)) return nullptr; auto* opt_guide = OptimizationGuideKeyedServiceFactory::GetForProfile( Profile::FromBrowserContext(context)); if (!opt_guide) { @@ -82,6 +84,7 @@ NotificationContentDetectionServiceFactory:: content::BrowserContext* context) const { CHECK(opt_guide); CHECK(context); +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ auto database_manager = g_browser_process->safe_browsing_service()->database_manager(); scoped_refptr background_task_runner = @@ -89,6 +92,9 @@ NotificationContentDetectionServiceFactory:: {base::MayBlock(), base::TaskPriority::BEST_EFFORT}); return std::make_unique( opt_guide, background_task_runner, database_manager, context); +#else + return nullptr; +#endif } } // namespace safe_browsing diff --git a/chrome/browser/ui/android/preloading/java/src/org/chromium/chrome/browser/preloading/AndroidPrerenderManager.java b/chrome/browser/ui/android/preloading/java/src/org/chromium/chrome/browser/preloading/AndroidPrerenderManager.java --- a/chrome/browser/ui/android/preloading/java/src/org/chromium/chrome/browser/preloading/AndroidPrerenderManager.java +++ b/chrome/browser/ui/android/preloading/java/src/org/chromium/chrome/browser/preloading/AndroidPrerenderManager.java @@ -91,6 +91,7 @@ public class AndroidPrerenderManager { * @param prerenderUrl The url to be prerendered. */ public void startPrerendering(GURL prerenderUrl) { + if ((true)) return; if (mNativeAndroidPrerenderManager == 0 || mTab == null) return; AndroidPrerenderManagerJni.get() .startPrerendering(mNativeAndroidPrerenderManager, prerenderUrl, mTab); diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc --- a/chrome/browser/ui/autofill/chrome_autofill_client.cc +++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc @@ -580,7 +580,7 @@ void ChromeAutofillClient::GetAiPageContent(GetAiPageContentCallback callback) { } AutofillAiManager* ChromeAutofillClient::GetAutofillAiManager() { - return autofill_ai_manager_.get(); + return nullptr; } AutofillAiModelCache* ChromeAutofillClient::GetAutofillAiModelCache() { @@ -1417,18 +1417,7 @@ void ChromeAutofillClient::TriggerPlusAddressUserPerceptionSurvey( optimization_guide::ModelQualityLogsUploaderService* ChromeAutofillClient::GetMqlsUploadService() { -#if !BUILDFLAG(IS_ANDROID) - Profile* profile = - Profile::FromBrowserContext(web_contents()->GetBrowserContext()); - OptimizationGuideKeyedService* optimization_guide_keyed_service = - OptimizationGuideKeyedServiceFactory::GetForProfile(profile); - if (!optimization_guide_keyed_service) { - return nullptr; - } - return optimization_guide_keyed_service->GetModelQualityLogsUploaderService(); -#else return nullptr; -#endif } void ChromeAutofillClient::ShowEntityImportBubble( diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc @@ -486,7 +486,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { } MixedContentSettingsTabHelper::CreateForWebContents(web_contents); NavigationMetricsRecorder::CreateForWebContents(web_contents); - NavigationPredictorPreconnectClient::CreateForWebContents(web_contents); if (optimization_guide::features::IsOptimizationHintsEnabled()) { OptimizationGuideWebContentsObserver::CreateForWebContents(web_contents); } diff --git a/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_page_handler.cc b/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_page_handler.cc --- a/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_page_handler.cc +++ b/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_page_handler.cc @@ -12,9 +12,11 @@ AutofillMlInternalsPageHandlerImpl::AutofillMlInternalsPageHandlerImpl( mojo::PendingReceiver receiver, autofill::MlLogRouter* log_router) : receiver_(this, std::move(receiver)) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (log_router) { log_router_observation_.Observe(log_router); } +#endif } void AutofillMlInternalsPageHandlerImpl::SetPage( diff --git a/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_page_handler.h b/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_page_handler.h --- a/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_page_handler.h +++ b/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_page_handler.h @@ -8,6 +8,7 @@ #include "base/scoped_observation.h" #include "components/autofill/core/browser/ml_model/logging/autofill_ml_internals.mojom.h" #include "components/autofill/core/browser/ml_model/logging/ml_log_router.h" +#include "components/optimization_guide/machine_learning_tflite_buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" @@ -35,8 +36,10 @@ class AutofillMlInternalsPageHandlerImpl private: mojo::Receiver receiver_; mojo::Remote page_; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ base::ScopedObservation log_router_observation_{this}; +#endif }; #endif // CHROME_BROWSER_UI_WEBUI_AUTOFILL_ML_INTERNALS_AUTOFILL_ML_INTERNALS_PAGE_HANDLER_H_ diff --git a/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_ui.cc b/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_ui.cc --- a/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_ui.cc +++ b/chrome/browser/ui/webui/autofill_ml_internals/autofill_ml_internals_ui.cc @@ -11,6 +11,7 @@ #include "chrome/grit/autofill_ml_internals_resources.h" #include "chrome/grit/autofill_ml_internals_resources_map.h" #include "components/autofill/core/browser/ml_model/logging/autofill_ml_internals.mojom.h" +#include "components/optimization_guide/machine_learning_tflite_buildflags.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "ui/webui/webui_util.h" @@ -29,9 +30,11 @@ AutofillMlInternalsUI::AutofillMlInternalsUI(content::WebUI* web_ui) void AutofillMlInternalsUI::BindInterface( mojo::PendingReceiver receiver) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ page_handler_ = std::make_unique( std::move(receiver), autofill::MlLogRouterFactory::GetForProfile( Profile::FromWebUI(web_ui()))); +#endif } WEB_UI_CONTROLLER_TYPE_IMPL(AutofillMlInternalsUI) diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc @@ -479,8 +479,8 @@ NewTabPageHandler::NewTabPageHandler( content::WebContents* web_contents, const base::Time& ntp_navigation_start_time, const std::vector* module_id_details) - : SettingsEnabledObserver( - optimization_guide::UserVisibleFeatureKey::kWallpaperSearch), + : // SettingsEnabledObserver( + // optimization_guide::UserVisibleFeatureKey::kWallpaperSearch), ntp_custom_background_service_(ntp_custom_background_service), logo_service_(logo_service), theme_provider_(webui::GetThemeProviderDeprecated(web_contents)), @@ -519,6 +519,7 @@ NewTabPageHandler::NewTabPageHandler( ntp_custom_background_service_observation_.Observe( ntp_custom_background_service_.get()); promo_service_observation_.Observe(promo_service_.get()); +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (customize_chrome::IsWallpaperSearchEnabledForProfile(profile_)) { optimization_guide_keyed_service_ = OptimizationGuideKeyedServiceFactory::GetForProfile(profile_); @@ -527,6 +528,7 @@ NewTabPageHandler::NewTabPageHandler( ->AddModelExecutionSettingsEnabledObserver(this); } } +#endif if (microsoft_auth_service_) { microsoft_auth_service_->AddObserver(this); @@ -578,11 +580,13 @@ NewTabPageHandler::NewTabPageHandler( } NewTabPageHandler::~NewTabPageHandler() { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (optimization_guide_keyed_service_) { optimization_guide_keyed_service_ ->RemoveModelExecutionSettingsEnabledObserver(this); optimization_guide_keyed_service_ = nullptr; } +#endif if (microsoft_auth_service_) { microsoft_auth_service_->RemoveObserver(this); } @@ -1163,10 +1167,12 @@ void NewTabPageHandler::OnPromoServiceShuttingDown() { promo_service_ = nullptr; } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void NewTabPageHandler::OnChangeInFeatureCurrentlyEnabledState( bool is_now_enabled) { page_->SetWallpaperSearchButtonVisibility(is_now_enabled); } +#endif void NewTabPageHandler::OnAuthStateUpdated() { UpdateModulesLoadable(); diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.h b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.h --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.h +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.h @@ -82,7 +82,7 @@ class NewTabPageHandler public ThemeServiceObserver, public NtpCustomBackgroundServiceObserver, public PromoServiceObserver, - public optimization_guide::SettingsEnabledObserver, + // public optimization_guide::SettingsEnabledObserver, public MicrosoftAuthServiceObserver, public new_tab_footer::NewTabFooterControllerObserver { public: @@ -185,7 +185,9 @@ class NewTabPageHandler void OnPromoServiceShuttingDown() override; // SettingsEnabledObserver: +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void OnChangeInFeatureCurrentlyEnabledState(bool is_now_enabled) override; +#endif // MicrosoftAuthServiceObserver: void OnAuthStateUpdated() override; diff --git a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc --- a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc +++ b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc @@ -290,8 +290,5 @@ OmniboxPageHandler::GetAutocompleteControllerType( } AutocompleteScoringModelService* OmniboxPageHandler::GetMlService() { - return OmniboxFieldTrial::IsMlUrlScoringEnabled() - ? AutocompleteScoringModelServiceFactory::GetInstance() - ->GetForProfile(profile_) - : nullptr; + return nullptr; } diff --git a/chrome/browser/ui/webui/on_device_internals/BUILD.gn b/chrome/browser/ui/webui/on_device_internals/BUILD.gn --- a/chrome/browser/ui/webui/on_device_internals/BUILD.gn +++ b/chrome/browser/ui/webui/on_device_internals/BUILD.gn @@ -19,7 +19,7 @@ mojom("mojom") { source_set("on_device_internals") { public = [ "on_device_internals_ui.h" ] sources = [ - "on_device_internals_crx_component.cc", + # "on_device_internals_crx_component.cc", "on_device_internals_crx_component.h", "on_device_internals_page_handler.cc", "on_device_internals_page_handler.h", @@ -37,7 +37,7 @@ source_set("on_device_internals") { "//chrome/common", "//components/update_client", "//content/public/browser", - "//services/on_device_model/ml:ml_no_internal", + #"//services/on_device_model/ml:ml_no_internal", "//services/preferences/public/cpp", "//ui/base", "//ui/webui", diff --git a/chrome/browser/ui/webui/on_device_internals/on_device_internals_page_handler.h b/chrome/browser/ui/webui/on_device_internals/on_device_internals_page_handler.h --- a/chrome/browser/ui/webui/on_device_internals/on_device_internals_page_handler.h +++ b/chrome/browser/ui/webui/on_device_internals/on_device_internals_page_handler.h @@ -110,7 +110,9 @@ class PageHandler : public mojom::PageHandler, on_device_model::mojom::DevicePerformanceInfoPtr perf_info_; on_device_model::mojom::DeviceInfoPtr device_info_; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ OnDeviceInternalsCrxObserver download_observer_{*this}; +#endif #if BUILDFLAG(USE_CHROMEOS_MODEL_SERVICE) mojo::Remote platform_service_; diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc --- a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc +++ b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc @@ -17,7 +17,9 @@ #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/values.h" +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ #include "chrome/renderer/accessibility/phrase_segmentation/dependency_parser_model.h" +#endif #include "chrome/renderer/accessibility/phrase_segmentation/dependency_tree.h" #include "chrome/renderer/accessibility/phrase_segmentation/phrase_segmenter.h" #include "chrome/renderer/accessibility/phrase_segmentation/token_boundaries.h" @@ -27,6 +29,7 @@ namespace { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // Returns the dependency parser model for this renderer process. DependencyParserModel& GetDependencyParserModel_() { static base::NoDestructor instance; @@ -39,6 +42,7 @@ std::vector GetDependencyHeads(base::span input) { ? dependency_parser_model.GetDependencyHeads(input) : std::vector(); } +#endif } // namespace @@ -163,10 +167,13 @@ void ReadAloudAppModel::PreprocessTextForSpeech( } } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ DependencyParserModel& ReadAloudAppModel::GetDependencyParserModel() { return GetDependencyParserModel_(); } +#endif +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void ReadAloudAppModel::CalculatePhrases( a11y::ReadAloudCurrentGranularity& granularity) { if (!features::IsReadAnythingReadAloudPhraseHighlightingEnabled()) { @@ -223,19 +230,23 @@ void ReadAloudAppModel::CalculatePhrases( base::BindOnce(&ReadAloudAppModel::UpdatePhraseBoundaries, weak_ptr_factory_.GetWeakPtr(), phrase_tokens)); } +#endif -static const Strategy kPhraseStrategy = Strategy::kWords; -static const int kPhraseStrategyParameter = 5; +[[maybe_unused]] static const Strategy kPhraseStrategy = Strategy::kWords; +[[maybe_unused]] static const int kPhraseStrategyParameter = 5; void ReadAloudAppModel::StartPhraseCalculation() { if (processed_granularities_on_current_page_.size() > 0) { current_phrase_calculation_index_ = 0; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ CalculatePhrases(processed_granularities_on_current_page_[0]); +#endif } } void ReadAloudAppModel::UpdatePhraseBoundaries(std::vector tokens, std::vector heads) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // Reset the phrase calculation flag, so that the next phrase calculation can // be scheduled, if needed. is_calculating_phrases = false; @@ -297,6 +308,7 @@ void ReadAloudAppModel::UpdatePhraseBoundaries(std::vector tokens, current_phrase_calculation_index_ = -1; LOG(WARNING) << "All phrases calculated!"; } +#endif } // TODO(crbug.com/40927698): Update to use AXRange to better handle multiple diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h --- a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h +++ b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h @@ -8,7 +8,10 @@ #include "base/metrics/single_sample_metrics.h" #include "base/values.h" #include "chrome/common/read_anything/read_anything.mojom.h" +#include "components/optimization_guide/machine_learning_tflite_buildflags.h" +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ #include "chrome/renderer/accessibility/phrase_segmentation/dependency_parser_model.h" +#endif #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h" #include "ui/accessibility/ax_node_position.h" @@ -119,8 +122,10 @@ class ReadAloudAppModel { bool is_docs, const std::set* current_nodes); +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // Get the dependency parsing model for this renderer process. DependencyParserModel& GetDependencyParserModel(); +#endif // Increments the processed_granularity_index_, updating ReadAloud's state of // the current granularity to refer to the next granularity. The current @@ -293,9 +298,11 @@ class ReadAloudAppModel { // still needs to be read. bool NoValidTextRemainingInCurrentNode(bool is_pdf, bool is_docs) const; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // Asynchronously segment the given granularity into phrases. Once the phrases // are calculated, `UpdatePhraseBoundaries` will be called. void CalculatePhrases(a11y::ReadAloudCurrentGranularity& granularity); +#endif // Once the phrase segmentation has completed for a given sentence, update the // granularity with the phrase boundaries, and calculate phrases for the next @@ -369,7 +376,7 @@ class ReadAloudAppModel { // Whether a phrase calculation for a sentence is currently underway. (We // do not initiate a second calculation before the first has completed.) - bool is_calculating_phrases = false; + [[maybe_unused]] bool is_calculating_phrases = false; // Which sentence (index into `processed_granularities_on_current_page`) is // currently being processed for phrases. -1 if none. diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc --- a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc +++ b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc @@ -28,7 +28,9 @@ #include "chrome/common/read_anything/read_anything.mojom-shared.h" #include "chrome/common/read_anything/read_anything_util.h" #include "chrome/renderer/accessibility/ax_tree_distiller.h" +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ #include "chrome/renderer/accessibility/phrase_segmentation/dependency_parser_model.h" +#endif #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h" #include "chrome/renderer/accessibility/read_anything/read_anything_app_model.h" #include "chrome/renderer/accessibility/read_anything/read_anything_node_utils.h" @@ -2152,6 +2154,7 @@ void ReadAnythingAppController::OnConnected() { render_frame()->GetBrowserInterfaceBroker().GetInterface( std::move(page_handler_factory_receiver)); +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // Get the dependency parser model used by phrase-based highlighting. if (read_aloud_model_.GetDependencyParserModel().IsAvailable()) { return; @@ -2160,6 +2163,7 @@ void ReadAnythingAppController::OnConnected() { page_handler_->GetDependencyParserModel( base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel, weak_ptr_factory_.GetWeakPtr())); +#endif SetDistillationState( read_anything::mojom::ReadAnythingDistillationState::kNotAttempted); } @@ -2432,8 +2436,10 @@ std::u16string ReadAnythingAppController::GetCurrentTextContent() { } void ReadAnythingAppController::PreprocessTextForSpeech() { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ read_aloud_model_.PreprocessTextForSpeech(model_.is_pdf(), model_.IsDocs(), model_.GetCurrentlyVisibleNodes()); +#endif } void ReadAnythingAppController::MovePositionToNextGranularity() { @@ -2801,14 +2807,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const { void ReadAnythingAppController::UpdateDependencyParserModel( base::File model_file) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ read_aloud_model_.GetDependencyParserModel().UpdateWithFile( std::move(model_file)); +#endif } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ DependencyParserModel& ReadAnythingAppController::GetDependencyParserModelForTesting() { return read_aloud_model_.GetDependencyParserModel(); } +#endif void ReadAnythingAppController::OnTreeAdded(ui::AXTree* tree) { auto observation = diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h --- a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h +++ b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h @@ -48,7 +48,9 @@ class MojoUkmRecorder; } // namespace ukm class AXTreeDistiller; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ class DependencyParserModel; +#endif class ReadAnythingAppControllerTest; class ReadAnythingAppControllerScreen2xDataCollectionModeTest; class ReadAnythingAppControllerReadabilityTest; @@ -382,7 +384,9 @@ class ReadAnythingAppController // available. void UpdateDependencyParserModel(base::File model_file); +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ DependencyParserModel& GetDependencyParserModelForTesting(); +#endif // Called when distillation has completed. void OnAXTreeDistilled(const ui::AXTreeID& tree_id, diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -5969,8 +5969,6 @@ if (!is_android) { "//chrome/browser/ui/exclusive_access:test_support", "//chrome/browser/ui/hats", "//components/safe_browsing/content/browser:safe_browsing_blocking_page", - "//components/safe_browsing/content/browser/notification_content_detection", - "//components/safe_browsing/content/browser/notification_content_detection:notifications_global_cache_list", "//components/safe_browsing/content/common:file_type_policies_test_support", "//components/safe_browsing/core/browser:safe_browsing_metrics_collector", "//components/safe_browsing/core/browser/hashprefix_realtime:hash_realtime_service", diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -64,7 +64,7 @@ static_library("utility") { "//printing/buildflags", "//services/data_decoder:lib", "//services/network:network_service", - "//services/passage_embeddings", + # "//services/passage_embeddings", "//services/passage_embeddings/public/mojom", "//services/screen_ai/buildflags", "//services/service_manager/public/cpp", diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc --- a/chrome/utility/services.cc +++ b/chrome/utility/services.cc @@ -251,13 +251,6 @@ auto RunMirroringService( #endif // !BUILDFLAG(IS_ANDROID) -auto RunPassageEmbeddingsService( - mojo::PendingReceiver - receiver) { - return std::make_unique( - std::move(receiver)); -} - #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE) auto RunSpeechRecognitionService( mojo::PendingReceiver receiver) { @@ -445,7 +438,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { services.Add(RunUnzipper); services.Add(RunCSVPasswordParser); services.Add(ContentBookmarkParser); - services.Add(RunPassageEmbeddingsService); #if !BUILDFLAG(IS_ANDROID) services.Add(RunOakSessionService); diff --git a/components/BUILD.gn b/components/BUILD.gn --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -639,7 +639,7 @@ test("components_unittests") { "//components/one_time_tokens/core/browser:unit_tests", "//components/page_info:unit_tests", "//components/password_manager/core/browser/actor_login:unit_tests", - "//components/permissions/prediction_service:unit_tests", + # "//components/permissions/prediction_service:unit_tests", "//components/privacy_sandbox/privacy_sandbox_attestations:unit_tests", "//components/safety_check:unit_tests", "//components/security_interstitials/content:unit_tests", diff --git a/components/autofill/core/browser/BUILD.gn b/components/autofill/core/browser/BUILD.gn --- a/components/autofill/core/browser/BUILD.gn +++ b/components/autofill/core/browser/BUILD.gn @@ -555,16 +555,16 @@ static_library("browser") { "ml_model/autofill_ai/autofill_ai_model_executor.h", "ml_model/autofill_ai/autofill_ai_model_executor_impl.cc", "ml_model/autofill_ai/autofill_ai_model_executor_impl.h", - "ml_model/field_classification_model_encoder.cc", - "ml_model/field_classification_model_encoder.h", - "ml_model/field_classification_model_executor.cc", - "ml_model/field_classification_model_executor.h", - "ml_model/field_classification_model_handler.cc", - "ml_model/field_classification_model_handler.h", - "ml_model/logging/ml_log_router.cc", - "ml_model/logging/ml_log_router.h", - "ml_model/model_predictions.cc", - "ml_model/model_predictions.h", + # "ml_model/field_classification_model_encoder.cc", + # "ml_model/field_classification_model_encoder.h", + # "ml_model/field_classification_model_executor.cc", + # "ml_model/field_classification_model_executor.h", + # "ml_model/field_classification_model_handler.cc", + # "ml_model/field_classification_model_handler.h", + # "ml_model/logging/ml_log_router.cc", + # "ml_model/logging/ml_log_router.h", + # "ml_model/model_predictions.cc", + # "ml_model/model_predictions.h", "network/autofill_ai/fake_wallet_pass_access_manager.cc", "network/autofill_ai/fake_wallet_pass_access_manager.h", "network/autofill_ai/private_pass_conversion_util.cc", @@ -997,7 +997,7 @@ static_library("browser") { ":country_data", ":legal_message_line", ":payments_sync_utils", - "//components/autofill/core/browser/ml_model/logging:mojo_bindings", + # "//components/autofill/core/browser/ml_model/logging:mojo_bindings", "//components/autofill/core/browser/payments:card_unmask_challenge_option", "//components/autofill/core/browser/proto", "//components/autofill/core/browser/proto:autofill_ai_proto", @@ -1013,10 +1013,10 @@ static_library("browser") { "//third_party/abseil-cpp:absl", "//third_party/libaddressinput", "//third_party/libaddressinput:strings_grit", - "//third_party/tflite", - "//third_party/tflite:tflite_public_headers", - "//third_party/tflite_support", - "//third_party/tflite_support:tflite_support_proto", + # "//third_party/tflite", + # "//third_party/tflite:tflite_public_headers", + # "//third_party/tflite_support", + # "//third_party/tflite_support:tflite_support_proto", "//ui/base", "//ui/gfx/geometry", "//ui/gfx/range", diff --git a/components/autofill/core/browser/foundations/autofill_manager.cc b/components/autofill/core/browser/foundations/autofill_manager.cc --- a/components/autofill/core/browser/foundations/autofill_manager.cc +++ b/components/autofill/core/browser/foundations/autofill_manager.cc @@ -35,8 +35,8 @@ #include "components/autofill/core/browser/logging/log_manager.h" #include "components/autofill/core/browser/metrics/form_interactions_ukm_logger.h" #include "components/autofill/core/browser/metrics/quality_metrics.h" -#include "components/autofill/core/browser/ml_model/field_classification_model_handler.h" -#include "components/autofill/core/browser/ml_model/model_predictions.h" +// #include "components/autofill/core/browser/ml_model/field_classification_model_handler.h" +// #include "components/autofill/core/browser/ml_model/model_predictions.h" #include "components/autofill/core/browser/suggestions/suggestion_hiding_reason.h" #include "components/autofill/core/browser/suggestions/suggestion_util.h" #include "components/autofill/core/common/autofill_constants.h" @@ -137,8 +137,10 @@ struct AutofillManager::AsyncContext { std::vector forms; std::vector regex_predictions; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ std::vector autofill_predictions; std::vector password_manager_predictions; +#endif GeoIpCountryCode country_code; LanguageCode current_page_language; std::unique_ptr log_manager; @@ -759,6 +761,7 @@ void AutofillManager::ParseFormsAsyncCommon( void AutofillManager::RunMlModels( AsyncContext context, base::OnceCallback done_callback) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // Runs the specified model and calls `response` with the results. // Otherwise runs `response` with the empty vector. // Called on the UI thread. @@ -839,6 +842,9 @@ void AutofillManager::RunMlModels( // Then finish. std::move(done_callback)))), std::move(context)); +#else + std::move(done_callback).Run(std::move(context)); +#endif } void AutofillManager::PopulateCacheForQueryResponse( @@ -1024,12 +1030,14 @@ void AutofillManager::UpdateFormCache( auto apply_predictions = [](FormStructure& form_structure, const AsyncContext& context, size_t i) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (!context.autofill_predictions.empty()) { context.autofill_predictions[i].ApplyTo(form_structure.fields()); } if (!context.password_manager_predictions.empty()) { context.password_manager_predictions[i].ApplyTo(form_structure.fields()); } +#endif if (!context.regex_predictions.empty()) { context.regex_predictions[i].ApplyTo(form_structure.fields()); } @@ -1145,6 +1153,7 @@ void AutofillManager::LogCurrentFieldTypes( } } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void AutofillManager::SubscribeToMlModelChanges( FieldClassificationModelHandler& handler) { switch (handler.optimization_target()) { @@ -1168,5 +1177,6 @@ void AutofillManager::SubscribeToMlModelChanges( NOTREACHED(); } } +#endif } // namespace autofill diff --git a/components/autofill/core/browser/foundations/autofill_manager.h b/components/autofill/core/browser/foundations/autofill_manager.h --- a/components/autofill/core/browser/foundations/autofill_manager.h +++ b/components/autofill/core/browser/foundations/autofill_manager.h @@ -41,6 +41,7 @@ #include "components/autofill/core/common/mojom/autofill_types.mojom.h" #include "components/autofill/core/common/signatures.h" #include "components/autofill/core/common/unique_ids.h" +#include "components/optimization_guide/machine_learning_tflite_buildflags.h" #include "components/translate/core/browser/translate_driver.h" namespace autofill { @@ -394,10 +395,12 @@ class AutofillManager // Reparses all known forms. void ReparseKnownForms(); +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // After subscribing, FieldClassificationModelHandler::OnModelUpdated() will // trigger ReparseKnownForms(). There may be a handler for Autofill and/or // Password Manager. void SubscribeToMlModelChanges(FieldClassificationModelHandler& handler); +#endif protected: explicit AutofillManager(AutofillDriver* driver); diff --git a/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc b/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc --- a/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc +++ b/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide_decider.cc @@ -292,6 +292,7 @@ void AutofillOptimizationGuideDecider::OnPaymentsDataLoaded( // If we do not have any optimization types to register, do not do anything. if (!optimization_types.empty()) { + if (decider_) decider_->RegisterOptimizationTypes( std::vector( std::move(optimization_types).extract())); @@ -396,7 +397,7 @@ bool AutofillOptimizationGuideDecider::ShouldBlockSingleFieldSuggestions( const AutofillField* field) const { // If the field's storable type is `IBAN_VALUE`, check whether IBAN // suggestions should be blocked based on `url`. - if (field->Type().GetTypes().contains(IBAN_VALUE)) { + if (decider_ && field->Type().GetTypes().contains(IBAN_VALUE)) { optimization_guide::OptimizationGuideDecision decision = decider_->CanApplyOptimization( url, optimization_guide::proto::IBAN_AUTOFILL_BLOCKED, @@ -422,7 +423,7 @@ bool AutofillOptimizationGuideDecider::ShouldBlockFormFieldSuggestion( const CreditCard& card) const { if (auto optimization_type = GetVcnMerchantOptOutOptimizationTypeForCard(card); - optimization_type != optimization_guide::proto::TYPE_UNSPECIFIED) { + decider_ && optimization_type != optimization_guide::proto::TYPE_UNSPECIFIED) { optimization_guide::OptimizationGuideDecision decision = decider_->CanApplyOptimization(url, optimization_type, /*optimization_metadata=*/nullptr); diff --git a/components/autofill/core/browser/ml_model/field_classification_model_handler.cc b/components/autofill/core/browser/ml_model/field_classification_model_handler.cc --- a/components/autofill/core/browser/ml_model/field_classification_model_handler.cc +++ b/components/autofill/core/browser/ml_model/field_classification_model_handler.cc @@ -102,8 +102,7 @@ bool ParsingSupportsMultipleFieldsOfType(FieldType type) { FieldClassificationModelHandler::FieldClassificationModelHandler( optimization_guide::OptimizationGuideModelProvider* model_provider, - optimization_guide::proto::OptimizationTarget optimization_target, - MlLogRouter* log_router) + optimization_guide::proto::OptimizationTarget optimization_target) : optimization_guide::ModelHandler< FieldClassificationModelEncoder::ModelOutput, const FieldClassificationModelEncoder::ModelInput&>( @@ -115,8 +114,7 @@ FieldClassificationModelHandler::FieldClassificationModelHandler( optimization_target, CreateModelMetadata()), optimization_target_(optimization_target), - predictions_cache_(kMaxPredictionsToCache), - log_router_(log_router) { + predictions_cache_(kMaxPredictionsToCache) { // Store the model in memory as soon as it is available and keep it loaded for // the whole browser session since we query predictions very regularly. // TODO(crbug.com/40276177): Maybe change both back to default behavior if we @@ -167,6 +165,7 @@ void FieldClassificationModelHandler::ApplySmallFormRules( } } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ autofill_ml_internals::mojom::MlPredictionLogPtr FieldClassificationModelHandler::CreateMlPredictionLog( const FormData& form) const { @@ -223,6 +222,7 @@ FieldClassificationModelHandler::CreateMlPredictionLog( prediction_log->start_time = base::Time::Now(); return prediction_log; } +#endif void PopulateMlPredictionLogAfterInference( autofill_ml_internals::mojom::MlPredictionLog& prediction_log, @@ -252,9 +252,11 @@ void FieldClassificationModelHandler::GetModelPredictionsForForm( std::optional prediction_log = std::nullopt; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (log_router_ && log_router_->HasReceivers()) { prediction_log = CreateMlPredictionLog(form); } +#endif FieldClassificationModelEncoder::ModelInput encoded_input = state_->encoder.EncodeForm(form); @@ -320,11 +322,13 @@ void FieldClassificationModelHandler::GetModelPredictionsForForm( predicted_types); } } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (output && prediction_log && self->log_router_) { PopulateMlPredictionLogAfterInference(*prediction_log.value(), output.value()); self->log_router_->ProcessLog(std::move(*prediction_log)); } +#endif std::move(callback).Run(std::move(predictions)); }, weak_ptr_factory_.GetWeakPtr(), std::move(prediction_log), diff --git a/components/autofill/core/browser/ml_model/field_classification_model_handler.h b/components/autofill/core/browser/ml_model/field_classification_model_handler.h --- a/components/autofill/core/browser/ml_model/field_classification_model_handler.h +++ b/components/autofill/core/browser/ml_model/field_classification_model_handler.h @@ -17,8 +17,11 @@ #include "components/autofill/core/browser/field_types.h" #include "components/autofill/core/browser/form_structure.h" #include "components/autofill/core/browser/ml_model/field_classification_model_encoder.h" +#include "components/optimization_guide/machine_learning_tflite_buildflags.h" +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ #include "components/autofill/core/browser/ml_model/logging/autofill_ml_internals.mojom.h" #include "components/autofill/core/browser/ml_model/logging/ml_log_router.h" +#endif #include "components/autofill/core/browser/ml_model/model_predictions.h" #include "components/keyed_service/core/keyed_service.h" #include "components/optimization_guide/core/delivery/optimization_guide_model_provider.h" @@ -50,8 +53,7 @@ class FieldClassificationModelHandler FieldClassificationModelHandler( optimization_guide::OptimizationGuideModelProvider* model_provider, - optimization_guide::proto::OptimizationTarget optimization_target, - autofill::MlLogRouter* log_router = nullptr); + optimization_guide::proto::OptimizationTarget optimization_target); ~FieldClassificationModelHandler() override; // This function asynchronously queries predictions for the `form_structure` @@ -143,8 +145,10 @@ class FieldClassificationModelHandler ModelInputHash CalculateModelInputHash( const FieldClassificationModelEncoder::ModelInput& input); +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ autofill_ml_internals::mojom::MlPredictionLogPtr CreateMlPredictionLog( const FormData& form_structure) const; +#endif // Converts a `TokenId` to the string representation. std::string TokenIdToString( @@ -170,7 +174,9 @@ class FieldClassificationModelHandler ModelChangeCallbackList model_change_callback_list_; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ raw_ptr log_router_ = nullptr; +#endif base::WeakPtrFactory weak_ptr_factory_{this}; }; diff --git a/components/history_embeddings/core/history_embeddings_features.cc b/components/history_embeddings/core/history_embeddings_features.cc --- a/components/history_embeddings/core/history_embeddings_features.cc +++ b/components/history_embeddings/core/history_embeddings_features.cc @@ -24,6 +24,7 @@ FeatureParameters& GetFeatureParametersMutable() { // is client-side launched on desktop platforms in US only, so it remains // disabled by default for other regions. BASE_FEATURE(kHistoryEmbeddings, base::FEATURE_DISABLED_BY_DEFAULT); +SET_CROMITE_FEATURE_DISABLED(kHistoryEmbeddings); // This feature specifies whether to answer queries using an answerer; it can be // considered a toggle for v2 answering functionality. Parameters are all kept diff --git a/components/omnibox/browser/aim_eligibility_service_features.cc b/components/omnibox/browser/aim_eligibility_service_features.cc --- a/components/omnibox/browser/aim_eligibility_service_features.cc +++ b/components/omnibox/browser/aim_eligibility_service_features.cc @@ -9,6 +9,7 @@ namespace omnibox { BASE_FEATURE(kAimEnabled, base::FEATURE_ENABLED_BY_DEFAULT); +SET_CROMITE_FEATURE_DISABLED(kAimEnabled); // Disable AI Mode starter pack BASE_FEATURE(kAimServerEligibilityEnabled, base::FEATURE_ENABLED_BY_DEFAULT); diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -53,7 +53,9 @@ #include "components/omnibox/browser/autocomplete_match.h" #include "components/omnibox/browser/autocomplete_match_type.h" #include "components/omnibox/browser/autocomplete_provider.h" +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ #include "components/omnibox/browser/autocomplete_provider_client.h" +#endif #include "components/omnibox/browser/autocomplete_scoring_signals_annotator.h" #include "components/omnibox/browser/bookmark_provider.h" #include "components/omnibox/browser/bookmark_scoring_signals_annotator.h" @@ -132,11 +134,13 @@ constexpr bool is_android = !!BUILDFLAG(IS_ANDROID); void RecordMlScoreCoverage(size_t matches_with_non_null_scores, size_t total_scored_matches) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ int percent_score_coverage = matches_with_non_null_scores * 100 / total_scored_matches; base::UmaHistogramPercentage( "Omnibox.URLScoringModelExecuted.MLScoreCoverage", percent_score_coverage); +#endif } // Records the coverage (i.e. null vs non-null values) for each of the @@ -144,6 +148,7 @@ void RecordMlScoreCoverage(size_t matches_with_non_null_scores, void RecordScoringSignalCoverageForProvider( const ScoringSignals& scoring_signals, const AutocompleteProvider* provider) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // Keep consistent: // - omnibox_event.proto `ScoringSignals` // - omnibox_scoring_signals.proto `OmniboxScoringSignals` @@ -226,6 +231,7 @@ void RecordScoringSignalCoverageForProvider( provider_type + "." + pair.first, pair.second); } +#endif } void RecordMlScoringElapsedTime(base::TimeDelta elapsed) { diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc --- a/components/omnibox/browser/base_search_provider.cc +++ b/components/omnibox/browser/base_search_provider.cc @@ -102,14 +102,14 @@ BaseSearchProvider::BaseSearchProvider(AutocompleteProvider::Type type, bool BaseSearchProvider::ShouldPrefetch(const AutocompleteMatch& match) { // TODO (manukh): `GetAdditionalInfoForDebugging()` shouldn't be used for // non-debugging purposes. - return match.GetAdditionalInfoForDebugging(kShouldPrefetchKey) == kTrue; + return false; } // static bool BaseSearchProvider::ShouldPrerender(const AutocompleteMatch& match) { // TODO (manukh): `GetAdditionalInfoForDebugging()` shouldn't be used for // non-debugging purposes. - return match.GetAdditionalInfoForDebugging(kShouldPrerenderKey) == kTrue; + return false; } // static diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc --- a/components/omnibox/browser/omnibox_field_trial.cc +++ b/components/omnibox/browser/omnibox_field_trial.cc @@ -830,7 +830,7 @@ bool AreScoringSignalsAnnotatorsEnabled() { return GetMLConfig().enable_scoring_signals_annotators; } bool IsMlUrlScoringEnabled() { - return IsUrlScoringModelEnabled() && GetMLConfig().ml_url_scoring; + return false; } bool IsMlUrlScoringCounterfactual() { return IsMlUrlScoringEnabled() && GetMLConfig().ml_url_scoring_counterfactual; diff --git a/components/optimization_guide/core/delivery/prediction_model_download_manager.cc b/components/optimization_guide/core/delivery/prediction_model_download_manager.cc --- a/components/optimization_guide/core/delivery/prediction_model_download_manager.cc +++ b/components/optimization_guide/core/delivery/prediction_model_download_manager.cc @@ -56,7 +56,7 @@ const char kDisableModelDownloadsForBenchmarking[] = // we require models to come from. constexpr std::array kPublisherKeyHash = { 0x66, 0xa1, 0xd9, 0x3e, 0x4e, 0x5a, 0x66, 0x8a, 0x0f, 0xd3, 0xfa, - 0xa3, 0x70, 0x71, 0x42, 0x16, 0x0d, 0x2d, 0x68, 0xb0, 0x53, 0x02, + 0x01, 0x02, 0x03, 0x04, 0x16, 0x0d, 0x2d, 0x68, 0xb0, 0x53, 0x02, 0x5c, 0x7f, 0xd0, 0x0c, 0xa1, 0x6e, 0xef, 0xdd, 0x63, 0x7a}; const net::NetworkTrafficAnnotationTag kOptimizationGuidePredictionModelsTrafficAnnotation = @@ -126,7 +126,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager( unzip::UnzipperFactory unzipper_factory, scoped_refptr background_task_runner) : download_service_tracker_(download_service_tracker), - is_available_for_downloads_(true), + is_available_for_downloads_(false), api_key_(features::GetOptimizationGuideServiceAPIKey()), get_base_model_dir_for_download_callback_( get_base_model_dir_for_download_callback), @@ -140,6 +140,7 @@ void PredictionModelDownloadManager::StartDownload( const GURL& download_url, proto::OptimizationTarget optimization_target, const std::optional& scheduling_params) { + if ((true)) return; download::DownloadParams download_params; download_params.client = download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS; @@ -304,6 +305,7 @@ bool PredictionModelDownloadManager::VerifyDownload( const base::FilePath& download_file_path, const base::FilePath& base_model_dir, bool delete_file_on_error) { + if ((true)) return false; if (!switches::ShouldSkipModelDownloadVerificationForTesting()) { // Verify that the |download_file_path| contains a valid CRX file. std::string public_key; diff --git a/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc b/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc --- a/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc +++ b/components/optimization_guide/core/delivery/prediction_model_fetcher_impl.cc @@ -54,6 +54,7 @@ bool PredictionModelFetcherImpl::FetchOptimizationGuideServiceModels( proto::RequestContext request_context, const std::string& locale, ModelsFetchedCallback models_fetched_callback) { + if ((true)) return false; DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); TRACE_EVENT( diff --git a/components/optimization_guide/core/hints/hints_fetcher.cc b/components/optimization_guide/core/hints/hints_fetcher.cc --- a/components/optimization_guide/core/hints/hints_fetcher.cc +++ b/components/optimization_guide/core/hints/hints_fetcher.cc @@ -206,6 +206,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints( bool skip_cache, HintsFetchedCallback hints_fetched_callback, std::optional request_context_metadata) { + if ((true)) return false; DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_GT(optimization_types.size(), 0u); request_context_ = request_context; diff --git a/components/optimization_guide/core/hints/hints_manager.cc b/components/optimization_guide/core/hints/hints_manager.cc --- a/components/optimization_guide/core/hints/hints_manager.cc +++ b/components/optimization_guide/core/hints/hints_manager.cc @@ -460,6 +460,7 @@ void HintsManager::Shutdown() { OptimizationGuideDecision HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision( OptimizationTypeDecision optimization_type_decision) { + if ((true)) return OptimizationGuideDecision::kFalse; switch (optimization_type_decision) { case OptimizationTypeDecision::kAllowedByOptimizationFilter: case OptimizationTypeDecision::kAllowedByHint: @@ -2062,4 +2063,5 @@ void HintsManager::RemoveFetchedEntriesByHintKeys( hint_cache_->RemoveHintsForHosts(std::move(on_success), hint_keys); } +SET_CROMITE_FEATURE_DISABLED(kHintsBatchUpdateForActiveTabsAndTopHosts); } // namespace optimization_guide diff --git a/components/optimization_guide/core/optimization_guide_features.cc b/components/optimization_guide/core/optimization_guide_features.cc --- a/components/optimization_guide/core/optimization_guide_features.cc +++ b/components/optimization_guide/core/optimization_guide_features.cc @@ -43,11 +43,7 @@ namespace optimization_guide::features { namespace { constexpr auto enabled_by_default_mobile_only = -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) - base::FEATURE_ENABLED_BY_DEFAULT; -#else base::FEATURE_DISABLED_BY_DEFAULT; -#endif } // namespace @@ -280,8 +276,7 @@ size_t MaxHostKeyedHintCacheSize() { } bool ShouldPersistHintsToDisk() { - return GetFieldTrialParamByFeatureAsBool(kOptimizationHints, - "persist_hints_to_disk", true); + return false; } RequestContextSet GetAllowedContextsForPersonalizedMetadata() { @@ -642,4 +637,10 @@ std::optional GetMainFrameGetAIPageContentTimeout() { return kGetAIPageContentMainFrameTimeoutParam.Get(); } +SET_CROMITE_FEATURE_DISABLED(kOptimizationHints); +SET_CROMITE_FEATURE_DISABLED(kOptimizationTargetPrediction); +SET_CROMITE_FEATURE_DISABLED(kPreventLongRunningPredictionModels); +SET_CROMITE_FEATURE_DISABLED(kOptimizationGuideFetchingForSRP); +SET_CROMITE_FEATURE_DISABLED(kOptimizationGuideOnDeviceModel); +SET_CROMITE_FEATURE_DISABLED(kLogOnDeviceMetricsOnStartup); } // namespace optimization_guide::features diff --git a/components/optimization_guide/features.gni b/components/optimization_guide/features.gni --- a/components/optimization_guide/features.gni +++ b/components/optimization_guide/features.gni @@ -47,5 +47,5 @@ declare_args() { declare_args() { # Exclude the model on builders targeting web_engine on fuchsia. # TODO: crbug.com/393434571 - Clarify the boundary / strategy here. - build_with_model_execution = !(is_fuchsia && is_web_engine) + build_with_model_execution = false } diff --git a/components/page_content_annotations/content/page_category_classifier_bridge_impl.cc b/components/page_content_annotations/content/page_category_classifier_bridge_impl.cc --- a/components/page_content_annotations/content/page_category_classifier_bridge_impl.cc +++ b/components/page_content_annotations/content/page_category_classifier_bridge_impl.cc @@ -28,7 +28,9 @@ PageCategoryClassifierBridgeImpl::PageCategoryClassifierBridgeImpl( category_classifier_(category_classifier), optimization_guide_logger_(optimization_guide_logger) { scoped_observation_.Observe(&*page_embeddings_service_); +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ category_classifier_observation_.Observe(&*category_classifier_); +#endif } PageCategoryClassifierBridgeImpl::~PageCategoryClassifierBridgeImpl() = default; @@ -40,6 +42,7 @@ PageCategoryClassifierBridgeImpl::GetUsageMode() const { void PageCategoryClassifierBridgeImpl::OnPageEmbeddingsAvailable( content::Page& page) { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ std::vector embeddings = page_embeddings_service_->GetEmbeddings(page); @@ -57,6 +60,7 @@ void PageCategoryClassifierBridgeImpl::OnPageEmbeddingsAvailable( page.GetMainDocument().GetLastCommittedURL(), page.GetMainDocument().GetPageUkmSourceId(), std::move(title_url_embedding), std::move(passage_embeddings)); +#endif } void PageCategoryClassifierBridgeImpl::OnCategoriesClassified( diff --git a/components/page_content_annotations/content/page_category_classifier_bridge_impl.h b/components/page_content_annotations/content/page_category_classifier_bridge_impl.h --- a/components/page_content_annotations/content/page_category_classifier_bridge_impl.h +++ b/components/page_content_annotations/content/page_category_classifier_bridge_impl.h @@ -9,6 +9,7 @@ #include "base/memory/raw_ref.h" #include "base/scoped_observation.h" +#include "components/optimization_guide/machine_learning_tflite_buildflags.h" #include "components/page_content_annotations/content/page_embeddings_service.h" #include "components/page_content_annotations/core/on_device_category_classifier.h" #include "components/page_content_annotations/core/page_category_classifier_bridge.h" @@ -54,9 +55,11 @@ class PageCategoryClassifierBridgeImpl PageEmbeddingsService::Observer> scoped_observation_{this}; +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ base::ScopedObservation category_classifier_observation_{this}; +#endif }; } // namespace page_content_annotations diff --git a/components/page_content_annotations/core/page_content_annotations_features.cc b/components/page_content_annotations/core/page_content_annotations_features.cc --- a/components/page_content_annotations/core/page_content_annotations_features.cc +++ b/components/page_content_annotations/core/page_content_annotations_features.cc @@ -56,6 +56,7 @@ const base::FeatureParam kPageContentExtractionTriggeringMode{ bool IsSupportedLocale(const std::string& locale, const std::string& supported_locales) { + if ((true)) return false; if (supported_locales == "*") { return true; } @@ -75,6 +76,7 @@ bool IsSupportedLocale(const std::string& locale, bool IsSupportedCountry(const std::string& country_code, const std::string& supported_countries) { + if ((true)) return false; if (supported_countries == "*") { return true; } @@ -144,6 +146,7 @@ base::TimeDelta PCAServiceWaitForTitleDelayDuration() { } bool ShouldEnablePageContentAnnotations() { + if ((true)) return false; // Allow for the validation experiment or remote page metadata to enable the // PCAService without need to enable both features. return base::FeatureList::IsEnabled(kPageContentAnnotations) || @@ -283,6 +286,7 @@ bool IsSupportedLocaleForFeature( const std::string& locale, const base::Feature& feature, const std::string& default_value = "de,en,es,fr,it,nl,pt,tr") { + if ((true)) return false; if (!base::FeatureList::IsEnabled(feature)) { return false; } @@ -300,6 +304,7 @@ bool IsSupportedLocaleForFeature( bool IsSupportedCountryForFeature(const std::string& country_code, const base::Feature& feature, const std::string& default_value) { + if ((true)) return false; if (!base::FeatureList::IsEnabled(feature)) { return false; } @@ -314,4 +319,7 @@ bool IsSupportedCountryForFeature(const std::string& country_code, return IsSupportedCountry(country_code, value); } +SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotations); +SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsValidation); +SET_CROMITE_FEATURE_DISABLED(kRemotePageMetadata); } // namespace page_content_annotations::features diff --git a/components/page_content_annotations/core/page_content_annotations_model_manager.cc b/components/page_content_annotations/core/page_content_annotations_model_manager.cc --- a/components/page_content_annotations/core/page_content_annotations_model_manager.cc +++ b/components/page_content_annotations/core/page_content_annotations_model_manager.cc @@ -44,6 +44,7 @@ PageContentAnnotationsModelManager::~PageContentAnnotationsModelManager() = void PageContentAnnotationsModelManager::SetUpPageVisibilityModel( optimization_guide::OptimizationGuideModelProvider* optimization_guide_model_provider) { + if ((true)) return; // was kPageVisibilityBatchAnnotations if (page_visibility_model_handler_) return; diff --git a/components/page_content_annotations/core/page_content_annotations_service.cc b/components/page_content_annotations/core/page_content_annotations_service.cc --- a/components/page_content_annotations/core/page_content_annotations_service.cc +++ b/components/page_content_annotations/core/page_content_annotations_service.cc @@ -206,12 +206,14 @@ PageContentAnnotationsService::PageContentAnnotationsService( annotation_types_to_execute_.push_back(AnnotationType::kContentVisibility); } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (base::FeatureList::IsEnabled(features::kOnDeviceCategoryClassifier)) { on_device_category_classifier_ = std::make_unique( optimization_guide_model_provider, embedder_metadata_provider); on_device_category_classifier_->AddObserver(this); } +#endif if (features::RemotePageMetadataEnabled(application_locale, country_code)) { std::vector optimization_types; @@ -227,9 +229,11 @@ PageContentAnnotationsService::PageContentAnnotationsService( } PageContentAnnotationsService::~PageContentAnnotationsService() { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ if (on_device_category_classifier_) { on_device_category_classifier_->RemoveObserver(this); } +#endif } void PageContentAnnotationsService::Shutdown() { @@ -299,6 +303,7 @@ void PageContentAnnotationsService::Annotate(const HistoryVisit& visit) { } } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void PageContentAnnotationsService::OnCategoriesClassified( const GURL& url, ukm::SourceId source_id, @@ -312,6 +317,7 @@ void PageContentAnnotationsService::OnCategoriesClassified( AnnotationType::kCategoryClassifier, it->second, PageContentAnnotationsResult::CreateCategoryResults(categories)); } +#endif bool PageContentAnnotationsService::MaybeStartAnnotateVisitBatch() { bool is_full_batch_available = diff --git a/components/page_content_annotations/core/page_content_annotations_service.h b/components/page_content_annotations/core/page_content_annotations_service.h --- a/components/page_content_annotations/core/page_content_annotations_service.h +++ b/components/page_content_annotations/core/page_content_annotations_service.h @@ -126,8 +126,11 @@ enum class PageContentAnnotationsType { class PageContentAnnotationsService : public KeyedService, public history::HistoryServiceObserver, - public ZeroSuggestCacheServiceInterface::Observer, - public OnDeviceCategoryClassifier::Observer { + public ZeroSuggestCacheServiceInterface::Observer +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ + , public OnDeviceCategoryClassifier::Observer +#endif + { public: // Observer interface to listen for PageContentAnnotations for page loads. // Annotations will be sent for each page load for the registered annotation @@ -235,9 +238,11 @@ class PageContentAnnotationsService } // OnDeviceCategoryClassifier::Observer: +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void OnCategoriesClassified(const GURL& url, ukm::SourceId source_id, const std::vector& categories) override; +#endif private: // Callback invoked when a single |visit| has been annotated. diff --git a/components/permissions/prediction_service/BUILD.gn b/components/permissions/prediction_service/BUILD.gn --- a/components/permissions/prediction_service/BUILD.gn +++ b/components/permissions/prediction_service/BUILD.gn @@ -16,37 +16,37 @@ source_set("prediction_service") { sources = [ "permission_ui_selector.cc", "permission_ui_selector.h", - "permissions_ai_encoder_base.cc", - "permissions_ai_encoder_base.h", - "permissions_aiv4_executor.cc", - "permissions_aiv4_executor.h", - "permissions_aiv4_handler.cc", - "permissions_aiv4_handler.h", + # "permissions_ai_encoder_base.cc", + # "permissions_ai_encoder_base.h", + # "permissions_aiv4_executor.cc", + # "permissions_aiv4_executor.h", + # "permissions_aiv4_handler.cc", + # "permissions_aiv4_handler.h", "prediction_common.cc", "prediction_common.h", - "prediction_model_executor.cc", - "prediction_model_executor.h", - "prediction_model_handler.cc", - "prediction_model_handler.h", + # "prediction_model_executor.cc", + # "prediction_model_executor.h", + # "prediction_model_handler.cc", + # "prediction_model_handler.h", "prediction_request_features.h", "prediction_service.cc", "prediction_service.h", "prediction_service_base.h", - "prediction_signature_model_executor.cc", - "prediction_signature_model_executor.h", + # "prediction_signature_model_executor.cc", + # "prediction_signature_model_executor.h", ] deps = [ "//components/keyed_service/content", - "//components/passage_embeddings/core", + # "//components/passage_embeddings/core", "//components/permissions:permissions_common", "//components/version_info", "//content/public/browser", "//services/network/public/cpp", - "//skia", + # "//skia", "//third_party/protobuf:protobuf_lite", - "//third_party/tflite:tflite_public_headers", - "//third_party/tflite_support", - "//third_party/tflite_support:tflite_support_proto", + # "//third_party/tflite:tflite_public_headers", + # "//third_party/tflite_support", + # "//third_party/tflite_support:tflite_support_proto", ] public_deps = [ ":prediction_service_messages_proto", diff --git a/components/safe_browsing/content/browser/client_side_phishing_model.cc b/components/safe_browsing/content/browser/client_side_phishing_model.cc --- a/components/safe_browsing/content/browser/client_side_phishing_model.cc +++ b/components/safe_browsing/content/browser/client_side_phishing_model.cc @@ -523,7 +523,7 @@ void ClientSidePhishingModel::OnImageEmbeddingModelFileAndEmbeddingListLoaded( model_metadata.value()); } - int loaded_image_embedder_version = -1; // Valid versions start at 1. + [[maybe_unused]] int loaded_image_embedder_version = -1; // Valid versions start at 1. if (image_embedding_model_metadata.has_value()) { embedding_model_opt_guide_metadata_image_embedding_version_ = image_embedding_model_metadata->image_embedding_model_version(); @@ -547,6 +547,7 @@ void ClientSidePhishingModel::OnImageEmbeddingModelFileAndEmbeddingListLoaded( embedding_list_version_num); } } +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ // Drop any existing target image embeddings in preparation for a new set. target_image_embeddings_.clear(); // Only load image embeddings when the version of their embedder matches the @@ -567,6 +568,7 @@ void ClientSidePhishingModel::OnImageEmbeddingModelFileAndEmbeddingListLoaded( } base::UmaHistogramCounts100000("SBClientPhishing.ImageEmbeddingList.Size", target_image_embeddings_.size()); +#endif // There is no use of the image embedding model if the visual trigger model is // not present, so we will only send to the renderer when that is the case. if (visual_tflite_model_ && image_embedding_model_) { diff --git a/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn b/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn --- a/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn +++ b/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn @@ -23,10 +23,6 @@ source_set("notification_content_detection") { sources = [ "notification_content_detection_constants.cc", "notification_content_detection_constants.h", - "notification_content_detection_model.cc", - "notification_content_detection_model.h", - "notification_content_detection_service.cc", - "notification_content_detection_service.h", ] deps = [ diff --git a/components/translate/core/language_detection/BUILD.gn b/components/translate/core/language_detection/BUILD.gn --- a/components/translate/core/language_detection/BUILD.gn +++ b/components/translate/core/language_detection/BUILD.gn @@ -28,7 +28,6 @@ static_library("language_detection") { ":chinese_script_classifier", "//base", "//components/language/core/common", - "//components/language_detection/core", "//components/translate/core/common", "//third_party/cld_3/src/src:cld_3", "//third_party/icu", diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn --- a/components/viz/service/BUILD.gn +++ b/components/viz/service/BUILD.gn @@ -316,8 +316,8 @@ viz_component("service") { "//services/metrics/public/mojom", "//services/tracing/public/cpp", "//services/viz/privileged/mojom", - "//services/webnn:webnn_service", - "//services/webnn/public/mojom", + #"//services/webnn:webnn_service", + #"//services/webnn/public/mojom", "//skia", "//skia:skcms", "//third_party/blink/public/common", diff --git a/components/viz/service/gl/gpu_service_impl.cc b/components/viz/service/gl/gpu_service_impl.cc --- a/components/viz/service/gl/gpu_service_impl.cc +++ b/components/viz/service/gl/gpu_service_impl.cc @@ -643,27 +643,9 @@ void GpuServiceImpl::BindWebNNContextProvider( } CreateWebNNContextProviderIfNeeded(); - - webnn_context_provider_->BindWebNNContextProvider( - std::move(pending_receiver), - {is_incognito, client_id, client_tracing_id}); } void GpuServiceImpl::CreateWebNNContextProviderIfNeeded() { - if (webnn_context_provider_) { - return; - } - - scoped_refptr shared_context_state = - GetContextState(); - // `shared_context_state` may be nullptr if there is no GPU acceleration. - // For such case, WebNN CPU backend, e.g. TFLite XNNPACK, is still useful. - - webnn_context_provider_ = webnn::WebNNContextProviderImpl::Create( - std::move(shared_context_state), gpu_feature_info_, gpu_info_, - shared_image_manager(), gpu_channel_manager_->peak_memory_monitor(), - base::BindOnce(&GpuServiceImpl::LoseAllContexts, weak_ptr_), - main_runner(), GetGpuScheduler(), gpu_host_); } void GpuServiceImpl::BindWebNNServiceIntrospection( @@ -678,9 +660,6 @@ void GpuServiceImpl::BindWebNNServiceIntrospection( } CreateWebNNContextProviderIfNeeded(); - - webnn_context_provider_->BindWebNNServiceIntrospection( - std::move(pending_receiver)); } void GpuServiceImpl::GetVideoMemoryUsageStats( diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -290,9 +290,9 @@ source_set("browser") { "//services/viz/public/cpp/gpu", "//services/viz/public/mojom", "//services/webnn:buildflags", - "//services/webnn:webnn_service", - "//services/webnn:webnn_switches", - "//services/webnn/public/mojom", + # "//services/webnn:webnn_service", + # "//services/webnn:webnn_switches", + # "//services/webnn/public/mojom", "//skia", "//skia/public/mojom", "//sql", diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -1341,9 +1341,9 @@ bool GpuProcessHost::LaunchGpuProcess() { cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames); cmd_line->CopySwitchesFrom(browser_command_line, switches::kGLSwitchesCopiedFromGpuProcessHost); - cmd_line->CopySwitchesFrom( - browser_command_line, - switches::GetWebNNSwitchesCopiedFromGpuProcessHost()); + // cmd_line->CopySwitchesFrom( + // browser_command_line, + // switches::GetWebNNSwitchesCopiedFromGpuProcessHost()); if (browser_command_line.HasSwitch(switches::kDisableFrameRateLimit)) cmd_line->AppendSwitch(switches::kDisableGpuVsync); diff --git a/content/browser/service_worker/service_worker_main_resource_loader.cc b/content/browser/service_worker/service_worker_main_resource_loader.cc --- a/content/browser/service_worker/service_worker_main_resource_loader.cc +++ b/content/browser/service_worker/service_worker_main_resource_loader.cc @@ -539,6 +539,7 @@ bool ServiceWorkerMainResourceLoader::StartRaceNetworkRequest( scoped_refptr context, scoped_refptr version, base::OnceCallback clone_completed_for_fetch_handler_callback) { + if ((true)) return false; // Set fetch_handler_bypass_option to tell the renderer that // RaceNetworkRequest is enabled. service_worker_client_->set_fetch_handler_bypass_option( diff --git a/content/utility/services.cc b/content/utility/services.cc --- a/content/utility/services.cc +++ b/content/utility/services.cc @@ -334,12 +334,6 @@ auto RunVideoCapture( return service; } -auto RunOnDeviceModel( - mojo::PendingReceiver - receiver) { - return on_device_model::OnDeviceModelService::Create(std::move(receiver)); -} - #if BUILDFLAG(ENABLE_VR) && !BUILDFLAG(IS_ANDROID) auto RunXrDeviceService( mojo::PendingReceiver receiver) { @@ -404,10 +398,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { services.Add(RunOOPVideoDecoderFactoryProcessService); #endif - if (optimization_guide::features::CanLaunchOnDeviceModelService()) { - services.Add(RunOnDeviceModel); - } - #if BUILDFLAG(IS_WIN) || (BUILDFLAG(GOOGLE_CHROME_BRANDING) && \ (BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX))) services.Add(RunShapeDetectionService); diff --git a/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc @@ -0,0 +1,2 @@ +SET_CROMITE_FEATURE_ENABLED(kBookmarkTriggerForPrerender2KillSwitch); +SET_CROMITE_FEATURE_DISABLED(kNewTabPageTriggerForPrerender2); diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc @@ -0,0 +1 @@ +// Empty file diff --git a/cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kPrerenderFallbackToPreconnect); diff --git a/cromite_flags/components/password_manager/core/browser/features/password_features_cc/Disable-all-predictors-code.inc b/cromite_flags/components/password_manager/core/browser/features/password_features_cc/Disable-all-predictors-code.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/components/password_manager/core/browser/features/password_features_cc/Disable-all-predictors-code.inc @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kProactivelyDownloadModelForPasswordChange); diff --git a/cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc b/cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc @@ -0,0 +1,5 @@ +SET_CROMITE_FEATURE_DISABLED(kPermissionPredictionsV2); + +#if BUILDFLAG(IS_ANDROID) +SET_CROMITE_FEATURE_DISABLED(kPermissionDedicatedCpssSettingAndroid); +#endif diff --git a/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc b/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kHttpCacheNoVarySearch); diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc @@ -0,0 +1 @@ +SET_CROMITE_FEATURE_DISABLED(kNetworkContextPrefetch); diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc new file mode 100644 --- /dev/null +++ b/cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc @@ -0,0 +1,2 @@ +SET_CROMITE_FEATURE_DISABLED(kNavigationPredictor); +SET_CROMITE_FEATURE_DISABLED(kPreloadingHeuristicsMLModel); diff --git a/media/webrtc/BUILD.gn b/media/webrtc/BUILD.gn --- a/media/webrtc/BUILD.gn +++ b/media/webrtc/BUILD.gn @@ -4,6 +4,7 @@ import("//media/media_options.gni") import("//third_party/webrtc/webrtc.gni") +import("//components/optimization_guide/features.gni") component("webrtc") { output_name = "media_webrtc" diff --git a/media/webrtc/helpers.cc b/media/webrtc/helpers.cc --- a/media/webrtc/helpers.cc +++ b/media/webrtc/helpers.cc @@ -13,6 +13,7 @@ #include "base/time/time.h" #include "build/build_config.h" #include "build/chromecast_buildflags.h" +#include "components/optimization_guide/machine_learning_tflite_buildflags.h" #include "media/base/media_switches.h" #include "media/webrtc/webrtc_features.h" #include "third_party/webrtc/api/audio/audio_processing.h" diff --git a/services/on_device_model/BUILD.gn b/services/on_device_model/BUILD.gn --- a/services/on_device_model/BUILD.gn +++ b/services/on_device_model/BUILD.gn @@ -25,7 +25,7 @@ component("on_device_model_service") { sources = [ "on_device_model_mojom_impl.cc", "on_device_model_mojom_impl.h", - "on_device_model_service.cc", + # "on_device_model_service.cc", "on_device_model_service.h", ] deps = [ @@ -34,7 +34,7 @@ component("on_device_model_service") { "//build:chromecast_buildflags", "//components/optimization_guide/core:features", "//services/on_device_model/fake", - "//services/on_device_model/ml:ml_no_internal", + # "//services/on_device_model/ml:ml_no_internal", # TODO(crbug.com/41492700): Remove this once possible. This is a hack due to # an implicit dependency via //third_party/utf via language_detection above. @@ -83,7 +83,7 @@ source_set("tests") { "//base/test:test_support", "//mojo/public/cpp/test_support:test_utils", "//services/on_device_model/fake", - "//services/on_device_model/ml:ml_no_internal", + #"//services/on_device_model/ml:ml_no_internal", "//services/on_device_model/public/cpp/test_support", "//services/on_device_model/public/mojom", "//testing/gmock", diff --git a/services/on_device_model/fake/BUILD.gn b/services/on_device_model/fake/BUILD.gn --- a/services/on_device_model/fake/BUILD.gn +++ b/services/on_device_model/fake/BUILD.gn @@ -8,14 +8,16 @@ component("fake") { "on_device_model_fake.h", ] sources = [ - "fake_chrome_ml_api.cc", - "on_device_model_fake.cc", + # "fake_chrome_ml_api.cc", + # "on_device_model_fake.cc", + "//services/on_device_model/ml/chrome_ml_tool_types.cc", + "//services/on_device_model/ml/chrome_ml_audio_buffer.cc", ] deps = [ "//base", "//mojo/public/cpp/bindings", - "//services/on_device_model/ml:api", - "//services/on_device_model/ml:ml_no_internal", + #"//services/on_device_model/ml:api", + #"//services/on_device_model/ml:ml_no_internal", "//services/on_device_model/public/mojom", "//skia:skia_core_public_headers", ] diff --git a/services/on_device_model/fake/fake_chrome_ml_api.cc b/services/on_device_model/fake/fake_chrome_ml_api.cc --- a/services/on_device_model/fake/fake_chrome_ml_api.cc +++ b/services/on_device_model/fake/fake_chrome_ml_api.cc @@ -130,7 +130,9 @@ size_t TokenizeBytes(const void* user_data, } // namespace +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void InitDawnProcs(const DawnProcTable& procs) {} +#endif void SetMetricsFns(const ChromeMLMetricsFns* fns) {} @@ -504,7 +506,9 @@ ChromeMLSafetyResult TSModelClassifyTextSafety(ChromeMLTSModel model, } const ChromeMLAPI g_api = { +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ .InitDawnProcs = &InitDawnProcs, +#endif .SetMetricsFns = &SetMetricsFns, .SetFatalErrorFn = &SetFatalErrorFn, .ClassifyTextSafety = &ClassifyTextSafety, diff --git a/services/on_device_model/fake/on_device_model_fake.cc b/services/on_device_model/fake/on_device_model_fake.cc --- a/services/on_device_model/fake/on_device_model_fake.cc +++ b/services/on_device_model/fake/on_device_model_fake.cc @@ -12,9 +12,7 @@ namespace fake_ml { COMPONENT_EXPORT(ON_DEVICE_MODEL_FAKE) const ml::ChromeML* GetFakeChromeML() { - static const base::NoDestructor> fake{ - ml::ChromeML::CreateForTesting(fake_ml::GetFakeMlApi())}; - return fake->get(); + return nullptr; } } // namespace fake_ml diff --git a/services/on_device_model/ml/BUILD.gn b/services/on_device_model/ml/BUILD.gn --- a/services/on_device_model/ml/BUILD.gn +++ b/services/on_device_model/ml/BUILD.gn @@ -6,6 +6,8 @@ import("//build/config/features.gni") import("//components/optimization_guide/features.gni") import("//services/on_device_model/on_device_model.gni") +assert(false) + source_set("api") { public = [ "chrome_ml_api.h", diff --git a/services/on_device_model/ml/chrome_ml_api.h b/services/on_device_model/ml/chrome_ml_api.h --- a/services/on_device_model/ml/chrome_ml_api.h +++ b/services/on_device_model/ml/chrome_ml_api.h @@ -12,7 +12,9 @@ #include #include "services/on_device_model/ml/chrome_ml_types.h" +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ #include "third_party/dawn/include/dawn/dawn_proc_table.h" +#endif #include "third_party/dawn/include/dawn/webgpu.h" // This header defines the public interface to the ChromeML shared library. @@ -470,7 +472,9 @@ struct ChromeMLASRAPI { struct ChromeMLAPI { // Initializes the Dawn proc table. This must be called before any other // functions. +#if false /*BUILDFLAG(BUILD_WITH_TFLITE_LIB)*/ void (*InitDawnProcs)(const DawnProcTable& procs); +#endif // Sets functions which can be used to log metrics from within the library. void (*SetMetricsFns)(const ChromeMLMetricsFns* fns); diff --git a/services/on_device_model/ml/ts_model.cc b/services/on_device_model/ml/ts_model.cc --- a/services/on_device_model/ml/ts_model.cc +++ b/services/on_device_model/ml/ts_model.cc @@ -26,7 +26,7 @@ #include "services/on_device_model/public/mojom/on_device_model_service.mojom.h" #include "services/on_device_model/safety/safety_util.h" -#if !BUILDFLAG(IS_FUCHSIA) +#if false && !BUILDFLAG(IS_FUCHSIA) #include "services/on_device_model/safety/bert_safety_model.h" #endif @@ -198,7 +198,7 @@ void TsHolder::Reset(mojom::TextSafetyModelParamsPtr params, mojo::PendingReceiver model) { model_.Clear(); -#if !BUILDFLAG(IS_FUCHSIA) +#if false && !BUILDFLAG(IS_FUCHSIA) if (!params->safety_assets || params->safety_assets->which() == mojom::SafetyModelAssets::Tag::kTsAssets) { auto impl = TsModel::Create(*chrome_ml_, std::move(params)); diff --git a/services/on_device_model/on_device_model.gni b/services/on_device_model/on_device_model.gni --- a/services/on_device_model/on_device_model.gni +++ b/services/on_device_model/on_device_model.gni @@ -14,7 +14,7 @@ declare_args() { declare_args() { # The on device model service is only enabled on a subset of platforms. # Exclude it on other platforms due to binary size. - use_on_device_model_service = is_win || is_mac || is_linux || is_ios || is_cbx + use_on_device_model_service = false } declare_args() { @@ -29,5 +29,5 @@ declare_args() { # MLKit is the developer-facing APIs and AICore is the system-level AI runtime # to host on-device model services. Chrome-branded builds use internal/private # APIs to access AICore directly. - use_mlkit_for_aicore = !is_chrome_branded + use_mlkit_for_aicore = false } diff --git a/services/on_device_model/on_device_model_service.cc b/services/on_device_model/on_device_model_service.cc --- a/services/on_device_model/on_device_model_service.cc +++ b/services/on_device_model/on_device_model_service.cc @@ -31,14 +31,7 @@ const base::FeatureParam kForceFastestInference{ "on_device_model_force_fastest_inference", false}; scoped_refptr DefaultImpl() { - if (base::FeatureList::IsEnabled(features::kUseFakeChromeML)) { - return base::MakeRefCounted(fake_ml::GetFakeChromeML()); - } -#if BUILDFLAG(ENABLE_ML_INTERNAL) - return base::MakeRefCounted(::ml::ChromeML::Get()); -#else - return base::MakeRefCounted(fake_ml::GetFakeChromeML()); -#endif // BUILDFLAG(ENABLE_ML_INTERNAL) + return nullptr; } } // namespace diff --git a/services/on_device_model/public/cpp/features.cc b/services/on_device_model/public/cpp/features.cc --- a/services/on_device_model/public/cpp/features.cc +++ b/services/on_device_model/public/cpp/features.cc @@ -7,10 +7,12 @@ namespace on_device_model::features { BASE_FEATURE(kUseFakeChromeML, base::FEATURE_DISABLED_BY_DEFAULT); +SET_CROMITE_FEATURE_ENABLED(kUseFakeChromeML); BASE_FEATURE(kOnDeviceModelForceCpuBackend, base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kOnDeviceModelCpuBackend, base::FEATURE_ENABLED_BY_DEFAULT); +SET_CROMITE_FEATURE_DISABLED(kOnDeviceModelCpuBackend); BASE_FEATURE(kOnDeviceModelLitertLmBackend, base::FEATURE_DISABLED_BY_DEFAULT); diff --git a/services/on_device_model/public/cpp/test_support/BUILD.gn b/services/on_device_model/public/cpp/test_support/BUILD.gn --- a/services/on_device_model/public/cpp/test_support/BUILD.gn +++ b/services/on_device_model/public/cpp/test_support/BUILD.gn @@ -14,7 +14,7 @@ source_set("test_support") { public_deps = [ "//base", "//mojo/public/cpp/bindings", - "//services/on_device_model/ml:api", + #"//services/on_device_model/ml:api", "//services/on_device_model/public/cpp", "//services/on_device_model/public/mojom", "//third_party/re2", diff --git a/services/on_device_model/public/mojom/BUILD.gn b/services/on_device_model/public/mojom/BUILD.gn --- a/services/on_device_model/public/mojom/BUILD.gn +++ b/services/on_device_model/public/mojom/BUILD.gn @@ -75,7 +75,7 @@ mojom("mojom") { "//services/on_device_model/public/cpp/chrome_ml_types_mojom_traits.cc", ] traits_public_deps = [ - "//services/on_device_model/ml:api", + #"//services/on_device_model/ml:api", "//services/on_device_model/public/cpp:types", ] }, diff --git a/services/on_device_model/safety/BUILD.gn b/services/on_device_model/safety/BUILD.gn --- a/services/on_device_model/safety/BUILD.gn +++ b/services/on_device_model/safety/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -if (!is_fuchsia) { +if (false) { # build_with_tflite_lib source_set("bert_safety_op_resolver") { sources = [ "bert_safety_op_resolver.cc", diff --git a/services/passage_embeddings/passage_embeddings_service.cc b/services/passage_embeddings/passage_embeddings_service.cc --- a/services/passage_embeddings/passage_embeddings_service.cc +++ b/services/passage_embeddings/passage_embeddings_service.cc @@ -36,6 +36,10 @@ void PassageEmbeddingsService::LoadModels( mojom::PassageEmbedderParamsPtr embedder_params, mojo::PendingReceiver receiver, LoadModelsCallback callback) { + if ((true)) { + std::move(callback).Run(false); + return; + } embedder_ = std::make_unique( std::move(receiver), std::move(embedder_params), base::BindOnce(&PassageEmbeddingsService::OnEmbedderDisconnect, diff --git a/services/webnn/BUILD.gn b/services/webnn/BUILD.gn --- a/services/webnn/BUILD.gn +++ b/services/webnn/BUILD.gn @@ -182,7 +182,7 @@ component("webnn_service") { } } - if (is_win) { + if (is_win && webnn_use_tflite) { sources += [ "ort/context_impl_ort.cc", "ort/context_impl_ort.h", diff --git a/services/webnn/features.gni b/services/webnn/features.gni --- a/services/webnn/features.gni +++ b/services/webnn/features.gni @@ -9,7 +9,7 @@ assert(use_blink) declare_args() { # TFLite is used as a fallback option on Apple and Windows. - webnn_use_tflite = is_android || is_chromeos || is_linux || is_apple || is_win + webnn_use_tflite = false #is_android || is_chromeos || is_linux || is_apple || is_win # LiteRT matches TFLite except for arm. # TODO(b/454732289): Add arm support once APK size issue is resolved. diff --git a/services/webnn/webnn_context_provider_impl.cc b/services/webnn/webnn_context_provider_impl.cc --- a/services/webnn/webnn_context_provider_impl.cc +++ b/services/webnn/webnn_context_provider_impl.cc @@ -331,35 +331,7 @@ void WebNNContextProviderImpl::CreateWebNNContext( } #if BUILDFLAG(IS_WIN) - if (ort::ShouldCreateOrtContext(*options)) { - const base::CommandLine* command_line = - base::CommandLine::ForCurrentProcess(); - - scoped_trace.AddStep("EnsureWebNNExecutionProvidersReady"); - - // If ignore IHV EPs, use empty `ep_package_info` to create the ORT context. - if (command_line->HasSwitch(switches::kWebNNOrtIgnoreIhvEps)) { - DidEnsureWebNNExecutionProvidersReady( - std::move(scoped_trace), std::move(options), - std::move(write_tensor_producer), std::move(write_tensor_consumer), - std::move(read_tensor_producer), std::move(read_tensor_consumer), - command_buffer_id, std::move(gpu_sequence), - std::move(owning_task_runner), std::move(receiver), std::move(remote), - std::move(callback), params.is_incognito, std::move(memory_tracker), - /*ep_package_info=*/{}); - return; - } - - gpu_host_->EnsureWebNNExecutionProvidersReady(base::BindOnce( - &WebNNContextProviderImpl::DidEnsureWebNNExecutionProvidersReady, - AsWeakPtr(), std::move(scoped_trace), std::move(options), - std::move(write_tensor_producer), std::move(write_tensor_consumer), - std::move(read_tensor_producer), std::move(read_tensor_consumer), - command_buffer_id, std::move(gpu_sequence), - std::move(owning_task_runner), std::move(receiver), std::move(remote), - std::move(callback), params.is_incognito, std::move(memory_tracker))); - return; - } else if (dml::ShouldCreateDmlContext(*options)) { + if (dml::ShouldCreateDmlContext(*options)) { base::expected context_creation_results = dml::CreateContextFromOptions( std::move(options), std::move(write_tensor_consumer), diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc b/third_party/blink/renderer/core/html/parser/html_document_parser.cc --- a/third_party/blink/renderer/core/html/parser/html_document_parser.cc +++ b/third_party/blink/renderer/core/html/parser/html_document_parser.cc @@ -1788,6 +1788,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget( } bool HTMLDocumentParser::ShouldSkipPreloadScan() { + if ((true)) return true; // see https://wpt.live/html/syntax/speculative-parsing/expect-no-linked-resources/no-speculative-fetch.tentative.optional.html // Check if Document-Policy has Expect-No-Linked-Resources hint. auto* document = GetDocument(); if (const auto* context = document->GetExecutionContext()) { diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc --- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc +++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc @@ -664,6 +664,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() { return; } + if ((true)) return; HeapVector> candidates; auto push_candidates = [&candidates, &document, this]( mojom::blink::SpeculationAction action, diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -4416,7 +4416,7 @@ // // It also has some feature params defined throughout the codebase. name: "Prerender2", - status: "stable", + status: "test", }, { // Used to allow prerender cross-origin iframes with an opt-in response --