Skip to content

Instantly share code, notes, and snippets.

@uazo

uazo/fix-test-build.patch

Last active December 4, 2023 01:46
Show Gist options
  • Save uazo/0a3c03729cc7e30435501198b1225d76 to your computer and use it in GitHub Desktop.
Save uazo/0a3c03729cc7e30435501198b1225d76 to your computer and use it in GitHub Desktop.
Download ZIP
[wip] Patch to re-enable testing (updated for v91)
Raw
fix-test-build.patch
From: Your Name <you@example.com>
Date: Tue, 18 May 2021 12:54:57 +0000
Subject: enable tests suite
---
chrome/android/BUILD.gn | 36 +--
.../chrome_junit_test_java_sources.gni | 22 +-
chrome/android/chrome_test_java_sources.gni | 122 ++++----
.../features/keyboard_accessory/BUILD.gn | 2 +-
.../tab_ui/tab_management_java_sources.gni | 2 +-
chrome/android/feed/feed_java_sources.gni | 6 +-
.../browser/bookmarks/BookmarkTest.java | 12 +-
.../ClearBrowsingDataFragmentBasicTest.java | 16 +-
.../browser/history/HistoryActivityTest.java | 33 ++-
.../ntp/NewTabPageColorWithFeedV2Test.java | 11 +-
...AssistantVoiceSearchServiceRenderTest.java | 2 +-
.../settings/PasswordViewingTypeTest.java | 2 +-
.../settings/MainSettingsFragmentTest.java | 262 +-----------------
.../chrome/browser/sync/FakeServerHelper.java | 4 +-
.../AppMenuPropertiesDelegateUnitTest.java | 14 +-
...bbedAppMenuPropertiesDelegateUnitTest.java | 2 +-
.../servicification_background_service_jni.cc | 5 +-
...browsing_data_remover_delegate_unittest.cc | 9 -
.../commerce/merchant_viewer/android/BUILD.gn | 1 -
.../android/test_java_sources.gni | 1 +
.../subscriptions/test/android/BUILD.gn | 2 +-
...rce_filter_component_installer_unittest.cc | 3 +-
...rome_download_manager_delegate_unittest.cc | 25 +-
.../download/download_item_model_unittest.cc | 11 -
.../download_target_determiner_unittest.cc | 1 -
chrome/browser/metrics/BUILD.gn | 2 +-
...permission_revocation_request_unittests.cc | 9 -
chrome/browser/privacy_budget/BUILD.gn | 2 +-
.../password_manager_porter_unittest.cc | 4 +
chrome/test/BUILD.gn | 30 +-
chrome/test/android/BUILD.gn | 6 +-
.../chrome/test/ChromeJUnit4ClassRunner.java | 7 +-
.../controllers/first_run/TOSController.java | 18 +-
.../signin/AccountManagerTestRule.java | 31 ++-
chrome/test/base/chrome_unit_test_suite.h | 2 +-
chrome/test/base/testing_browser_process.cc | 14 +-
chrome/test/base/testing_browser_process.h | 5 +-
components/BUILD.gn | 6 +-
components/background_task_scheduler/BUILD.gn | 10 +-
...BackgroundTaskSchedulerJobServiceTest.java | 78 +++---
.../BackgroundTaskJobServiceTest.java | 16 +-
.../BackgroundTaskSchedulerImplTest.java | 20 +-
.../bookmarks/test/test_bookmark_client.cc | 2 +
components/domain_reliability/BUILD.gn | 2 +-
.../domain_reliability/monitor_unittest.cc | 34 ---
components/externalauth/android/BUILD.gn | 38 +--
components/gcm_driver/BUILD.gn | 5 +-
components/gcm_driver/instance_id/BUILD.gn | 10 +-
components/invalidation/impl/BUILD.gn | 4 +-
.../media_router/browser/android/BUILD.gn | 18 +-
.../media_router/MockMediaRouteProvider.java | 4 +-
...BrowserMediaRouterSinkObservationTest.java | 4 +-
.../media_router/DiscoveryCallbackTest.java | 16 +-
...pref_proxy_config_tracker_impl_unittest.cc | 2 +-
.../proxy_config_dictionary_unittest.cc | 2 +-
components/signin/public/android/BUILD.gn | 1 -
...e_file_system_access_permission_context.cc | 7 -
...ke_file_system_access_permission_context.h | 5 -
.../file_system_chooser_test_helpers.cc | 4 +
...k_file_system_access_permission_context.cc | 12 +-
...ck_file_system_access_permission_context.h | 18 +-
content/shell/android/BUILD.gn | 2 +-
services/BUILD.gn | 52 ++--
63 files changed, 381 insertions(+), 727 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -517,7 +517,7 @@ android_library("chrome_java") {
"//skia/public/mojom:mojom_java",
"//third_party/android_data_chart:android_data_chart_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:chromium_play_services_availability_java",
+# "//third_party/android_deps:chromium_play_services_availability_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:com_google_guava_listenablefuture_java",
"//third_party/android_deps:dagger_java",
@@ -879,7 +879,7 @@ junit_binary("chrome_junit_tests") {
"//chrome/browser/signin/services/android:java",
"//chrome/browser/signin/services/android:junit",
"//chrome/browser/signin/ui/android:java",
- "//chrome/browser/signin/ui/android:junit",
+ #"//chrome/browser/signin/ui/android:junit",
"//chrome/browser/tab:java",
"//chrome/browser/tab:junit",
"//chrome/browser/tab:optimization_guide_protos_java",
@@ -913,7 +913,7 @@ junit_binary("chrome_junit_tests") {
"//chrome/browser/video_tutorials/internal:junit",
"//chrome/browser/webapps/android:java",
"//chrome/browser/xsurface:java",
- "//chrome/test:sync_integration_test_support_java",
+# "//chrome/test:sync_integration_test_support_java",
"//chrome/test/android:chrome_java_test_support",
"//components/background_task_scheduler:background_task_scheduler_java",
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
@@ -936,7 +936,7 @@ junit_binary("chrome_junit_tests") {
"//components/embedder_support/android:util_java",
"//components/externalauth/android:google_delegate_public_impl_java",
"//components/externalauth/android:java",
- "//components/externalauth/android:junit",
+ #"//components/externalauth/android:junit",
"//components/favicon/android:java",
"//components/feature_engagement/public:public_java",
"//components/feed/core/proto:proto_java_v2",
@@ -981,7 +981,7 @@ junit_binary("chrome_junit_tests") {
"//services/media_session/public/mojom:mojom_java",
"//services/service_manager/public/java:service_manager_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:chromium_play_services_availability_shadows_java",
+ #"//third_party/android_deps:chromium_play_services_availability_shadows_java",
"//third_party/android_deps:com_google_guava_listenablefuture_java",
"//third_party/android_deps:com_googlecode_java_diff_utils_diffutils_java",
"//third_party/android_deps:dagger_java",
@@ -1157,7 +1157,7 @@ android_library("chrome_test_java") {
"//chrome/browser/privacy_sandbox/android:javatests",
"//chrome/browser/profiles/android:java",
"//chrome/browser/safe_browsing/android:java",
- "//chrome/browser/safe_browsing/android:javatests",
+ #"//chrome/browser/safe_browsing/android:javatests",
"//chrome/browser/safety_check/android:java",
"//chrome/browser/safety_check/android:javatests",
"//chrome/browser/search_engines/android:java",
@@ -1167,9 +1167,9 @@ android_library("chrome_test_java") {
"//chrome/browser/share:java",
"//chrome/browser/share/android:java_resources",
"//chrome/browser/signin/services/android:java",
- "//chrome/browser/signin/services/android:javatests",
+ #"//chrome/browser/signin/services/android:javatests",
"//chrome/browser/signin/ui/android:java",
- "//chrome/browser/signin/ui/android:javatests",
+ #"//chrome/browser/signin/ui/android:javatests",
"//chrome/browser/tab:critical_persisted_tab_data_proto_java",
"//chrome/browser/tab:java",
"//chrome/browser/tab:optimization_guide_protos_java",
@@ -1197,7 +1197,7 @@ android_library("chrome_test_java") {
"//chrome/browser/util:java",
"//chrome/browser/version:java",
"//chrome/browser/webapps/android:java",
- "//chrome/test:sync_integration_test_support_java",
+ #"//chrome/test:sync_integration_test_support_java",
"//chrome/test/android:chrome_java_test_pagecontroller",
"//chrome/test/android:chrome_java_test_support",
"//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java",
@@ -1251,9 +1251,9 @@ android_library("chrome_test_java") {
"//components/favicon/android:java",
"//components/feature_engagement:feature_engagement_java",
"//components/feed/core/v2:feedv2_core_java",
- "//components/gcm_driver/android:gcm_driver_java",
- "//components/gcm_driver/instance_id/android:instance_id_driver_java",
- "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
+ # "//components/gcm_driver/android:gcm_driver_java",
+ # "//components/gcm_driver/instance_id/android:instance_id_driver_java",
+ # "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
"//components/infobars/android:java",
"//components/infobars/android:javatests",
"//components/infobars/core:infobar_enums_java",
@@ -1310,7 +1310,7 @@ android_library("chrome_test_java") {
"//components/webapk/android/libs/client:java",
"//components/webapps/browser/android:java",
"//components/webauthn/android:java",
- "//components/webauthn/android:test_support_java",
+# "//components/webauthn/android:test_support_java",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
"//media/base/android:java_switches",
@@ -1321,7 +1321,7 @@ android_library("chrome_test_java") {
"//net/android:net_java",
"//net/android:net_java_test_support",
"//printing:printing_java",
- "//services:services_javatests",
+# "//services:services_javatests",
"//services/device/public/java:geolocation_java",
"//services/device/public/java:geolocation_java_test_support",
"//services/device/public/mojom:mojom_java",
@@ -1334,7 +1334,7 @@ android_library("chrome_test_java") {
"//third_party/android_deps:espresso_java",
"//third_party/android_deps:material_design_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
- "//third_party/android_deps/local_modifications/preconditions/javatests",
+# "//third_party/android_deps/local_modifications/preconditions/javatests",
"//third_party/android_sdk:android_support_chromium_java",
"//third_party/android_sdk:android_test_base_java",
"//third_party/android_sdk:android_test_mock_java",
@@ -2087,7 +2087,7 @@ _chrome_public_shared_deps = [
generate_jni("test_support_jni_headers") {
testonly = true
sources = [
- "javatests/src/org/chromium/chrome/browser/ServicificationBackgroundService.java",
+ #"javatests/src/org/chromium/chrome/browser/ServicificationBackgroundService.java",
"javatests/src/org/chromium/chrome/browser/offlinepages/OfflineTestUtil.java",
"javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchTestBridge.java",
"javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileFakeServer.java",
@@ -2099,7 +2099,7 @@ generate_jni("test_support_jni_headers") {
android_library("browser_java_test_support") {
testonly = true
sources = [
- "javatests/src/org/chromium/chrome/browser/ServicificationBackgroundService.java",
+ #"javatests/src/org/chromium/chrome/browser/ServicificationBackgroundService.java",
"javatests/src/org/chromium/chrome/browser/offlinepages/OfflineTestUtil.java",
"javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchTestBridge.java",
"javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileFakeServer.java",
@@ -2739,7 +2739,7 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
"//chrome/android/webapk/shell_apk:javatests_webapk",
"//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
"//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk",
- "//components/media_router/test/android/media_router_test_support:media_router_test_support_apk",
+# "//components/media_router/test/android/media_router_test_support:media_router_test_support_apk",
]
}
diff --git a/chrome/android/chrome_junit_test_java_sources.gni b/chrome/android/chrome_junit_test_java_sources.gni
--- a/chrome/android/chrome_junit_test_java_sources.gni
+++ b/chrome/android/chrome_junit_test_java_sources.gni
@@ -16,7 +16,7 @@ chrome_junit_test_java_sources = [
"junit/src/org/chromium/chrome/browser/autofill/AutofillUiUtilsTest.java",
"junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskSchedulerTest.java",
"junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskTest.java",
- "junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncGooglePlayServicesCheckerTest.java",
+ #"junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncGooglePlayServicesCheckerTest.java",
"junit/src/org/chromium/chrome/browser/background_sync/PeriodicBackgroundSyncChromeWakeUpTaskTest.java",
"junit/src/org/chromium/chrome/browser/background_task_scheduler/NativeBackgroundTaskTest.java",
"junit/src/org/chromium/chrome/browser/base/DexFixerTest.java",
@@ -92,15 +92,15 @@ chrome_junit_test_java_sources = [
"junit/src/org/chromium/chrome/browser/feedback/FeedFeedbackCollectorTest.java",
"junit/src/org/chromium/chrome/browser/findinpage/FindToolbarManagerTest.java",
"junit/src/org/chromium/chrome/browser/firstrun/FirstRunAppRestrictionInfoTest.java",
- "junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java",
+ #"junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java",
"junit/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationUnitTest.java",
- "junit/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessorTest.java",
+ #"junit/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessorTest.java",
"junit/src/org/chromium/chrome/browser/firstrun/PolicyLoadListenerUnitTest.java",
"junit/src/org/chromium/chrome/browser/firstrun/SkipTosDialogPolicyListenerUnitTest.java",
"junit/src/org/chromium/chrome/browser/firstrun/TosDialogBehaviorSharedPrefInvalidatorUnitTest.java",
"junit/src/org/chromium/chrome/browser/fonts/FontPreloaderUnitTest.java",
"junit/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManagerUnitTest.java",
- "junit/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelperTest.java",
+ #"junit/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelperTest.java",
"junit/src/org/chromium/chrome/browser/gsa/GSAStateUnitTest.java",
"junit/src/org/chromium/chrome/browser/history/HistoryAdapterAccessibilityTest.java",
"junit/src/org/chromium/chrome/browser/history/HistoryAdapterTest.java",
@@ -202,17 +202,17 @@ chrome_junit_test_java_sources = [
"junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceMetricsTest.java",
"junit/src/org/chromium/chrome/browser/search_engines/SearchEngineChoiceNotificationTest.java",
"junit/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapterTest.java",
- "junit/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfShareActivityTest.java",
+ #"junit/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfShareActivityTest.java",
"junit/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallMessageHandlerTest.java",
- "junit/src/org/chromium/chrome/browser/signin/SigninBridgeTest.java",
- "junit/src/org/chromium/chrome/browser/signin/SigninManagerImplTest.java",
- "junit/src/org/chromium/chrome/browser/signin/SyncConsentActivityLauncherImplTest.java",
- "junit/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorMediatorTest.java",
- "junit/src/org/chromium/chrome/browser/suggestions/SuggestionsImageFetcherTest.java",
+ #"junit/src/org/chromium/chrome/browser/signin/SigninBridgeTest.java",
+ #"junit/src/org/chromium/chrome/browser/signin/SigninManagerImplTest.java",
+ #"junit/src/org/chromium/chrome/browser/signin/SyncConsentActivityLauncherImplTest.java",
+ #"junit/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorMediatorTest.java",
+ #"junit/src/org/chromium/chrome/browser/suggestions/SuggestionsImageFetcherTest.java",
"junit/src/org/chromium/chrome/browser/survey/ChromeSurveyControllerFlowTest.java",
"junit/src/org/chromium/chrome/browser/survey/ChromeSurveyControllerTest.java",
"junit/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridgeUnitTest.java",
- "junit/src/org/chromium/chrome/browser/sync/AndroidSyncSettingsTest.java",
+ #"junit/src/org/chromium/chrome/browser/sync/AndroidSyncSettingsTest.java",
"junit/src/org/chromium/chrome/browser/tab/HistoricalTabSaverUnitTest.java",
"junit/src/org/chromium/chrome/browser/tab/TabAssociatedAppTest.java",
"junit/src/org/chromium/chrome/browser/tab/TabAttributesTest.java",
diff --git a/chrome/android/chrome_test_java_sources.gni b/chrome/android/chrome_test_java_sources.gni
--- a/chrome/android/chrome_test_java_sources.gni
+++ b/chrome/android/chrome_test_java_sources.gni
@@ -12,7 +12,7 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/AudioTest.java",
"javatests/src/org/chromium/chrome/browser/ChromeActionModeHandlerTest.java",
"javatests/src/org/chromium/chrome/browser/ChromeActivityTest.java",
- "javatests/src/org/chromium/chrome/browser/ChromeBackgroundServiceTest.java",
+# "javatests/src/org/chromium/chrome/browser/ChromeBackgroundServiceTest.java",
"javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java",
"javatests/src/org/chromium/chrome/browser/CopylessPasteTest.java",
"javatests/src/org/chromium/chrome/browser/ExampleUiCaptureTest.java",
@@ -37,7 +37,7 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/RestoreHistogramTest.java",
"javatests/src/org/chromium/chrome/browser/SafeBrowsingTest.java",
"javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java",
- "javatests/src/org/chromium/chrome/browser/ServicificationBackgroundServiceTest.java",
+# "javatests/src/org/chromium/chrome/browser/ServicificationBackgroundServiceTest.java",
"javatests/src/org/chromium/chrome/browser/ShareIntentTest.java",
"javatests/src/org/chromium/chrome/browser/SmartClipProviderTest.java",
"javatests/src/org/chromium/chrome/browser/TabCountLabelTest.java",
@@ -63,7 +63,7 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupWithKeyboardTest.java",
"javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java",
"javatests/src/org/chromium/chrome/browser/autofill/AutofillTestHelper.java",
- "javatests/src/org/chromium/chrome/browser/autofill/AutofillUpstreamTest.java",
+ #"javatests/src/org/chromium/chrome/browser/autofill/AutofillUpstreamTest.java",
"javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java",
"javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillLocalCardEditorTest.java",
"javatests/src/org/chromium/chrome/browser/autofill/settings/AutofillPaymentMethodsFragmentTest.java",
@@ -75,9 +75,9 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java",
"javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkEditTest.java",
"javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkModelTest.java",
- "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedPromoRenderTest.java",
- "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedSigninPromoDismissTest.java",
- "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedSigninPromoTest.java",
+ #"javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedPromoRenderTest.java",
+ #"javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedSigninPromoDismissTest.java",
+ #"javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkPersonalizedSigninPromoTest.java",
"javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java",
"javatests/src/org/chromium/chrome/browser/bookmarks/bottomsheet/BookmarkBottomSheetTest.java",
"javatests/src/org/chromium/chrome/browser/browserservices/ManageTrustedWebActivityDataActivityTest.java",
@@ -117,11 +117,11 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuItemViewTest.java",
"javatests/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuRenderTest.java",
"javatests/src/org/chromium/chrome/browser/contextmenu/RevampedContextMenuTest.java",
- "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFakeServer.java",
- "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInstrumentationTest.java",
- "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInternalStateControllerWrapper.java",
- "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java",
- "javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicyTest.java",
+ #"javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchFakeServer.java",
+ #"javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInstrumentationTest.java",
+ #"javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchInternalStateControllerWrapper.java",
+ #"javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java", try again later
+ #"javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicyTest.java",
"javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRequestTest.java",
"javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTest.java",
"javatests/src/org/chromium/chrome/browser/contextualsearch/MockContextualSearchPolicy.java",
@@ -206,10 +206,10 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/feedback/ConnectivityTaskTest.java",
"javatests/src/org/chromium/chrome/browser/findinpage/FindTest.java",
"javatests/src/org/chromium/chrome/browser/firstrun/DisableFirstRun.java",
- "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunActivityTestObserver.java",
- "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java",
- "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunUtilsTest.java",
- "javatests/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupportTest.java",
+ # "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunActivityTestObserver.java",
+ # "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunIntegrationTest.java",
+ # "javatests/src/org/chromium/chrome/browser/firstrun/FirstRunUtilsTest.java",
+ # "javatests/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupportTest.java",
"javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java",
"javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTestUtils.java",
"javatests/src/org/chromium/chrome/browser/gcore/MockConnectedTask.java",
@@ -244,7 +244,7 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java",
"javatests/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfobarTest.java",
"javatests/src/org/chromium/chrome/browser/infobar/SearchGeolocationDisclosureInfoBarTest.java",
- "javatests/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBarTest.java",
+ #"javatests/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBarTest.java",
"javatests/src/org/chromium/chrome/browser/init/ChainedTasksTest.java",
"javatests/src/org/chromium/chrome/browser/init/ChromeBrowserInitializerTest.java",
"javatests/src/org/chromium/chrome/browser/init/FirstDrawDetectorTest.java",
@@ -252,13 +252,13 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/init/StartupTabPreloaderTest.java",
"javatests/src/org/chromium/chrome/browser/init/StartupTabPreloaderUnitTest.java",
"javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java",
- "javatests/src/org/chromium/chrome/browser/instantapps/InstantAppsHandlerTest.java",
+# "javatests/src/org/chromium/chrome/browser/instantapps/InstantAppsHandlerTest.java",
"javatests/src/org/chromium/chrome/browser/interstitials/LookalikeInterstitialTest.java",
"javatests/src/org/chromium/chrome/browser/javascript/ModalCloseWatcherTest.java",
"javatests/src/org/chromium/chrome/browser/javascript/WebContextFetcherTest.java",
"javatests/src/org/chromium/chrome/browser/jsdialog/JavascriptAppModalDialogTest.java",
"javatests/src/org/chromium/chrome/browser/jsdialog/JavascriptTabModalDialogTest.java",
- "javatests/src/org/chromium/chrome/browser/language/AppLocaleUtilsTest.java",
+# "javatests/src/org/chromium/chrome/browser/language/AppLocaleUtilsTest.java",
"javatests/src/org/chromium/chrome/browser/language/settings/LanguageSettingsTest.java",
"javatests/src/org/chromium/chrome/browser/locale/DefaultSearchEngineDialogHelperTest.java",
"javatests/src/org/chromium/chrome/browser/locale/DefaultSearchEngineDialogHelperUtils.java",
@@ -266,12 +266,12 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/locale/LocaleManagerReferralTest.java",
"javatests/src/org/chromium/chrome/browser/locale/LocaleManagerTest.java",
"javatests/src/org/chromium/chrome/browser/login/ChromeHttpAuthHandlerTest.java",
- "javatests/src/org/chromium/chrome/browser/media/MediaLauncherActivityTest.java",
+ # "javatests/src/org/chromium/chrome/browser/media/MediaLauncherActivityTest.java",
"javatests/src/org/chromium/chrome/browser/media/MediaViewerUtilsTest.java",
- "javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java",
- "javatests/src/org/chromium/chrome/browser/media/ui/AutoplayMutedNotificationTest.java",
- "javatests/src/org/chromium/chrome/browser/media/ui/MediaSessionTest.java",
- "javatests/src/org/chromium/chrome/browser/media/ui/PictureInPictureControllerTest.java",
+ # "javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java",
+ # "javatests/src/org/chromium/chrome/browser/media/ui/AutoplayMutedNotificationTest.java",
+ # "javatests/src/org/chromium/chrome/browser/media/ui/MediaSessionTest.java",
+ # "javatests/src/org/chromium/chrome/browser/media/ui/PictureInPictureControllerTest.java",
"javatests/src/org/chromium/chrome/browser/metrics/BackgroundMetricsTest.java",
"javatests/src/org/chromium/chrome/browser/metrics/MainIntentBehaviorMetricsIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/metrics/PageLoadMetricsTest.java",
@@ -303,7 +303,7 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java",
"javatests/src/org/chromium/chrome/browser/ntp/RecentTabsPageTest.java",
"javatests/src/org/chromium/chrome/browser/ntp/TitleUtilTest.java",
- "javatests/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoTest.java",
+ #"javatests/src/org/chromium/chrome/browser/ntp/cards/promo/enhanced_protection/EnhancedProtectionPromoTest.java",
"javatests/src/org/chromium/chrome/browser/offline/measurements/OfflineMeasurementsBackgroundTaskTest.java",
"javatests/src/org/chromium/chrome/browser/offlinepages/MHTMLPageTest.java",
"javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageArchivePublisherBridgeTest.java",
@@ -314,10 +314,10 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/offlinepages/RecentTabsTest.java",
"javatests/src/org/chromium/chrome/browser/offlinepages/RequestCoordinatorBridgeTest.java",
"javatests/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerTest.java",
- "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskTest.java",
- "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchConfigurationTest.java",
- "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/TestOfflinePageService.java",
- "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/TestSuggestionsService.java",
+ # "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskTest.java",
+ # "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchConfigurationTest.java",
+ # "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/TestOfflinePageService.java",
+ # "javatests/src/org/chromium/chrome/browser/offlinepages/prefetch/TestSuggestionsService.java",
"javatests/src/org/chromium/chrome/browser/omaha/ExponentialBackoffSchedulerTest.java",
"javatests/src/org/chromium/chrome/browser/omaha/MockExponentialBackoffScheduler.java",
"javatests/src/org/chromium/chrome/browser/omaha/OmahaBaseTest.java",
@@ -371,12 +371,12 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageUnitTest.java",
"javatests/src/org/chromium/chrome/browser/password_manager/PasswordGenerationDialogTest.java",
"javatests/src/org/chromium/chrome/browser/password_manager/PasswordManagerDialogTest.java",
- "javatests/src/org/chromium/chrome/browser/password_manager/settings/FakePasswordManagerHandler.java",
- "javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsExportTest.java",
- "javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsSearchTest.java",
- "javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsTest.java",
- "javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsTestHelper.java",
- "javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordViewingTypeTest.java",
+ #"javatests/src/org/chromium/chrome/browser/password_manager/settings/FakePasswordManagerHandler.java",
+ #"javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsExportTest.java",
+ #"javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsSearchTest.java",
+ #"javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsTest.java",
+ #"javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettingsTestHelper.java",
+ #"javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordViewingTypeTest.java",
"javatests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderTest.java",
"javatests/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderUnitTest.java",
"javatests/src/org/chromium/chrome/browser/payments/CurrencyFormatterTest.java",
@@ -488,7 +488,7 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/provider/ProviderBookmarksUriTest.java",
"javatests/src/org/chromium/chrome/browser/provider/ProviderSearchesUriTest.java",
"javatests/src/org/chromium/chrome/browser/provider/ProviderTestRule.java",
- "javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java",
+ #"javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java",
"javatests/src/org/chromium/chrome/browser/query_tiles/ListMatchers.java",
"javatests/src/org/chromium/chrome/browser/query_tiles/OmniboxQueryTileSuggestionTest.java",
"javatests/src/org/chromium/chrome/browser/query_tiles/QueryTileSectionTest.java",
@@ -510,9 +510,9 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/share/ShareDelegateImplIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/share/ShareDelegateImplTest.java",
"javatests/src/org/chromium/chrome/browser/share/ShareUrlTest.java",
- "javatests/src/org/chromium/chrome/browser/signin/IdentityManagerIntegrationTest.java",
- "javatests/src/org/chromium/chrome/browser/signin/SigninSignoutIntegrationTest.java",
- "javatests/src/org/chromium/chrome/browser/signin/SyncConsentFragmentTest.java",
+ #"javatests/src/org/chromium/chrome/browser/signin/IdentityManagerIntegrationTest.java",
+ #"javatests/src/org/chromium/chrome/browser/signin/SigninSignoutIntegrationTest.java",
+ #"javatests/src/org/chromium/chrome/browser/signin/SyncConsentFragmentTest.java",
"javatests/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegateTest.java",
"javatests/src/org/chromium/chrome/browser/site_settings/CookieControlsBridgeTest.java",
"javatests/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridgeTest.java",
@@ -531,25 +531,25 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/suggestions/tile/TileGroupTest.java",
"javatests/src/org/chromium/chrome/browser/suggestions/tile/TileGroupUnitTest.java",
"javatests/src/org/chromium/chrome/browser/survey/ChromeSurveyControllerIntegrationTest.java",
- "javatests/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridgeTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/AccountManagementFragmentTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/FakeProfileSyncService.java",
- "javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/GoogleServicesSettingsTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/ManageSyncSettingsTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/ManageSyncSettingsWithFakeProfileSyncServiceTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/SyncAndServicesSettingsTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/SyncAndServicesSettingsWithFakeProfileSyncServiceTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/SyncErrorCardPreferenceTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/SyncTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java",
- "javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/UkmTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java",
- "javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java",
+ # "javatests/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridgeTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/AccountManagementFragmentTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/AutofillTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/BookmarksTest.java",
+ #"javatests/src/org/chromium/chrome/browser/sync/FakeProfileSyncService.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/FirstRunTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/GoogleServicesSettingsTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/ManageSyncSettingsTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/ManageSyncSettingsWithFakeProfileSyncServiceTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/OpenTabsTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/SyncAndServicesSettingsTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/SyncAndServicesSettingsWithFakeProfileSyncServiceTest.java",
+ #"javatests/src/org/chromium/chrome/browser/sync/SyncErrorCardPreferenceTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/SyncTest.java",
+ #"javatests/src/org/chromium/chrome/browser/sync/SyncTestRule.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/UkmTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseActivityTest.java",
+ # "javatests/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragmentTest.java",
"javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java",
"javatests/src/org/chromium/chrome/browser/tab/RepostFormWarningTest.java",
"javatests/src/org/chromium/chrome/browser/tab/SadTabTest.java",
@@ -635,10 +635,10 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenIconTest.java",
"javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenTest.java",
"javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenThemeColorTest.java",
- "javatests/src/org/chromium/chrome/browser/webauth/AuthenticatorTest.java",
- "javatests/src/org/chromium/chrome/browser/webauth/Fido2ApiTestHelper.java",
- "javatests/src/org/chromium/chrome/browser/webauth/Fido2CredentialRequestTest.java",
- "javatests/src/org/chromium/chrome/browser/webauth/Fido2HelperTest.java",
+ # "javatests/src/org/chromium/chrome/browser/webauth/AuthenticatorTest.java",
+ # "javatests/src/org/chromium/chrome/browser/webauth/Fido2ApiTestHelper.java",
+ # "javatests/src/org/chromium/chrome/browser/webauth/Fido2CredentialRequestTest.java",
+ # "javatests/src/org/chromium/chrome/browser/webauth/Fido2HelperTest.java",
"javatests/src/org/chromium/chrome/browser/webshare/WebShareTest.java",
"javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetControllerTest.java",
"javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetTest.java",
diff --git a/chrome/android/features/keyboard_accessory/BUILD.gn b/chrome/android/features/keyboard_accessory/BUILD.gn
--- a/chrome/android/features/keyboard_accessory/BUILD.gn
+++ b/chrome/android/features/keyboard_accessory/BUILD.gn
@@ -37,7 +37,7 @@ android_library("test_java") {
"javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingTestHelper.java",
"javatests/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingUiCaptureTest.java",
- "javatests/src/org/chromium/chrome/browser/keyboard_accessory/PasswordGenerationIntegrationTest.java",
+ #"javatests/src/org/chromium/chrome/browser/keyboard_accessory/PasswordGenerationIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/keyboard_accessory/all_passwords_bottom_sheet/AllPasswordsBottomSheetViewTest.java",
"javatests/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryModernViewTest.java",
diff --git a/chrome/android/features/tab_ui/tab_management_java_sources.gni b/chrome/android/features/tab_ui/tab_management_java_sources.gni
--- a/chrome/android/features/tab_ui/tab_management_java_sources.gni
+++ b/chrome/android/features/tab_ui/tab_management_java_sources.gni
@@ -37,7 +37,7 @@ tab_management_test_java_sources = [
"//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/MessageCardViewBinderTest.java",
"//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceAlertsMessageCardTest.java",
"//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingDialogTest.java",
- "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilitiesTest.java",
+ #"//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilitiesTest.java",
"//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/RecyclerViewMatcherUtils.java",
"//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridAccessibilityHelperTest.java",
"//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogTest.java",
diff --git a/chrome/android/feed/feed_java_sources.gni b/chrome/android/feed/feed_java_sources.gni
--- a/chrome/android/feed/feed_java_sources.gni
+++ b/chrome/android/feed/feed_java_sources.gni
@@ -49,7 +49,7 @@ feed_srcjar_deps = []
feed_junit_test_java_sources = [
"junit/src/org/chromium/chrome/browser/feed/v2/FakeLinearLayoutManager.java",
"junit/src/org/chromium/chrome/browser/feed/v2/FeedListContentManagerTest.java",
- "junit/src/org/chromium/chrome/browser/feed/v2/FeedProcessScopeDependencyProviderTest.java",
+ #"junit/src/org/chromium/chrome/browser/feed/v2/FeedProcessScopeDependencyProviderTest.java",
"junit/src/org/chromium/chrome/browser/feed/v2/FeedSliceViewTrackerTest.java",
"junit/src/org/chromium/chrome/browser/feed/v2/FeedStreamSurfaceTest.java",
"junit/src/org/chromium/chrome/browser/feed/v2/FeedStreamTest.java",
@@ -58,10 +58,6 @@ feed_junit_test_java_sources = [
feed_test_java_sources = [
"//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/HeaderIphScrollListenerTest.java",
- "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/v2/FeedProcessScopeDependencyProviderNativeTest.java",
- "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/v2/FeedV2NewTabPageTest.java",
- "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/v2/FeedV2TestHelper.java",
- "//chrome/android/feed/core/javatests/src/org/chromium/chrome/browser/feed/v2/TestFeedServer.java",
]
feed_test_deps = feed_deps + [
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
@@ -77,7 +77,7 @@ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.sync.ProfileSyncService;
+//import org.chromium.chrome.browser.sync.ProfileSyncService;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
@@ -146,8 +146,8 @@ public class BookmarkTest {
private GURL mTestPageFoo;
private EmbeddedTestServer mTestServer;
private @Nullable BookmarkActivity mBookmarkActivity;
- @Mock
- private ProfileSyncService mProfileSyncService;
+// @Mock
+// private ProfileSyncService mProfileSyncService;
private UserActionTester mActionTester;
@BeforeClass
@@ -170,9 +170,9 @@ public class BookmarkTest {
mBookmarkBridge = mActivityTestRule.getActivity().getBookmarkBridgeForTesting();
// Stub ProfileSyncService state to make sure promos aren't suppressed.
- when(mProfileSyncService.isSyncAllowedByPlatform()).thenReturn(true);
- when(mProfileSyncService.isSyncRequested()).thenReturn(false);
- ProfileSyncService.overrideForTests(mProfileSyncService);
+ // when(mProfileSyncService.isSyncAllowedByPlatform()).thenReturn(true);
+ // when(mProfileSyncService.isSyncRequested()).thenReturn(false);
+ // ProfileSyncService.overrideForTests(mProfileSyncService);
});
mTestServer = EmbeddedTestServer.createAndStartServer(InstrumentationRegistry.getContext());
mTestUrlA = new GURL("http://a.com");
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasicTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasicTest.java
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasicTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasicTest.java
@@ -24,7 +24,7 @@ import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment.DialogOption;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
-import org.chromium.chrome.browser.sync.ProfileSyncService;
+//import org.chromium.chrome.browser.sync.ProfileSyncService;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
@@ -69,28 +69,28 @@ public class ClearBrowsingDataFragmentBasicTest {
// Can only construct StubProfileSyncService after native was initialized by
// startMainActivityOnBlankPage() above.
mStubProfileSyncService = new StubProfileSyncService();
- ProfileSyncService.overrideForTests(mStubProfileSyncService);
+// ProfileSyncService.overrideForTests(mStubProfileSyncService);
});
}
@After
public void tearDown() {
- TestThreadUtils.runOnUiThreadBlocking(() -> ProfileSyncService.resetForTests());
+// TestThreadUtils.runOnUiThreadBlocking(() -> ProfileSyncService.resetForTests());
}
- private static class StubProfileSyncService extends ProfileSyncService {
+ private static class StubProfileSyncService /*extends ProfileSyncService*/ {
private boolean mSyncable;
public void setSyncable(boolean syncable) {
mSyncable = syncable;
}
- @Override
+ //@Override
public boolean isSyncRequested() {
return mSyncable;
}
- @Override
+ //@Override
public Set<Integer> getActiveDataTypes() {
return mSyncable ? CollectionUtil.newHashSet(ModelType.HISTORY_DELETE_DIRECTIVES)
: new HashSet<Integer>();
@@ -135,7 +135,7 @@ public class ClearBrowsingDataFragmentBasicTest {
public void testCheckBoxTextSignedInButNotSyncing() {
mAccountManagerTestRule.addTestAccountThenSigninAndEnableSync();
// Simulate that Sync was stopped but the primary account remained.
- TestThreadUtils.runOnUiThreadBlocking(() -> mStubProfileSyncService.setSyncable(false));
+ //TestThreadUtils.runOnUiThreadBlocking(() -> mStubProfileSyncService.setSyncable(false));
mSettingsActivityTestRule.startSettingsActivity();
@@ -164,7 +164,7 @@ public class ClearBrowsingDataFragmentBasicTest {
@SmallTest
public void testCheckBoxTextSignedInAndSyncing() {
mAccountManagerTestRule.addTestAccountThenSigninAndEnableSync();
- TestThreadUtils.runOnUiThreadBlocking(() -> mStubProfileSyncService.setSyncable(true));
+ //TestThreadUtils.runOnUiThreadBlocking(() -> mStubProfileSyncService.setSyncable(true));
mSettingsActivityTestRule.startSettingsActivity();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java
@@ -49,10 +49,9 @@ import org.chromium.chrome.browser.incognito.IncognitoUtils;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
-import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
+//import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
import org.chromium.components.browser_ui.widget.DateDividedAdapter;
import org.chromium.components.browser_ui.widget.RecyclerViewTestUtils;
import org.chromium.components.browser_ui.widget.selectable_list.SelectableItemView;
@@ -554,17 +553,17 @@ public class HistoryActivityTest {
mPrefChangeRegistrar = new PrefChangeRegistrar();
mPrefChangeRegistrar.addObserver(Pref.ALLOW_DELETING_BROWSER_HISTORY, mTestObserver);
mPrefChangeRegistrar.addObserver(Pref.INCOGNITO_MODE_AVAILABILITY, mTestObserver);
- IdentityServicesProvider.get()
- .getSigninManager(Profile.getLastUsedRegularProfile())
- .addSignInStateObserver(mTestObserver);
+ // IdentityServicesProvider.get()
+ // .getSigninManager(Profile.getLastUsedRegularProfile())
+ // .addSignInStateObserver(mTestObserver);
});
// Sign in to account. Note that if supervised user is set before sign in, the supervised
// user setting will be reset.
final CoreAccountInfo coreAccountInfo =
mAccountManagerTestRule.addTestAccountThenSigninAndEnableSync();
- mTestObserver.onSigninStateChangedCallback.waitForCallback(
- 0, 1, SyncTestUtil.TIMEOUT_MS, TimeUnit.MILLISECONDS);
+ // mTestObserver.onSigninStateChangedCallback.waitForCallback(
+ // 0, 1, SyncTestUtil.TIMEOUT_MS, TimeUnit.MILLISECONDS);
Assert.assertEquals(coreAccountInfo, mAccountManagerTestRule.getCurrentSignedInAccount());
// Wait for recycler view changes after sign in.
@@ -606,19 +605,19 @@ public class HistoryActivityTest {
// Sign out of account.
int currentCallCount = mTestObserver.onSigninStateChangedCallback.getCallCount();
- TestThreadUtils.runOnUiThreadBlocking(
- ()
- -> IdentityServicesProvider.get()
- .getSigninManager(Profile.getLastUsedRegularProfile())
- .signOut(SignoutReason.SIGNOUT_TEST));
+ // TestThreadUtils.runOnUiThreadBlocking(
+ // ()
+ // -> IdentityServicesProvider.get()
+ // .getSigninManager(Profile.getLastUsedRegularProfile())
+ // .signOut(SignoutReason.SIGNOUT_TEST));
mTestObserver.onSigninStateChangedCallback.waitForCallback(currentCallCount, 1);
Assert.assertNull(mAccountManagerTestRule.getCurrentSignedInAccount());
// Remove observer
- TestThreadUtils.runOnUiThreadBlocking(
- ()
- -> IdentityServicesProvider.get()
- .getSigninManager(Profile.getLastUsedRegularProfile())
- .removeSignInStateObserver(mTestObserver));
+ // TestThreadUtils.runOnUiThreadBlocking(
+ // ()
+ // -> IdentityServicesProvider.get()
+ // .getSigninManager(Profile.getLastUsedRegularProfile())
+ // .removeSignInStateObserver(mTestObserver));
}
}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageColorWithFeedV2Test.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageColorWithFeedV2Test.java
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageColorWithFeedV2Test.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageColorWithFeedV2Test.java
@@ -22,8 +22,7 @@ import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.Restriction;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.feed.v2.FeedStreamSurface;
-import org.chromium.chrome.browser.feed.v2.FeedV2TestHelper;
-import org.chromium.chrome.browser.feed.v2.TestFeedServer;
+//import org.chromium.chrome.browser.feed.v2.FeedV2TestHelper;
import org.chromium.chrome.browser.firstrun.FirstRunUtils;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -58,8 +57,6 @@ public class NewTabPageColorWithFeedV2Test {
private Tab mTab;
private NewTabPage mNtp;
- private TestFeedServer mFeedServer;
-
@Before
public void setUp() throws Exception {
mActivityTestRule.startMainActivityWithURL("about:blank");
@@ -74,8 +71,6 @@ public class NewTabPageColorWithFeedV2Test {
FirstRunUtils.setEulaAccepted();
});
- mFeedServer = new TestFeedServer();
-
mActivityTestRule.loadUrl(UrlConstants.NTP_URL);
mTab = mActivityTestRule.getActivity().getActivityTab();
NewTabPageTestUtils.waitForNtpLoaded(mTab);
@@ -102,8 +97,8 @@ public class NewTabPageColorWithFeedV2Test {
mNtp.getToolbarTextBoxBackgroundColor(Color.BLACK));
// Wait for the test feed items to be available in the feed.
- FeedV2TestHelper.waitForRecyclerItems(MIN_ITEMS_AFTER_LOAD,
- (RecyclerView) mNtp.getCoordinatorForTesting().getStreamForTesting().getView());
+ //FeedV2TestHelper.waitForRecyclerItems(MIN_ITEMS_AFTER_LOAD,
+ // (RecyclerView) mNtp.getCoordinatorForTesting().getStreamForTesting().getView());
// Scroll to the bottom.
RecyclerViewTestUtils.scrollToBottom(recycleView);
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchServiceRenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchServiceRenderTest.java
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchServiceRenderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchServiceRenderTest.java
@@ -80,7 +80,7 @@ public class AssistantVoiceSearchServiceRenderTest {
GSAState.setInstanceForTesting(mGsaState);
doReturn(true).when(mExternalAuthUtils).isGoogleSigned(anyString());
- doReturn(true).when(mExternalAuthUtils).isChromeGoogleSigned();
+ //doReturn(true).when(mExternalAuthUtils).isChromeGoogleSigned();
ExternalAuthUtils.setInstanceForTesting(mExternalAuthUtils);
mActivityTestRule.startMainActivityOnBlankPage();
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordViewingTypeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordViewingTypeTest.java
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordViewingTypeTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/password_manager/settings/PasswordViewingTypeTest.java
@@ -22,7 +22,7 @@ import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.settings.MainSettings;
import org.chromium.chrome.browser.settings.SettingsActivityTestRule;
-import org.chromium.chrome.browser.sync.ProfileSyncService;
+//import org.chromium.chrome.browser.sync.ProfileSyncService;
import org.chromium.chrome.test.ChromeBrowserTestRule;
import org.chromium.components.browser_ui.settings.ChromeBasePreference;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/settings/MainSettingsFragmentTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/settings/MainSettingsFragmentTest.java
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/settings/MainSettingsFragmentTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/settings/MainSettingsFragmentTest.java
@@ -61,22 +61,13 @@ import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
-import org.chromium.chrome.browser.signin.SigninActivityLauncherImpl;
import org.chromium.chrome.browser.signin.ui.SigninActivityLauncher;
-import org.chromium.chrome.browser.sync.ProfileSyncService;
-import org.chromium.chrome.browser.sync.SyncTestRule;
-import org.chromium.chrome.browser.sync.settings.SignInPreference;
-import org.chromium.chrome.browser.sync.settings.SyncAndServicesSettings;
-import org.chromium.chrome.browser.sync.settings.SyncPromoPreference;
-import org.chromium.chrome.browser.sync.settings.SyncPromoPreference.State;
import org.chromium.chrome.browser.tracing.settings.DeveloperSettings;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.util.ChromeRenderTestRule;
import org.chromium.chrome.test.util.browser.Features;
import org.chromium.chrome.test.util.browser.Features.DisableFeatures;
import org.chromium.chrome.test.util.browser.Features.EnableFeatures;
-import org.chromium.chrome.test.util.browser.signin.SigninTestUtil;
-import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
import org.chromium.components.browser_ui.site_settings.SiteSettings;
import org.chromium.components.search_engines.TemplateUrl;
import org.chromium.components.search_engines.TemplateUrlService;
@@ -99,16 +90,14 @@ public class MainSettingsFragmentTest {
private final HomepageTestRule mHomepageTestRule = new HomepageTestRule();
- private final SyncTestRule mSyncTestRule = new SyncTestRule();
-
private final SettingsActivityTestRule<MainSettings> mSettingsActivityTestRule =
new SettingsActivityTestRule<>(MainSettings.class);
// SettingsActivity needs to be initialized and destroyed with the mock
// signin environment setup in SyncTestRule
@Rule
- public final RuleChain mRuleChain = RuleChain.outerRule(mSyncTestRule)
- .around(mHomepageTestRule)
+ public final RuleChain mRuleChain = RuleChain
+ .outerRule(mHomepageTestRule)
.around(mSettingsActivityTestRule);
@Rule
@@ -136,7 +125,6 @@ public class MainSettingsFragmentTest {
MockitoAnnotations.initMocks(this);
InstrumentationRegistry.getInstrumentation().setInTouchMode(true);
PasswordCheckFactory.setPasswordCheckForTesting(mPasswordCheck);
- SigninActivityLauncherImpl.setLauncherForTest(mMockSigninActivityLauncher);
DeveloperSettings.setIsEnabledForTests(true);
NightModeUtils.setNightModeSupportedForTesting(true);
}
@@ -170,176 +158,6 @@ public class MainSettingsFragmentTest {
Mockito.doReturn(SEARCH_ENGINE_SHORT_NAME).when(mMockSearchEngine).getShortName();
}
- @Test
- @LargeTest
- @Feature({"RenderTest"})
- @DisableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
- public void testRenderDifferentSignedInStates() throws IOException {
- launchSettingsActivity();
- View view = mSettingsActivityTestRule.getActivity()
- .findViewById(android.R.id.content)
- .getRootView();
- mRenderTestRule.render(view, "main_settings_signed_out");
-
- // Sign in and render changes.
- mSyncTestRule.setUpAccountAndEnableSyncForTesting();
- SyncTestUtil.waitForSyncFeatureActive();
- mRenderTestRule.render(view, "main_settings_signed_in");
- }
-
- @Test
- @LargeTest
- @Feature({"RenderTest"})
- @EnableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
- public void testRenderDifferentSignedInStatesWithMobileIdentityConsistency()
- throws IOException {
- launchSettingsActivity();
- // Scroll to the middle of the page because the preference is supposed to be at the middle
- // of the page.
- TestThreadUtils.runOnUiThreadBlocking(() -> {
- RecyclerView recyclerView =
- mSettingsActivityTestRule.getFragment().getView().findViewById(
- R.id.recycler_view);
- recyclerView.scrollToPosition(recyclerView.getAdapter().getItemCount() / 2);
- });
- View view = mSettingsActivityTestRule.getActivity()
- .findViewById(android.R.id.content)
- .getRootView();
- mRenderTestRule.render(view, "main_settings_signed_out_mobile_identity_consistency");
-
- // Sign in and render changes.
- mSyncTestRule.setUpAccountAndEnableSyncForTesting();
- SyncTestUtil.waitForSyncFeatureActive();
- mRenderTestRule.render(view, "main_settings_signed_in_mobile_identity_consistency");
- }
-
- /**
- * Test for the "Account" section.
- *
- * TODO(crbug.com/1098205): remove code to explicitly enable Safety Check and Password check,
- * once the flags are on by default.
- */
- @Test
- @SmallTest
- @DisableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
- public void testStartup() {
- launchSettingsActivity();
-
- // For non-signed-in users, the section contains the generic header.
- assertSettingsExists(MainSettings.PREF_SIGN_IN, null);
- assertSettingsExists(MainSettings.PREF_SYNC_AND_SERVICES, SyncAndServicesSettings.class);
-
- // SignInPreference status check.
- // As the user is not signed in, sign in promo will show, section header will be hidden.
- Assert.assertFalse("Account section header should be hidden.",
- mMainSettings.findPreference(MainSettings.PREF_ACCOUNT_SECTION).isVisible());
-
- // Assert for "Basics" section
- assertSettingsExists(MainSettings.PREF_SEARCH_ENGINE, SearchEngineSettings.class);
- assertSettingsExists(MainSettings.PREF_PASSWORDS, PasswordSettings.class);
- assertSettingsExists("autofill_payment_methods", AutofillPaymentMethodsFragment.class);
- assertSettingsExists("autofill_addresses", AutofillProfilesFragment.class);
- assertSettingsExists(MainSettings.PREF_NOTIFICATIONS, NotificationSettings.class);
- assertSettingsExists(MainSettings.PREF_HOMEPAGE, HomepageSettings.class);
- assertSettingsExists(MainSettings.PREF_UI_THEME, ThemeSettingsFragment.class);
-
- // Verification for summary for the search engine and the homepage
- Assert.assertEquals("Homepage summary is different than homepage state",
- mMainSettings.getString(R.string.text_on),
- mMainSettings.findPreference(MainSettings.PREF_HOMEPAGE).getSummary().toString());
-
- // Assert for advanced section
- assertSettingsExists("privacy", PrivacySettings.class);
- assertSettingsExists(MainSettings.PREF_SAFETY_CHECK, SafetyCheckSettingsFragment.class);
- assertSettingsExists("accessibility", AccessibilitySettings.class);
- assertSettingsExists("content_settings", SiteSettings.class);
- assertSettingsExists("languages", LanguageSettings.class);
- assertSettingsExists(
- MainSettings.PREF_DATA_REDUCTION, DataReductionPreferenceFragment.class);
- assertSettingsExists(MainSettings.PREF_DOWNLOADS, DownloadSettings.class);
- assertSettingsExists(MainSettings.PREF_DEVELOPER, DeveloperSettings.class);
- assertSettingsExists("about_chrome", AboutChromeSettings.class);
- }
-
- /**
- * Test for the "Account" section.
- *
- * TODO(crbug.com/1098205): remove code to explicitly enable Safety Check and Password check,
- * once the flags are on by default.
- */
- @Test
- @SmallTest
- @EnableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
- public void testStartupWithMobileIdentityConsistency() {
- launchSettingsActivity();
-
- // For non-signed-in users, the section contains the generic header.
- assertSettingsExists(MainSettings.PREF_SIGN_IN, null);
- Assert.assertTrue("Google services preference should be shown",
- mMainSettings.findPreference(MainSettings.PREF_GOOGLE_SERVICES).isVisible());
-
- // SignInPreference status check.
- // As the user is not signed in, sign in promo will show, section header and sync preference
- // will be hidden.
- Assert.assertFalse("Account section header should be hidden.",
- mMainSettings.findPreference(MainSettings.PREF_ACCOUNT_AND_GOOGLE_SERVICES_SECTION)
- .isVisible());
- Assert.assertFalse("Sync preference should be hidden",
- mMainSettings.findPreference(MainSettings.PREF_MANAGE_SYNC).isVisible());
-
- // Assert for "Basics" section
- assertSettingsExists(MainSettings.PREF_SEARCH_ENGINE, SearchEngineSettings.class);
- assertSettingsExists(MainSettings.PREF_PASSWORDS, PasswordSettings.class);
- assertSettingsExists("autofill_payment_methods", AutofillPaymentMethodsFragment.class);
- assertSettingsExists("autofill_addresses", AutofillProfilesFragment.class);
- assertSettingsExists(MainSettings.PREF_NOTIFICATIONS, NotificationSettings.class);
- assertSettingsExists(MainSettings.PREF_HOMEPAGE, HomepageSettings.class);
- assertSettingsExists(MainSettings.PREF_UI_THEME, ThemeSettingsFragment.class);
-
- // Verification for summary for the search engine and the homepage
- Assert.assertEquals("Homepage summary is different than homepage state",
- mMainSettings.getString(R.string.text_on),
- mMainSettings.findPreference(MainSettings.PREF_HOMEPAGE).getSummary().toString());
-
- // Assert for advanced section
- assertSettingsExists("privacy", PrivacySettings.class);
- assertSettingsExists(MainSettings.PREF_SAFETY_CHECK, SafetyCheckSettingsFragment.class);
- assertSettingsExists("accessibility", AccessibilitySettings.class);
- assertSettingsExists("content_settings", SiteSettings.class);
- assertSettingsExists("languages", LanguageSettings.class);
- assertSettingsExists(
- MainSettings.PREF_DATA_REDUCTION, DataReductionPreferenceFragment.class);
- assertSettingsExists(MainSettings.PREF_DOWNLOADS, DownloadSettings.class);
- assertSettingsExists(MainSettings.PREF_DEVELOPER, DeveloperSettings.class);
- assertSettingsExists("about_chrome", AboutChromeSettings.class);
- }
-
- @Test
- @SmallTest
- @EnableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
- public void testSyncRowLaunchesSignInFlowForSignedInAccounts() {
- CoreAccountInfo accountInfo = mSyncTestRule.setUpAccountAndSignInForTesting();
- launchSettingsActivity();
-
- onView(withText(R.string.sync_category_title)).perform(click());
- verify(mMockSigninActivityLauncher)
- .launchActivityForPromoDefaultFlow(any(Activity.class),
- eq(SigninAccessPoint.SETTINGS), eq(accountInfo.getEmail()));
- }
-
- @Test
- @SmallTest
- @EnableFeatures(ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY)
- public void testSyncRowSummaryWhenNoDataTypeSynced() {
- TestThreadUtils.runOnUiThreadBlocking(
- () -> { ProfileSyncService.get().setChosenDataTypes(false, new HashSet<>()); });
- CoreAccountInfo account = mSyncTestRule.addTestAccount();
- TestThreadUtils.runOnUiThreadBlocking(
- () -> { SigninTestUtil.signinAndEnableSync(account, ProfileSyncService.get()); });
- launchSettingsActivity();
- onView(withText(R.string.sync_data_types_off)).check(matches(isDisplayed()));
- }
-
@Test
@SmallTest
public void testSafeBrowsingSecuritySectionUiFlagOn() {
@@ -377,82 +195,6 @@ public class MainSettingsFragmentTest {
TextUtils.isEmpty(searchEngineSettings.getSummary()));
}
- /**
- * Test when the sign-in preference is the promo. The section header should be hidden.
- */
- @Test
- @SmallTest
- @DisableFeatures({ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY})
- public void testAccountSignIn() {
- launchSettingsActivity();
-
- SyncPromoPreference syncPromoPreference =
- (SyncPromoPreference) mMainSettings.findPreference(MainSettings.PREF_SYNC_PROMO);
- Assert.assertEquals(
- "SyncPromoPreference should be at the personalized signin promo state. ",
- syncPromoPreference.getState(), State.PERSONALIZED_SIGNIN_PROMO);
- Assert.assertFalse("Account section header should be hidden when promo is shown.",
- mMainSettings.findPreference(MainSettings.PREF_ACCOUNT_SECTION).isVisible());
-
- // SignIn to see the changes
- mSyncTestRule.setUpAccountAndEnableSyncForTesting();
- SyncTestUtil.waitForSyncFeatureActive();
- SignInPreference signInPreference =
- (SignInPreference) assertSettingsExists(MainSettings.PREF_SIGN_IN, null);
- Assert.assertEquals("SignInPreference should be at the signed in state. ",
- signInPreference.getState(), SignInPreference.State.SIGNED_IN);
- Assert.assertNotNull("Account section header should appear when user signed in.",
- mMainSettings.findPreference(MainSettings.PREF_ACCOUNT_SECTION));
- }
-
- /**
- * Test when the sign-in preference is the promo. The section header should be hidden.
- */
- @Test
- @SmallTest
- @Features.EnableFeatures({ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY})
- public void testAccountSignInWithMobileIdentityConsistency() throws InterruptedException {
- launchSettingsActivity();
-
- SyncPromoPreference syncPromoPreference =
- (SyncPromoPreference) mMainSettings.findPreference(MainSettings.PREF_SYNC_PROMO);
- Assert.assertEquals(
- "SyncPromoPreference should be at the personalized signin promo state. ",
- syncPromoPreference.getState(), State.PERSONALIZED_SIGNIN_PROMO);
- Assert.assertFalse("Account section header should be hidden when promo is shown.",
- mMainSettings.findPreference(MainSettings.PREF_ACCOUNT_AND_GOOGLE_SERVICES_SECTION)
- .isVisible());
- Assert.assertFalse("Sync preference should be hidden when promo is shown.",
- mMainSettings.findPreference(MainSettings.PREF_MANAGE_SYNC).isVisible());
-
- // SignIn to see the changes
- mSyncTestRule.setUpAccountAndEnableSyncForTesting();
- SyncTestUtil.waitForSyncFeatureActive();
- SignInPreference signInPreference =
- (SignInPreference) assertSettingsExists(MainSettings.PREF_SIGN_IN, null);
- Assert.assertEquals("SignInPreference should be at the signed in state. ",
- signInPreference.getState(), SignInPreference.State.SIGNED_IN);
- Assert.assertTrue("Account section header should appear when user signed in.",
- mMainSettings.findPreference(MainSettings.PREF_ACCOUNT_AND_GOOGLE_SERVICES_SECTION)
- .isVisible());
- Assert.assertTrue("Sync preference should appear when the user is signed in.",
- mMainSettings.findPreference(MainSettings.PREF_MANAGE_SYNC).isVisible());
- }
-
- @Test
- @LargeTest
- @Feature({"RenderTest"})
- @Features.EnableFeatures({ChromeFeatureList.MOBILE_IDENTITY_CONSISTENCY})
- public void testSyncPromoView() throws Exception {
- mSyncTestRule.setUpAccountAndSignInForTesting();
- launchSettingsActivity();
-
- Preference syncPromoPreference = mMainSettings.findPreference(MainSettings.PREF_SYNC_PROMO);
- CriteriaHelper.pollUiThread(() -> syncPromoPreference.isVisible());
- View syncPromoView = mMainSettings.getView().findViewById(R.id.signin_promo_view_container);
- mRenderTestRule.render(syncPromoView, "main_settings_sync_promo");
- }
-
@Test
@SmallTest
public void testRemoveSettings() {
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/FakeServerHelper.java
@@ -96,7 +96,7 @@ public class FakeServerHelper {
@Override
public Long call() {
return nativeCreateFakeServer(mNativeFakeServerHelperAndroid,
- ProfileSyncService.get().getNativeProfileSyncServiceForTest());
+ 0 /*ProfileSyncService.get().getNativeProfileSyncServiceForTest()*/);
}
});
}
@@ -111,7 +111,7 @@ public class FakeServerHelper {
@Override
public Void call() {
nativeDeleteFakeServer(mNativeFakeServerHelperAndroid, nativeFakeServer,
- ProfileSyncService.get().getNativeProfileSyncServiceForTest());
+ 0 /*ProfileSyncService.get().getNativeProfileSyncServiceForTest()*/);
return null;
}
});
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateUnitTest.java
--- a/chrome/android/junit/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateUnitTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateUnitTest.java
@@ -242,7 +242,7 @@ public class AppMenuPropertiesDelegateUnitTest {
R.id.new_incognito_tab_menu_id, R.id.divider_line_id, R.id.open_history_menu_id,
R.id.downloads_menu_id, R.id.all_bookmarks_menu_id, R.id.recent_tabs_menu_id,
R.id.divider_line_id, R.id.request_desktop_site_row_menu_id, R.id.divider_line_id,
- R.id.preferences_id, R.id.help_id};
+ R.id.preferences_id};
assertMenuItemsAreEqual(menu, expectedItems);
}
@@ -263,7 +263,7 @@ public class AppMenuPropertiesDelegateUnitTest {
R.id.downloads_menu_id, R.id.all_bookmarks_menu_id, R.id.recent_tabs_menu_id,
R.id.divider_line_id, R.id.share_row_menu_id, R.id.find_in_page_id,
R.id.translate_id, R.id.add_to_homescreen_id, R.id.request_desktop_site_row_menu_id,
- R.id.divider_line_id, R.id.preferences_id, R.id.help_id};
+ R.id.divider_line_id, R.id.preferences_id};
Integer[] expectedTitles = {0, R.string.menu_new_tab, R.string.menu_new_incognito_tab, 0,
R.string.menu_history, R.string.menu_downloads, R.string.menu_bookmarks,
R.string.menu_recent_tabs, 0, 0, R.string.menu_find_in_page,
@@ -297,8 +297,7 @@ public class AppMenuPropertiesDelegateUnitTest {
R.id.downloads_menu_id, R.id.all_bookmarks_menu_id, R.id.recent_tabs_menu_id,
R.id.divider_line_id, R.id.translate_id, R.id.share_row_menu_id,
R.id.find_in_page_id, R.id.add_to_homescreen_id,
- R.id.request_desktop_site_row_menu_id, R.id.divider_line_id, R.id.preferences_id,
- R.id.help_id};
+ R.id.request_desktop_site_row_menu_id, R.id.divider_line_id, R.id.preferences_id};
Integer[] expectedTitles = {0, R.string.menu_new_tab, R.string.menu_new_incognito_tab, 0,
R.string.menu_history, R.string.menu_downloads, R.string.menu_bookmarks,
R.string.menu_recent_tabs, 0, 0, R.string.menu_find_in_page,
@@ -329,7 +328,7 @@ public class AppMenuPropertiesDelegateUnitTest {
R.id.downloads_menu_id, R.id.all_bookmarks_menu_id, R.id.recent_tabs_menu_id,
R.id.divider_line_id, R.id.share_row_menu_id, R.id.find_in_page_id,
R.id.translate_id, R.id.add_to_homescreen_id, R.id.request_desktop_site_row_menu_id,
- R.id.divider_line_id, R.id.preferences_id, R.id.help_id, R.id.managed_by_menu_id};
+ R.id.divider_line_id, R.id.preferences_id, R.id.managed_by_menu_id};
assertMenuItemsAreEqual(menu, expectedItems);
}
@@ -366,7 +365,7 @@ public class AppMenuPropertiesDelegateUnitTest {
R.id.new_incognito_tab_menu_id, R.id.open_history_menu_id, R.id.downloads_menu_id,
R.id.all_bookmarks_menu_id, R.id.recent_tabs_menu_id, R.id.translate_id,
R.id.find_in_page_id, R.id.add_to_homescreen_id, R.id.reader_mode_prefs_id,
- R.id.preferences_id, R.id.help_id};
+ R.id.preferences_id};
assertMenuItemsHaveIcons(menu, expectedItems);
}
@@ -443,8 +442,7 @@ public class AppMenuPropertiesDelegateUnitTest {
R.id.downloads_menu_id, R.id.all_bookmarks_menu_id, R.id.recent_tabs_menu_id,
R.id.divider_line_id, R.id.share_row_menu_id, R.id.get_image_descriptions_id,
R.id.find_in_page_id, R.id.add_to_homescreen_id,
- R.id.request_desktop_site_row_menu_id, R.id.divider_line_id, R.id.preferences_id,
- R.id.help_id};
+ R.id.request_desktop_site_row_menu_id, R.id.divider_line_id, R.id.preferences_id};
assertMenuItemsAreEqual(menu, expectedItems);
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegateUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegateUnitTest.java
--- a/chrome/android/junit/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegateUnitTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegateUnitTest.java
@@ -204,7 +204,7 @@ public class TabbedAppMenuPropertiesDelegateUnitTest {
R.id.divider_line_id, R.id.translate_id, R.id.share_row_menu_id,
R.id.find_in_page_id, R.id.add_to_homescreen_id,
R.id.request_desktop_site_row_menu_id, R.id.divider_line_id, R.id.preferences_id,
- R.id.help_id, R.id.managed_by_menu_id};
+ R.id.managed_by_menu_id};
assertMenuItemsAreEqual(menu, expectedItems);
}
diff --git a/chrome/browser/android/servicification_background_service_jni.cc b/chrome/browser/android/servicification_background_service_jni.cc
--- a/chrome/browser/android/servicification_background_service_jni.cc
+++ b/chrome/browser/android/servicification_background_service_jni.cc
@@ -12,7 +12,7 @@
#include "base/metrics/field_trial.h"
#include "base/metrics/persistent_histogram_allocator.h"
#include "base/system/sys_info.h"
-#include "chrome/android/test_support_jni_headers/ServicificationBackgroundService_jni.h"
+//#include "chrome/android/test_support_jni_headers/ServicificationBackgroundService_jni.h"
#include "chrome/browser/android/metrics/uma_session_stats.h"
#include "components/metrics/persistent_system_profile.h"
#include "components/variations/active_field_trials.h"
@@ -23,6 +23,9 @@
jboolean
JNI_ServicificationBackgroundService_TestPersistentHistogramsOnDiskSystemProfile(
JNIEnv* env) {
+ if (env)
+ return true;
+
base::GlobalHistogramAllocator* allocator =
base::GlobalHistogramAllocator::Get();
if (!allocator) {
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
@@ -336,19 +336,12 @@ class RemoveSafeBrowsingCookieTester : public RemoveCookieTester {
: browser_process_(TestingBrowserProcess::GetGlobal()) {
// TODO(crbug/925153): Port consumers of the |sb_service| to use the
// interface in components/safe_browsing, and remove this cast.
- scoped_refptr<safe_browsing::SafeBrowsingService> sb_service =
- static_cast<safe_browsing::SafeBrowsingService*>(
- safe_browsing::SafeBrowsingService::CreateSafeBrowsingService());
- browser_process_->SetSafeBrowsingService(sb_service.get());
- sb_service->Initialize();
base::RunLoop().RunUntilIdle();
// Make sure the safe browsing cookie store has no cookies.
// TODO(mmenke): Is this really needed?
base::RunLoop run_loop;
mojo::Remote<network::mojom::CookieManager> cookie_manager;
- sb_service->GetNetworkContext()->GetCookieManager(
- cookie_manager.BindNewPipeAndPassReceiver());
cookie_manager->DeleteCookies(
network::mojom::CookieDeletionFilter::New(),
base::BindLambdaForTesting(
@@ -359,9 +352,7 @@ class RemoveSafeBrowsingCookieTester : public RemoveCookieTester {
}
virtual ~RemoveSafeBrowsingCookieTester() {
- browser_process_->safe_browsing_service()->ShutDown();
base::RunLoop().RunUntilIdle();
- browser_process_->SetSafeBrowsingService(nullptr);
}
private:
diff --git a/chrome/browser/commerce/merchant_viewer/android/BUILD.gn b/chrome/browser/commerce/merchant_viewer/android/BUILD.gn
--- a/chrome/browser/commerce/merchant_viewer/android/BUILD.gn
+++ b/chrome/browser/commerce/merchant_viewer/android/BUILD.gn
@@ -123,7 +123,6 @@ android_library("javatests") {
sources = [
"javatests/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustMessageViewTest.java",
- "javatests/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustSignalsCoordinatorTest.java",
"javatests/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustSignalsEventLoadCallbackHelper.java",
"javatests/src/org/chromium/chrome/browser/merchant_viewer/MerchantTrustSignalsEventStorageTest.java",
]
diff --git a/chrome/browser/commerce/price_tracking/android/test_java_sources.gni b/chrome/browser/commerce/price_tracking/android/test_java_sources.gni
--- a/chrome/browser/commerce/price_tracking/android/test_java_sources.gni
+++ b/chrome/browser/commerce/price_tracking/android/test_java_sources.gni
@@ -3,3 +3,4 @@
# found in the LICENSE file.
price_tracking_test_java_sources = [ "//chrome/browser/commerce/price_tracking/android/javatests/src/org/chromium/chrome/browser/price_tracking/PriceDropNotificationManagerTest.java" ]
+price_tracking_test_java_sources = []
\ No newline at end of file
diff --git a/chrome/browser/commerce/subscriptions/test/android/BUILD.gn b/chrome/browser/commerce/subscriptions/test/android/BUILD.gn
--- a/chrome/browser/commerce/subscriptions/test/android/BUILD.gn
+++ b/chrome/browser/commerce/subscriptions/test/android/BUILD.gn
@@ -42,7 +42,7 @@ android_library("javatests") {
testonly = true
sources = [
- "java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceProxyUnitTest.java",
+ #"java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsServiceProxyUnitTest.java",
"java/src/org/chromium/chrome/browser/subscriptions/CommerceSubscriptionsStorageTest.java",
"java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsLoadCallbackHelper.java",
"java/src/org/chromium/chrome/browser/subscriptions/SubscriptionsManagerImplTest.java",
diff --git a/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc b/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
--- a/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
+++ b/chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc
@@ -51,7 +51,8 @@ class TestRulesetService : public subresource_filter::RulesetService {
using UnindexedRulesetInfo = subresource_filter::UnindexedRulesetInfo;
void IndexAndStoreAndPublishRulesetIfNeeded(
- const UnindexedRulesetInfo& unindexed_ruleset_info) override {
+ const UnindexedRulesetInfo& unindexed_ruleset_info,
+ bool ignore_recent_version = false) override {
unindexed_ruleset_info_ = unindexed_ruleset_info;
}
diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
--- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
@@ -61,7 +61,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "url/origin.h"
-#if BUILDFLAG(FULL_SAFE_BROWSING)
+#if BUILDFLAG(FULL_SAFE_BROWSING) && false
#include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
#endif
@@ -81,7 +81,6 @@ using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
-using safe_browsing::DownloadFileType;
using ::testing::_;
using ::testing::AnyNumber;
using ::testing::AtMost;
@@ -136,8 +135,6 @@ class TestChromeDownloadManagerDelegate : public ChromeDownloadManagerDelegate {
: ChromeDownloadManagerDelegate(profile) {
ON_CALL(*this, MockCheckDownloadUrl(_, _))
.WillByDefault(Return(download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS));
- ON_CALL(*this, GetDownloadProtectionService())
- .WillByDefault(Return(nullptr));
ON_CALL(*this, MockReserveVirtualPath(_, _, _, _, _))
.WillByDefault(DoAll(SetArgPointee<4>(PathValidationResult::SUCCESS),
ReturnArg<1>()));
@@ -200,9 +197,6 @@ class TestChromeDownloadManagerDelegate : public ChromeDownloadManagerDelegate {
download::DownloadDangerType(DownloadItem*,
const base::FilePath&));
- MOCK_METHOD0(GetDownloadProtectionService,
- safe_browsing::DownloadProtectionService*());
-
void RequestConfirmation(
DownloadItem* item,
const base::FilePath& path,
@@ -540,9 +534,7 @@ void ChromeDownloadManagerDelegateTest::VerifyMixedContentExtensionOverride(
// TODO(https://crbug.com/1042727): Fix test GURL scoping and remove this getter
// function.
GURL ForceGoogleSafeSearch(const GURL& url) {
- GURL new_url;
- safe_search_util::ForceGoogleSafeSearch(url, &new_url);
- return new_url;
+ return url;
}
} // namespace
@@ -654,6 +646,7 @@ TEST_F(ChromeDownloadManagerDelegateTest, ConflictAction) {
VerifyAndClearExpectations();
}
+#if BUILDFLAG(FULL_SAFE_BROWSING) && false
TEST_F(ChromeDownloadManagerDelegateTest, MaybeDangerousContent) {
#if BUILDFLAG(ENABLE_PLUGINS)
content::PluginService::GetInstance()->Init();
@@ -710,6 +703,7 @@ TEST_F(ChromeDownloadManagerDelegateTest, MaybeDangerousContent) {
result.danger_type);
}
}
+#endif
TEST_F(ChromeDownloadManagerDelegateTest, BlockedByPolicy) {
const GURL kUrl("http://example.com/foo");
@@ -1356,7 +1350,7 @@ TEST_F(ChromeDownloadManagerDelegateTest,
}
#endif // OS_ANDROID
-#if BUILDFLAG(FULL_SAFE_BROWSING)
+#if BUILDFLAG(FULL_SAFE_BROWSING) && false
namespace {
struct SafeBrowsingTestParameters {
@@ -1401,8 +1395,6 @@ void ChromeDownloadManagerDelegateTestWithSafeBrowsing::SetUp() {
ChromeDownloadManagerDelegateTest::SetUp();
test_download_protection_service_ =
std::make_unique<::testing::StrictMock<TestDownloadProtectionService>>();
- ON_CALL(*delegate(), GetDownloadProtectionService())
- .WillByDefault(Return(test_download_protection_service_.get()));
}
void ChromeDownloadManagerDelegateTestWithSafeBrowsing::TearDown() {
@@ -1410,6 +1402,7 @@ void ChromeDownloadManagerDelegateTestWithSafeBrowsing::TearDown() {
ChromeDownloadManagerDelegateTest::TearDown();
}
+#if BUILDFLAG(FULL_SAFE_BROWSING) && false
const SafeBrowsingTestParameters kSafeBrowsingTestCases[] = {
// SAFE verdict for a safe file.
{download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
@@ -1616,6 +1609,7 @@ const SafeBrowsingTestParameters kSafeBrowsingTestCases[] = {
download::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED,
/*blocked=*/false},
};
+#endif
INSTANTIATE_TEST_SUITE_P(_,
ChromeDownloadManagerDelegateTestWithSafeBrowsing,
@@ -1628,7 +1622,6 @@ TEST_P(ChromeDownloadManagerDelegateTestWithSafeBrowsing, CheckClientDownload) {
std::unique_ptr<download::MockDownloadItem> download_item =
CreateActiveDownloadItem(0);
- EXPECT_CALL(*delegate(), GetDownloadProtectionService());
EXPECT_CALL(*download_protection_service(), MockCheckClientDownload())
.WillOnce(Return(kParameters.verdict));
EXPECT_CALL(*download_item, GetDangerType())
@@ -1671,9 +1664,6 @@ TEST_F(ChromeDownloadManagerDelegateTestWithSafeBrowsing,
CreateActiveDownloadItem(0);
EXPECT_CALL(*download_item, GetURL()).WillRepeatedly(ReturnRef(download_url));
- EXPECT_CALL(*delegate(), GetDownloadProtectionService());
- EXPECT_CALL(*download_protection_service(), MockCheckClientDownload())
- .WillOnce(Return(safe_browsing::DownloadCheckResult::SAFE));
EXPECT_CALL(*download_item, GetDangerType())
.WillRepeatedly(Return(download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS));
@@ -1697,7 +1687,6 @@ TEST_F(ChromeDownloadManagerDelegateTestWithSafeBrowsing,
std::unique_ptr<download::MockDownloadItem> download_item =
CreateActiveDownloadItem(0);
EXPECT_CALL(*download_item, GetURL()).WillRepeatedly(ReturnRef(download_url));
- EXPECT_CALL(*delegate(), GetDownloadProtectionService()).Times(0);
EXPECT_TRUE(delegate()->ShouldCompleteDownload(download_item.get(),
base::OnceClosure()));
}
diff --git a/chrome/browser/download/download_item_model_unittest.cc b/chrome/browser/download/download_item_model_unittest.cc
--- a/chrome/browser/download/download_item_model_unittest.cc
+++ b/chrome/browser/download/download_item_model_unittest.cc
@@ -22,7 +22,6 @@
#include "ui/base/text/bytes_formatting.h"
using download::DownloadItem;
-using safe_browsing::DownloadFileType;
using ::testing::Mock;
using ::testing::NiceMock;
using ::testing::Return;
@@ -357,16 +356,6 @@ TEST_F(DownloadItemModelTest, ShouldShowInShelf) {
EXPECT_FALSE(model().ShouldShowInShelf());
}
-TEST_F(DownloadItemModelTest, DangerLevel) {
- SetupDownloadItemDefaults();
-
- // Default danger level is NOT_DANGEROUS.
- EXPECT_EQ(DownloadFileType::NOT_DANGEROUS, model().GetDangerLevel());
-
- model().SetDangerLevel(DownloadFileType::ALLOW_ON_USER_GESTURE);
- EXPECT_EQ(DownloadFileType::ALLOW_ON_USER_GESTURE, model().GetDangerLevel());
-}
-
TEST_F(DownloadItemModelTest, HasSupportedImageMimeType) {
SetupDownloadItemDefaults();
diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc
--- a/chrome/browser/download/download_target_determiner_unittest.cc
+++ b/chrome/browser/download/download_target_determiner_unittest.cc
@@ -533,7 +533,6 @@ void DownloadTargetDeterminerTest::VerifyDownloadTarget(
EXPECT_EQ(expected_local_path.value(), target_info->target_path.value());
EXPECT_EQ(test_case.expected_disposition, target_info->target_disposition);
EXPECT_EQ(test_case.expected_danger_type, target_info->danger_type);
- EXPECT_EQ(test_case.expected_danger_level, target_info->danger_level);
switch (test_case.expected_intermediate) {
case EXPECT_CRDOWNLOAD:
diff --git a/chrome/browser/metrics/BUILD.gn b/chrome/browser/metrics/BUILD.gn
--- a/chrome/browser/metrics/BUILD.gn
+++ b/chrome/browser/metrics/BUILD.gn
@@ -20,7 +20,7 @@ source_set("test_support") {
"//third_party/metrics_proto",
]
- if (!is_fuchsia) {
+ if (!is_fuchsia && false) {
deps += [ "//chrome/test:sync_integration_test_support" ]
}
diff --git a/chrome/browser/permissions/abusive_origin_permission_revocation_request_unittests.cc b/chrome/browser/permissions/abusive_origin_permission_revocation_request_unittests.cc
--- a/chrome/browser/permissions/abusive_origin_permission_revocation_request_unittests.cc
+++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request_unittests.cc
@@ -45,16 +45,9 @@ class AbusiveOriginPermissionRevocationRequestTestBase : public testing::Test {
fake_database_manager_ =
base::MakeRefCounted<CrowdDenyFakeSafeBrowsingDatabaseManager>();
- safe_browsing_factory_ =
- std::make_unique<safe_browsing::TestSafeBrowsingServiceFactory>();
- safe_browsing_factory_->SetTestDatabaseManager(
- fake_database_manager_.get());
- TestingBrowserProcess::GetGlobal()->SetSafeBrowsingService(
- safe_browsing_factory_->CreateSafeBrowsingService());
}
void TearDown() override {
- TestingBrowserProcess::GetGlobal()->SetSafeBrowsingService(nullptr);
testing::Test::TearDown();
}
@@ -127,8 +120,6 @@ class AbusiveOriginPermissionRevocationRequestTestBase : public testing::Test {
std::unique_ptr<TestingProfile> testing_profile_;
scoped_refptr<CrowdDenyFakeSafeBrowsingDatabaseManager>
fake_database_manager_;
- std::unique_ptr<safe_browsing::TestSafeBrowsingServiceFactory>
- safe_browsing_factory_;
DISALLOW_COPY_AND_ASSIGN(AbusiveOriginPermissionRevocationRequestTestBase);
};
diff --git a/chrome/browser/privacy_budget/BUILD.gn b/chrome/browser/privacy_budget/BUILD.gn
--- a/chrome/browser/privacy_budget/BUILD.gn
+++ b/chrome/browser/privacy_budget/BUILD.gn
@@ -80,7 +80,7 @@ source_set("browser_tests") {
"//chrome/browser:browser_process",
"//chrome/browser/metrics:test_support",
"//chrome/common/privacy_budget:test_support",
- "//chrome/test:sync_integration_test_support",
+# "//chrome/test:sync_integration_test_support",
"//chrome/test:test_support",
"//components/metrics_services_manager",
"//components/sync/test/fake_server",
diff --git a/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc b/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc
--- a/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc
+++ b/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc
@@ -56,6 +56,8 @@ class TestSelectFileDialog : public ui::SelectFileDialog {
: ui::SelectFileDialog(listener, std::move(policy)),
forced_path_(forced_path) {}
+ void ShowToast(const std::string& message) override {}
+
protected:
~TestSelectFileDialog() override = default;
@@ -118,6 +120,8 @@ class FakeCancellingSelectFileDialog : public ui::SelectFileDialog {
std::unique_ptr<ui::SelectFilePolicy> policy)
: ui::SelectFileDialog(listener, std::move(policy)) {}
+ void ShowToast(const std::string& message) override {}
+
protected:
void SelectFileImpl(Type type,
const std::u16string& title,
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -236,9 +236,9 @@ static_library("test_support") {
"//components/bookmarks/test",
"//components/captive_portal/core:test_support",
"//components/consent_auditor:test_support",
- "//components/gcm_driver:test_support",
- "//components/gcm_driver/crypto:test_support",
- "//components/gcm_driver/instance_id:test_support",
+ # "//components/gcm_driver:test_support",
+ # "//components/gcm_driver/crypto:test_support",
+ # "//components/gcm_driver/instance_id:test_support",
"//components/history/core/test",
"//components/infobars/core",
"//components/metrics:test_support",
@@ -545,8 +545,8 @@ if (is_android) {
":android_browsertests_assets",
":android_browsertests_java",
":browser_tests_runner",
- ":sync_integration_test_support",
- ":sync_integration_test_support_java",
+# ":sync_integration_test_support",
+# ":sync_integration_test_support_java",
":test_support",
":test_support_java",
":test_support_ui_android",
@@ -643,6 +643,7 @@ if (is_android) {
]
}
+ if(false) {
test("android_sync_integration_tests") {
configs += [ "//build/config:precompiled_headers" ]
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]
@@ -678,6 +679,7 @@ if (is_android) {
"$root_gen_dir/components/dev_ui_components_resources.pak",
]
}
+ }
static_library("test_support_ui_android") {
configs += [ "//build/config:precompiled_headers" ]
@@ -3568,7 +3570,7 @@ test("unit_tests") {
"../browser/download/download_request_limiter_unittest.cc",
"../browser/download/download_stats_unittest.cc",
"../browser/download/download_status_updater_unittest.cc",
- "../browser/download/download_target_determiner_unittest.cc",
+ #"../browser/download/download_target_determiner_unittest.cc",
"../browser/download/download_ui_controller_unittest.cc",
"../browser/download/offline_item_utils_unittest.cc",
"../browser/endpoint_fetcher/endpoint_fetcher_unittest.cc",
@@ -3704,7 +3706,7 @@ test("unit_tests") {
"../browser/permissions/adaptive_quiet_notification_permission_ui_enabler_unittest.cc",
"../browser/permissions/chrome_permission_manager_unittest.cc",
"../browser/permissions/chrome_permission_request_manager_unittest.cc",
- "../browser/permissions/contextual_notification_permission_ui_selector_unittest.cc",
+ #"../browser/permissions/contextual_notification_permission_ui_selector_unittest.cc",
"../browser/permissions/crowd_deny_preload_data_unittest.cc",
"../browser/permissions/crowd_deny_safe_browsing_request_unittest.cc",
"../browser/permissions/permission_actions_history_unittest.cc",
@@ -3776,7 +3778,7 @@ test("unit_tests") {
"../browser/push_messaging/push_messaging_app_identifier_unittest.cc",
"../browser/push_messaging/push_messaging_notification_manager_unittest.cc",
"../browser/push_messaging/push_messaging_refresher_unittest.cc",
- "../browser/push_messaging/push_messaging_service_unittest.cc",
+ #"../browser/push_messaging/push_messaging_service_unittest.cc",
"../browser/resource_coordinator/tab_load_tracker_unittest.cc",
"../browser/resources_util_unittest.cc",
"../browser/security_events/security_event_recorder_impl_unittest.cc",
@@ -3947,7 +3949,7 @@ test("unit_tests") {
"../browser/android/metrics/android_incognito_session_durations_service_unittest.cc",
"../browser/android/oom_intervention/near_oom_monitor_unittest.cc",
"../browser/android/oom_intervention/oom_intervention_decider_unittest.cc",
- "../browser/android/signin/signin_manager_android_unittest.cc",
+ #"../browser/android/signin/signin_manager_android_unittest.cc",
"../browser/android/signin/signin_metrics_utils_unittest.cc",
"../browser/android/signin/web_signin_bridge_unittest.cc",
"../browser/android/survey/survey_http_client_unittest.cc",
@@ -4378,7 +4380,7 @@ test("unit_tests") {
"../browser/offline_pages/offline_page_request_handler_unittest.cc",
"../browser/offline_pages/offline_page_tab_helper_unittest.cc",
"../browser/offline_pages/offline_page_utils_unittest.cc",
- "../browser/offline_pages/prefetch/gcm_token_unittest.cc",
+ #"../browser/offline_pages/prefetch/gcm_token_unittest.cc",
"../browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc",
"../browser/offline_pages/prefetch/prefetch_background_task_handler_impl_unittest.cc",
"../browser/offline_pages/prefetch/prefetched_pages_notifier_unittest.cc",
@@ -4462,8 +4464,8 @@ test("unit_tests") {
"//components/download/internal/common:internal_java",
"//components/externalauth/android:google_delegate_public_impl_java",
"//components/favicon/core/test:test_support",
- "//components/gcm_driver/instance_id/android:instance_id_driver_java",
- "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
+ # "//components/gcm_driver/instance_id/android:instance_id_driver_java",
+ # "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
"//components/location/android:test_support",
"//components/messages/android:test_support",
"//components/module_installer/android:module_installer_java",
@@ -7056,7 +7058,7 @@ if (!is_android) {
}
}
-if (is_android) {
+if (is_android && false) {
android_library("sync_integration_test_support_java") {
testonly = true
deps = [
@@ -7086,7 +7088,7 @@ if (is_android) {
}
}
-if (!is_fuchsia) {
+if (!is_fuchsia && false) {
# For Android, this target as to be built along the
# sync_integration_test_support_java target from the test target dependencies.
source_set("sync_integration_test_support") {
diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
--- a/chrome/test/android/BUILD.gn
+++ b/chrome/test/android/BUILD.gn
@@ -244,10 +244,10 @@ android_library("chrome_java_test_support") {
"javatests/src/org/chromium/chrome/test/util/browser/contextmenu/RevampedContextMenuUtils.java",
"javatests/src/org/chromium/chrome/test/util/browser/offlinepages/FakeOfflinePageBridge.java",
"javatests/src/org/chromium/chrome/test/util/browser/signin/AccountManagerTestRule.java",
- "javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java",
+ #"javatests/src/org/chromium/chrome/test/util/browser/signin/SigninTestUtil.java",
"javatests/src/org/chromium/chrome/test/util/browser/suggestions/SuggestionsDependenciesRule.java",
"javatests/src/org/chromium/chrome/test/util/browser/suggestions/mostvisited/FakeMostVisitedSites.java",
- "javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java",
+ #"javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java",
"javatests/src/org/chromium/chrome/test/util/browser/tabmodel/MockTabCreator.java",
"javatests/src/org/chromium/chrome/test/util/browser/tabmodel/MockTabCreatorManager.java",
"javatests/src/org/chromium/chrome/test/util/browser/tabmodel/MockTabModel.java",
@@ -306,7 +306,7 @@ android_library("chrome_java_test_support") {
"//net/android:net_java_test_support",
"//services/device/public/mojom:mojom_java",
"//third_party/android_deps:android_support_v7_appcompat_java",
- "//third_party/android_deps:chromium_play_services_availability_java",
+ #"//third_party/android_deps:chromium_play_services_availability_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:espresso_java",
"//third_party/android_deps:material_design_java",
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java
@@ -23,7 +23,7 @@ import org.chromium.chrome.test.util.browser.Features;
import org.chromium.components.policy.test.annotations.Policies;
import org.chromium.content_public.browser.test.ContentJUnit4ClassRunner;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
-import org.chromium.gms.ChromiumPlayServicesAvailability;
+//import org.chromium.gms.ChromiumPlayServicesAvailability;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -152,8 +152,9 @@ public class ChromeJUnit4ClassRunner extends ContentJUnit4ClassRunner {
protected boolean restrictionApplies(String restriction) {
if (TextUtils.equals(
restriction, ChromeRestriction.RESTRICTION_TYPE_GOOGLE_PLAY_SERVICES)
- && (!ChromiumPlayServicesAvailability.isGooglePlayServicesAvailable(
- getTargetContext()))) {
+ && false) {
+ // && (!ChromiumPlayServicesAvailability.isGooglePlayServicesAvailable(
+ // getTargetContext()))) {
return true;
}
if (TextUtils.equals(restriction, ChromeRestriction.RESTRICTION_TYPE_OFFICIAL_BUILD)
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/pagecontroller/controllers/first_run/TOSController.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/pagecontroller/controllers/first_run/TOSController.java
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/pagecontroller/controllers/first_run/TOSController.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/pagecontroller/controllers/first_run/TOSController.java
@@ -15,8 +15,8 @@ import org.chromium.chrome.test.pagecontroller.utils.Ui2Locators;
public class TOSController extends PageController {
private static final IUi2Locator LOCATOR_TOS =
Ui2Locators.withAnyResEntry(R.id.tos_and_privacy);
- private static final IUi2Locator LOCATOR_SEND_REPORT_CHECKBOX =
- Ui2Locators.withAnyResEntry(R.id.send_report_checkbox);
+ // private static final IUi2Locator LOCATOR_SEND_REPORT_CHECKBOX =
+ // Ui2Locators.withAnyResEntry(R.id.send_report_checkbox);
private static final IUi2Locator LOCATOR_ACCEPT =
Ui2Locators.withAnyResEntry(R.id.terms_accept);
@@ -32,14 +32,14 @@ public class TOSController extends PageController {
return this;
}
- public boolean isSendingReports() {
- return mLocatorHelper.getOneChecked(LOCATOR_SEND_REPORT_CHECKBOX);
- }
+ // public boolean isSendingReports() {
+ // return mLocatorHelper.getOneChecked(LOCATOR_SEND_REPORT_CHECKBOX);
+ // }
- public TOSController toggleSendReports() {
- mUtils.click(LOCATOR_SEND_REPORT_CHECKBOX, LOCATOR_TOS);
- return this;
- }
+ // public TOSController toggleSendReports() {
+ // mUtils.click(LOCATOR_SEND_REPORT_CHECKBOX, LOCATOR_TOS);
+ // return this;
+ // }
public void acceptAndContinue() {
mUtils.click(LOCATOR_ACCEPT);
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/AccountManagerTestRule.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/AccountManagerTestRule.java
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/AccountManagerTestRule.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/signin/AccountManagerTestRule.java
@@ -17,7 +17,7 @@ import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.chromium.base.ContextUtils;
-import org.chromium.chrome.browser.sync.ProfileSyncService;
+//import org.chromium.chrome.browser.sync.ProfileSyncService;
import org.chromium.components.signin.AccountManagerFacadeProvider;
import org.chromium.components.signin.AccountUtils;
import org.chromium.components.signin.ProfileDataSource;
@@ -128,7 +128,7 @@ public class AccountManagerTestRule implements TestRule {
* Waits for the AccountTrackerService to seed system accounts.
*/
public void waitForSeeding() {
- SigninTestUtil.seedAccounts();
+ //SigninTestUtil.seedAccounts();
}
/**
@@ -163,7 +163,7 @@ public class AccountManagerTestRule implements TestRule {
public CoreAccountInfo addTestAccountThenSignin() {
assert !mIsSignedIn : "An account is already signed in!";
CoreAccountInfo coreAccountInfo = addAccountAndWaitForSeeding(TEST_ACCOUNT_EMAIL);
- SigninTestUtil.signin(coreAccountInfo);
+ //SigninTestUtil.signin(coreAccountInfo);
mIsSignedIn = true;
return coreAccountInfo;
}
@@ -174,8 +174,9 @@ public class AccountManagerTestRule implements TestRule {
* This method invokes native code. It shouldn't be called in a Robolectric test.
*/
public CoreAccountInfo addTestAccountThenSigninAndEnableSync() {
- return addTestAccountThenSigninAndEnableSync(
- TestThreadUtils.runOnUiThreadBlockingNoException(ProfileSyncService::get));
+ return null;
+ // return addTestAccountThenSigninAndEnableSync(
+ // TestThreadUtils.runOnUiThreadBlockingNoException(ProfileSyncService::get));
}
/**
@@ -186,14 +187,14 @@ public class AccountManagerTestRule implements TestRule {
* @param profileSyncService ProfileSyncService object to set up sync, if null, sync won't
* start.
*/
- public CoreAccountInfo addTestAccountThenSigninAndEnableSync(
- @Nullable ProfileSyncService profileSyncService) {
- assert !mIsSignedIn : "An account is already signed in!";
- CoreAccountInfo coreAccountInfo = addAccountAndWaitForSeeding(TEST_ACCOUNT_EMAIL);
- SigninTestUtil.signinAndEnableSync(coreAccountInfo, profileSyncService);
- mIsSignedIn = true;
- return coreAccountInfo;
- }
+ // public CoreAccountInfo addTestAccountThenSigninAndEnableSync(
+ // @Nullable ProfileSyncService profileSyncService) {
+ // assert !mIsSignedIn : "An account is already signed in!";
+ // CoreAccountInfo coreAccountInfo = addAccountAndWaitForSeeding(TEST_ACCOUNT_EMAIL);
+ // SigninTestUtil.signinAndEnableSync(coreAccountInfo, profileSyncService);
+ // mIsSignedIn = true;
+ // return coreAccountInfo;
+ // }
/**
* Creates ProfileData object from accountName.
@@ -212,7 +213,7 @@ public class AccountManagerTestRule implements TestRule {
* This method invokes native code. It shouldn't be called in a Robolectric test.
*/
public CoreAccountInfo getCurrentSignedInAccount() {
- return SigninTestUtil.getCurrentAccount();
+ return null; // SigninTestUtil.getCurrentAccount();
}
/**
@@ -229,7 +230,7 @@ public class AccountManagerTestRule implements TestRule {
* This method invokes native code. It shouldn't be called in a Robolectric test.
*/
public void signOut() {
- SigninTestUtil.signOut();
+ //SigninTestUtil.signOut();
mIsSignedIn = false;
}
diff --git a/chrome/test/base/chrome_unit_test_suite.h b/chrome/test/base/chrome_unit_test_suite.h
--- a/chrome/test/base/chrome_unit_test_suite.h
+++ b/chrome/test/base/chrome_unit_test_suite.h
@@ -42,7 +42,7 @@ class ChromeUnitTestSuite : public ChromeTestSuite {
// slow. Insert a fake one in all tests, as the prefetch service (perhaps
// among others in the future) causes us to use the InstanceID in a posted
// task which delays test completion.
- instance_id::ScopedUseFakeInstanceIDAndroid fake_instance_id_android_;
+ //instance_id::ScopedUseFakeInstanceIDAndroid fake_instance_id_android_;
#endif
};
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -270,11 +270,6 @@ StatusTray* TestingBrowserProcess::status_tray() {
return nullptr;
}
-safe_browsing::SafeBrowsingService*
-TestingBrowserProcess::safe_browsing_service() {
- return sb_service_.get();
-}
-
subresource_filter::RulesetService*
TestingBrowserProcess::subresource_filter_ruleset_service() {
return subresource_filter_ruleset_service_.get();
@@ -492,11 +487,6 @@ TestingBrowserProcess::GetTestPlatformPart() {
return platform_part_.get();
}
-void TestingBrowserProcess::SetSafeBrowsingService(
- safe_browsing::SafeBrowsingService* sb_service) {
- sb_service_ = sb_service;
-}
-
void TestingBrowserProcess::SetRulesetService(
std::unique_ptr<subresource_filter::RulesetService> ruleset_service) {
subresource_filter_ruleset_service_.swap(ruleset_service);
@@ -521,3 +511,7 @@ TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() {
TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() {
TestingBrowserProcess::DeleteInstance();
}
+
+adblock_updater::AdBlockUpdaterService* TestingBrowserProcess::adblock_updater() {
+ return NULL;
+}
\ No newline at end of file
diff --git a/chrome/test/base/testing_browser_process.h b/chrome/test/base/testing_browser_process.h
--- a/chrome/test/base/testing_browser_process.h
+++ b/chrome/test/base/testing_browser_process.h
@@ -99,7 +99,6 @@ class TestingBrowserProcess : public BrowserProcess {
std::unique_ptr<BackgroundModeManager> manager) override;
#endif
StatusTray* status_tray() override;
- safe_browsing::SafeBrowsingService* safe_browsing_service() override;
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
federated_learning::FlocSortingLshClustersService*
@@ -150,7 +149,6 @@ class TestingBrowserProcess : public BrowserProcess {
// afterwards (using ScopedTestingLocalState, for example).
void SetLocalState(PrefService* local_state);
void SetProfileManager(ProfileManager* profile_manager);
- void SetSafeBrowsingService(safe_browsing::SafeBrowsingService* sb_service);
void SetRulesetService(
std::unique_ptr<subresource_filter::RulesetService> ruleset_service);
void SetFlocSortingLshClustersService(
@@ -168,6 +166,8 @@ class TestingBrowserProcess : public BrowserProcess {
void ShutdownBrowserPolicyConnector();
TestingBrowserProcessPlatformPart* GetTestPlatformPart();
+ adblock_updater::AdBlockUpdaterService* adblock_updater() override;
+
private:
// See CreateInstance() and DestoryInstance() above.
TestingBrowserProcess();
@@ -201,7 +201,6 @@ class TestingBrowserProcess : public BrowserProcess {
print_preview_dialog_controller_;
#endif
- scoped_refptr<safe_browsing::SafeBrowsingService> sb_service_;
std::unique_ptr<subresource_filter::RulesetService>
subresource_filter_ruleset_service_;
std::unique_ptr<federated_learning::FlocSortingLshClustersService>
diff --git a/components/BUILD.gn b/components/BUILD.gn
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -379,9 +379,9 @@ test("components_unittests") {
"//components/embedder_support/android:native_java_unittests_java",
"//components/embedder_support/android/metrics:test_support_java",
"//components/embedder_support/android/metrics:unit_tests",
- "//components/gcm_driver/instance_id:test_support",
- "//components/gcm_driver/instance_id/android:instance_id_driver_java",
- "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
+ # "//components/gcm_driver/instance_id:test_support",
+ # "//components/gcm_driver/instance_id/android:instance_id_driver_java",
+ # "//components/gcm_driver/instance_id/android:instance_id_driver_test_support_java",
"//components/invalidation/impl",
"//components/media_router/browser/android:java",
"//components/media_router/browser/android:test_support_java",
diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
--- a/components/background_task_scheduler/BUILD.gn
+++ b/components/background_task_scheduler/BUILD.gn
@@ -104,16 +104,16 @@ if (is_android) {
bypass_platform_checks = true
testonly = true
sources = [
- "internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskServiceTest.java",
+ #"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskServiceTest.java",
"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobServiceTest.java",
- "internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerAlarmManagerTest.java",
- "internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManagerTest.java",
+ #"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerAlarmManagerTest.java",
+ #"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManagerTest.java",
"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplTest.java",
"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerPrefsTest.java",
"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerUmaTest.java",
"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BroadcastReceiverRobolectricTest.java",
"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/ExtrasToProtoConverterTest.java",
- "internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/ShadowGcmNetworkManager.java",
+ #"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/ShadowGcmNetworkManager.java",
"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/TaskInfoTest.java",
"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/TestBackgroundTask.java",
"internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/TestBackgroundTaskFactory.java",
@@ -127,7 +127,7 @@ if (is_android) {
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//components/background_task_scheduler:public_java",
- "//third_party/android_deps:chromium_play_services_availability_shadows_java",
+ #"//third_party/android_deps:chromium_play_services_availability_shadows_java",
"//third_party/android_deps:robolectric_all_java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
diff --git a/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerJobServiceTest.java b/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerJobServiceTest.java
--- a/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerJobServiceTest.java
+++ b/components/background_task_scheduler/internal/android/javatests/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerJobServiceTest.java
@@ -59,24 +59,24 @@ public class BackgroundTaskSchedulerJobServiceTest {
Assert.assertEquals(TIME_200_MIN_TO_MS, jobInfo.getMaxExecutionDelayMillis());
}
- @Test
- @SmallTest
- public void testOneOffTaskWithDeadlineAndExpiration() {
- TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
- .setWindowEndTimeMs(TIME_200_MIN_TO_MS)
- .setExpiresAfterWindowEndTime(true)
- .build();
- TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
- JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
- InstrumentationRegistry.getTargetContext(), oneOffTask);
- Assert.assertEquals(END_TIME_WITH_DEADLINE_MS, jobInfo.getMaxExecutionDelayMillis());
- Assert.assertEquals(CLOCK_TIME_MS,
- jobInfo.getExtras().getLong(BackgroundTaskSchedulerGcmNetworkManager
- .BACKGROUND_TASK_SCHEDULE_TIME_KEY));
- Assert.assertEquals(TIME_200_MIN_TO_MS,
- jobInfo.getExtras().getLong(
- BackgroundTaskSchedulerGcmNetworkManager.BACKGROUND_TASK_END_TIME_KEY));
- }
+// @Test
+// @SmallTest
+// public void testOneOffTaskWithDeadlineAndExpiration() {
+// TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
+// .setWindowEndTimeMs(TIME_200_MIN_TO_MS)
+// .setExpiresAfterWindowEndTime(true)
+// .build();
+// TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+// JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
+// InstrumentationRegistry.getTargetContext(), oneOffTask);
+// Assert.assertEquals(END_TIME_WITH_DEADLINE_MS, jobInfo.getMaxExecutionDelayMillis());
+// Assert.assertEquals(CLOCK_TIME_MS,
+// jobInfo.getExtras().getLong(BackgroundTaskSchedulerGcmNetworkManager
+// .BACKGROUND_TASK_SCHEDULE_TIME_KEY));
+// Assert.assertEquals(TIME_200_MIN_TO_MS,
+// jobInfo.getExtras().getLong(
+// BackgroundTaskSchedulerGcmNetworkManager.BACKGROUND_TASK_END_TIME_KEY));
+// }
@Test
@SmallTest
@@ -94,27 +94,27 @@ public class BackgroundTaskSchedulerJobServiceTest {
Assert.assertEquals(TIME_200_MIN_TO_MS, jobInfo.getMaxExecutionDelayMillis());
}
- @Test
- @SmallTest
- public void testOneOffTaskWithWindowAndExpiration() {
- TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
- .setWindowStartTimeMs(TIME_100_MIN_TO_MS)
- .setWindowEndTimeMs(TIME_200_MIN_TO_MS)
- .setExpiresAfterWindowEndTime(true)
- .build();
- TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
- JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
- InstrumentationRegistry.getTargetContext(), oneOffTask);
- Assert.assertEquals(
- oneOffTask.getOneOffInfo().getWindowStartTimeMs(), jobInfo.getMinLatencyMillis());
- Assert.assertEquals(END_TIME_WITH_DEADLINE_MS, jobInfo.getMaxExecutionDelayMillis());
- Assert.assertEquals(CLOCK_TIME_MS,
- jobInfo.getExtras().getLong(BackgroundTaskSchedulerGcmNetworkManager
- .BACKGROUND_TASK_SCHEDULE_TIME_KEY));
- Assert.assertEquals(TIME_200_MIN_TO_MS,
- jobInfo.getExtras().getLong(
- BackgroundTaskSchedulerGcmNetworkManager.BACKGROUND_TASK_END_TIME_KEY));
- }
+// @Test
+// @SmallTest
+// public void testOneOffTaskWithWindowAndExpiration() {
+// TaskInfo.TimingInfo timingInfo = TaskInfo.OneOffInfo.create()
+// .setWindowStartTimeMs(TIME_100_MIN_TO_MS)
+// .setWindowEndTimeMs(TIME_200_MIN_TO_MS)
+// .setExpiresAfterWindowEndTime(true)
+// .build();
+// TaskInfo oneOffTask = TaskInfo.createTask(TaskIds.TEST, timingInfo).build();
+// JobInfo jobInfo = BackgroundTaskSchedulerJobService.createJobInfoFromTaskInfo(
+// InstrumentationRegistry.getTargetContext(), oneOffTask);
+// Assert.assertEquals(
+// oneOffTask.getOneOffInfo().getWindowStartTimeMs(), jobInfo.getMinLatencyMillis());
+// Assert.assertEquals(END_TIME_WITH_DEADLINE_MS, jobInfo.getMaxExecutionDelayMillis());
+// Assert.assertEquals(CLOCK_TIME_MS,
+// jobInfo.getExtras().getLong(BackgroundTaskSchedulerGcmNetworkManager
+// .BACKGROUND_TASK_SCHEDULE_TIME_KEY));
+// Assert.assertEquals(TIME_200_MIN_TO_MS,
+// jobInfo.getExtras().getLong(
+// BackgroundTaskSchedulerGcmNetworkManager.BACKGROUND_TASK_END_TIME_KEY));
+// }
@Test
@SmallTest
diff --git a/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobServiceTest.java b/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobServiceTest.java
--- a/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobServiceTest.java
+++ b/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobServiceTest.java
@@ -206,14 +206,14 @@ public class BackgroundTaskJobServiceTest {
if (schedulingTimeMs != null) {
extras.putLong(BackgroundTaskSchedulerJobService.BACKGROUND_TASK_SCHEDULE_TIME_KEY,
schedulingTimeMs);
- extras.putLong(
- BackgroundTaskSchedulerGcmNetworkManager.BACKGROUND_TASK_INTERVAL_TIME_KEY,
- intervalForDeadlineMs);
- if (flexForDeadlineMs != null) {
- extras.putLong(
- BackgroundTaskSchedulerGcmNetworkManager.BACKGROUND_TASK_FLEX_TIME_KEY,
- flexForDeadlineMs);
- }
+ // extras.putLong(
+ // BackgroundTaskSchedulerGcmNetworkManager.BACKGROUND_TASK_INTERVAL_TIME_KEY,
+ // intervalForDeadlineMs);
+ // if (flexForDeadlineMs != null) {
+ // extras.putLong(
+ // BackgroundTaskSchedulerGcmNetworkManager.BACKGROUND_TASK_FLEX_TIME_KEY,
+ // flexForDeadlineMs);
+ // }
}
PersistableBundle taskExtras = new PersistableBundle();
extras.putPersistableBundle(
diff --git a/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplTest.java b/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplTest.java
--- a/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplTest.java
+++ b/components/background_task_scheduler/internal/android/junit/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerImplTest.java
@@ -15,7 +15,7 @@ import static org.mockito.Mockito.verify;
import android.os.Build;
-import com.google.android.gms.gcm.GcmNetworkManager;
+//import com.google.android.gms.gcm.GcmNetworkManager;
import org.junit.Before;
import org.junit.Test;
@@ -33,14 +33,14 @@ import org.chromium.base.test.util.Feature;
import org.chromium.components.background_task_scheduler.BackgroundTaskScheduler;
import org.chromium.components.background_task_scheduler.TaskIds;
import org.chromium.components.background_task_scheduler.TaskInfo;
-import org.chromium.gms.shadows.ShadowChromiumPlayServicesAvailability;
+//import org.chromium.gms.shadows.ShadowChromiumPlayServicesAvailability;
import java.util.concurrent.TimeUnit;
/** Unit tests for {@link BackgroundTaskScheduler}. */
@RunWith(BaseRobolectricTestRunner.class)
-@Config(manifest = Config.NONE,
- shadows = {ShadowGcmNetworkManager.class, ShadowChromiumPlayServicesAvailability.class})
+@Config(manifest = Config.NONE//,
+ /*shadows = {ShadowGcmNetworkManager.class, ShadowChromiumPlayServicesAvailability.class}*/)
public class BackgroundTaskSchedulerImplTest {
@Mock
private BackgroundTaskSchedulerDelegate mDelegate;
@@ -48,7 +48,7 @@ public class BackgroundTaskSchedulerImplTest {
private BackgroundTaskSchedulerDelegate mAlarmManagerDelegate;
@Mock
private BackgroundTaskSchedulerUma mBackgroundTaskSchedulerUma;
- private ShadowGcmNetworkManager mGcmNetworkManager;
+ //private ShadowGcmNetworkManager mGcmNetworkManager;
private TaskInfo mTask;
private TaskInfo mExpirationTask;
@@ -63,9 +63,9 @@ public class BackgroundTaskSchedulerImplTest {
TestBackgroundTask.reset();
// Initialize Google Play Services and GCM Network Manager for upgrade testing.
- ShadowChromiumPlayServicesAvailability.setIsGooglePlayServicesAvailable(true);
- mGcmNetworkManager = (ShadowGcmNetworkManager) Shadow.extract(
- GcmNetworkManager.getInstance(ContextUtils.getApplicationContext()));
+ // ShadowChromiumPlayServicesAvailability.setIsGooglePlayServicesAvailable(true);
+ // mGcmNetworkManager = (ShadowGcmNetworkManager) Shadow.extract(
+ // GcmNetworkManager.getInstance(ContextUtils.getApplicationContext()));
TaskInfo.TimingInfo timingInfo =
TaskInfo.OneOffInfo.create().setWindowEndTimeMs(TimeUnit.DAYS.toMillis(1)).build();
@@ -205,8 +205,8 @@ public class BackgroundTaskSchedulerImplTest {
RuntimeEnvironment.application);
assertEquals(Build.VERSION_CODES.M, BackgroundTaskSchedulerPrefs.getLastSdkVersion());
- assertTrue(mGcmNetworkManager.getCanceledTaskTags().contains(
- Integer.toString(mTask.getTaskId())));
+ // assertTrue(mGcmNetworkManager.getCanceledTaskTags().contains(
+ // Integer.toString(mTask.getTaskId())));
assertEquals(1, TestBackgroundTask.getRescheduleCalls());
}
diff --git a/components/bookmarks/test/test_bookmark_client.cc b/components/bookmarks/test/test_bookmark_client.cc
--- a/components/bookmarks/test/test_bookmark_client.cc
+++ b/components/bookmarks/test/test_bookmark_client.cc
@@ -71,6 +71,8 @@ bool TestBookmarkClient::IsPermanentNodeVisibleWhenEmpty(
case bookmarks::BookmarkNode::FOLDER:
case bookmarks::BookmarkNode::MOBILE:
return false;
+ case bookmarks::BookmarkNode::TABS_COLLECTION:
+ return true;
}
NOTREACHED();
diff --git a/components/domain_reliability/BUILD.gn b/components/domain_reliability/BUILD.gn
--- a/components/domain_reliability/BUILD.gn
+++ b/components/domain_reliability/BUILD.gn
@@ -79,7 +79,7 @@ source_set("unit_tests") {
"config_unittest.cc",
"context_unittest.cc",
"dispatcher_unittest.cc",
- "google_configs_unittest.cc",
+ #"google_configs_unittest.cc",
"monitor_unittest.cc",
"scheduler_unittest.cc",
"test_util.cc",
diff --git a/components/domain_reliability/monitor_unittest.cc b/components/domain_reliability/monitor_unittest.cc
--- a/components/domain_reliability/monitor_unittest.cc
+++ b/components/domain_reliability/monitor_unittest.cc
@@ -323,40 +323,6 @@ TEST_F(DomainReliabilityMonitorTest, NetworkIsolationKey) {
}
}
-// Will fail when baked-in configs expire, as a reminder to update them.
-// (File a bug in Internals>Network>ReportingAndNEL if this starts failing.)
-TEST_F(DomainReliabilityMonitorTest, BakedInAndGoogleConfigs) {
- // AddBakedInConfigs DCHECKs that the baked-in configs parse correctly and are
- // valid, so this unittest will fail if someone tries to add an invalid config
- // to the source tree.
- monitor_.AddBakedInConfigs();
-
- // Count the number of baked-in configs.
- size_t num_baked_in_configs = 0u;
- for (const char* const* p = kBakedInJsonConfigs; *p; ++p) {
- ++num_baked_in_configs;
- }
- EXPECT_GT(num_baked_in_configs, 0u);
-
- EXPECT_EQ(num_baked_in_configs, monitor_.contexts_size_for_testing());
-
- // Also count the Google configs stored in abbreviated form.
- std::vector<std::unique_ptr<const DomainReliabilityConfig>> google_configs =
- GetAllGoogleConfigsForTesting();
- size_t num_google_configs = google_configs.size();
-
- for (std::unique_ptr<const DomainReliabilityConfig>& config :
- google_configs) {
- monitor_.AddContextForTesting(std::move(config));
- }
-
- // The monitor should have contexts for all of the baked-in configs and Google
- // configs. This also ensures that the configs have unique hostnames, i.e.
- // none of them have overwritten each other.
- EXPECT_EQ(num_baked_in_configs + num_google_configs,
- monitor_.contexts_size_for_testing());
-}
-
// Test that Google configs are created only when needed.
TEST_F(DomainReliabilityMonitorTest, GoogleConfigOnDemand) {
ASSERT_EQ(0u, monitor_.contexts_size_for_testing());
diff --git a/components/externalauth/android/BUILD.gn b/components/externalauth/android/BUILD.gn
--- a/components/externalauth/android/BUILD.gn
+++ b/components/externalauth/android/BUILD.gn
@@ -41,22 +41,22 @@ android_library("java") {
]
}
-android_library("junit") {
- # Platform checks are broken for Robolectric. See https://crbug.com/1071638.
- bypass_platform_checks = true
- testonly = true
-
- deps = [
- ":java",
- "//base:base_java",
- "//base:base_java_test_support",
- "//base:base_junit_test_support",
- "//third_party/android_deps:robolectric_all_java",
- "//third_party/junit",
- "//third_party/mockito:mockito_java",
- ]
-
- sources = [
- "junit/src/org/chromium/components/externalauth/ExternalAuthUtilsTest.java",
- ]
-}
+# android_library("junit") {
+# # Platform checks are broken for Robolectric. See https://crbug.com/1071638.
+# bypass_platform_checks = true
+# testonly = true
+
+# deps = [
+# ":java",
+# "//base:base_java",
+# "//base:base_java_test_support",
+# "//base:base_junit_test_support",
+# "//third_party/android_deps:robolectric_all_java",
+# "//third_party/junit",
+# "//third_party/mockito:mockito_java",
+# ]
+
+# sources = [
+# "junit/src/org/chromium/components/externalauth/ExternalAuthUtilsTest.java",
+# ]
+# }
diff --git a/components/gcm_driver/BUILD.gn b/components/gcm_driver/BUILD.gn
--- a/components/gcm_driver/BUILD.gn
+++ b/components/gcm_driver/BUILD.gn
@@ -134,7 +134,7 @@ static_library("test_support") {
public_deps = [ ":gcm_driver" ]
deps = [
"//base",
- "//components/gcm_driver/instance_id:test_support",
+ # "//components/gcm_driver/instance_id:test_support",
"//google_apis/gcm:test_support",
"//net",
"//services/network:test_support",
@@ -146,7 +146,8 @@ static_library("test_support") {
# This target goes with Instance ID and they can include headers from each
# other.
allow_circular_includes_from =
- [ "//components/gcm_driver/instance_id:test_support" ]
+ [ #"//components/gcm_driver/instance_id:test_support"
+ ]
if (is_ios) {
sources -= [
diff --git a/components/gcm_driver/instance_id/BUILD.gn b/components/gcm_driver/instance_id/BUILD.gn
--- a/components/gcm_driver/instance_id/BUILD.gn
+++ b/components/gcm_driver/instance_id/BUILD.gn
@@ -49,11 +49,11 @@ static_library("test_support") {
"fake_gcm_driver_for_instance_id.h",
]
- public_deps = [ ":instance_id" ]
+ #public_deps = [ ":instance_id" ]
deps = [
"//base",
- "//components/gcm_driver",
- "//testing/gtest",
+ # "//components/gcm_driver",
+ # "//testing/gtest",
]
if (is_android) {
@@ -74,9 +74,9 @@ source_set("unit_tests") {
":test_support",
"//base",
"//components/gcm_driver:gcm_buildflags",
- "//google_apis/gcm",
+ #"//google_apis/gcm",
"//net:test_support",
- "//testing/gtest",
+ #"//testing/gtest",
]
}
diff --git a/components/invalidation/impl/BUILD.gn b/components/invalidation/impl/BUILD.gn
--- a/components/invalidation/impl/BUILD.gn
+++ b/components/invalidation/impl/BUILD.gn
@@ -96,8 +96,8 @@ source_set("unit_tests") {
":test_support",
"//base",
"//base/test:test_support",
- "//components/gcm_driver:test_support",
- "//components/gcm_driver/instance_id:test_support",
+ # "//components/gcm_driver:test_support",
+ # "//components/gcm_driver/instance_id:test_support",
"//components/prefs",
"//components/prefs:test_support",
"//components/signin/public/identity_manager:test_support",
diff --git a/components/media_router/browser/android/BUILD.gn b/components/media_router/browser/android/BUILD.gn
--- a/components/media_router/browser/android/BUILD.gn
+++ b/components/media_router/browser/android/BUILD.gn
@@ -122,15 +122,15 @@ java_library("junit") {
"junit/src/org/chromium/components/media_router/DiscoveryCallbackTest.java",
"junit/src/org/chromium/components/media_router/JSONTestUtils.java",
"junit/src/org/chromium/components/media_router/TestUtils.java",
- "junit/src/org/chromium/components/media_router/caf/BaseSessionControllerTest.java",
- "junit/src/org/chromium/components/media_router/caf/CafBaseMediaRouteProviderTest.java",
- "junit/src/org/chromium/components/media_router/caf/CafMediaRouteProviderTest.java",
- "junit/src/org/chromium/components/media_router/caf/CafMessageHandlerTest.java",
- "junit/src/org/chromium/components/media_router/caf/CastSessionControllerTest.java",
- "junit/src/org/chromium/components/media_router/caf/MediaRouterTestHelper.java",
- "junit/src/org/chromium/components/media_router/caf/ShadowCastContext.java",
- "junit/src/org/chromium/components/media_router/caf/ShadowCastMediaSource.java",
- "junit/src/org/chromium/components/media_router/caf/ShadowMediaRouter.java",
+ # "junit/src/org/chromium/components/media_router/caf/BaseSessionControllerTest.java",
+ # "junit/src/org/chromium/components/media_router/caf/CafBaseMediaRouteProviderTest.java",
+ # "junit/src/org/chromium/components/media_router/caf/CafMediaRouteProviderTest.java",
+ # "junit/src/org/chromium/components/media_router/caf/CafMessageHandlerTest.java",
+ # "junit/src/org/chromium/components/media_router/caf/CastSessionControllerTest.java",
+ # "junit/src/org/chromium/components/media_router/caf/MediaRouterTestHelper.java",
+ # "junit/src/org/chromium/components/media_router/caf/ShadowCastContext.java",
+ # "junit/src/org/chromium/components/media_router/caf/ShadowCastMediaSource.java",
+ # "junit/src/org/chromium/components/media_router/caf/ShadowMediaRouter.java",
]
deps = [
diff --git a/components/media_router/browser/android/javatests/src/org/chromium/components/media_router/MockMediaRouteProvider.java b/components/media_router/browser/android/javatests/src/org/chromium/components/media_router/MockMediaRouteProvider.java
--- a/components/media_router/browser/android/javatests/src/org/chromium/components/media_router/MockMediaRouteProvider.java
+++ b/components/media_router/browser/android/javatests/src/org/chromium/components/media_router/MockMediaRouteProvider.java
@@ -87,8 +87,8 @@ public class MockMediaRouteProvider implements MediaRouteProvider {
@Override
public void startObservingMediaSinks(final String sourceId) {
final ArrayList<MediaSink> sinks = new ArrayList<MediaSink>();
- sinks.add(new MediaSink(SINK_ID1, SINK_NAME1, null));
- sinks.add(new MediaSink(SINK_ID2, SINK_NAME2, null));
+ sinks.add(new MediaSink(/*SINK_ID1, SINK_NAME1, null*/));
+ sinks.add(new MediaSink(/*SINK_ID2, SINK_NAME2, null*/));
PostTask.postDelayedTask(UiThreadTaskTraits.DEFAULT,
()
-> mManager.onSinksReceived(sourceId, MockMediaRouteProvider.this, sinks),
diff --git a/components/media_router/browser/android/junit/src/org/chromium/components/media_router/BrowserMediaRouterSinkObservationTest.java b/components/media_router/browser/android/junit/src/org/chromium/components/media_router/BrowserMediaRouterSinkObservationTest.java
--- a/components/media_router/browser/android/junit/src/org/chromium/components/media_router/BrowserMediaRouterSinkObservationTest.java
+++ b/components/media_router/browser/android/junit/src/org/chromium/components/media_router/BrowserMediaRouterSinkObservationTest.java
@@ -49,7 +49,7 @@ public class BrowserMediaRouterSinkObservationTest extends BrowserMediaRouterTes
mBrowserMediaRouter.onSinksReceived(SOURCE_ID1, mRouteProvider, new ArrayList<MediaSink>());
List<MediaSink> sinkList = new ArrayList<MediaSink>();
- MediaSink sink = new MediaSink(SINK_ID1, SINK_NAME1, null);
+ MediaSink sink = new MediaSink(/*SINK_ID1, SINK_NAME1, null*/);
sinkList.add(sink);
mBrowserMediaRouter.onSinksReceived(SOURCE_ID1, mRouteProvider, sinkList);
@@ -77,7 +77,7 @@ public class BrowserMediaRouterSinkObservationTest extends BrowserMediaRouterTes
mBrowserMediaRouter.onSinksReceived(SOURCE_ID1, mRouteProvider, new ArrayList<MediaSink>());
List<MediaSink> sinkList = new ArrayList<MediaSink>();
- MediaSink sink = new MediaSink(SINK_ID1, SINK_NAME1, null);
+ MediaSink sink = new MediaSink(/*SINK_ID1, SINK_NAME1, null*/);
sinkList.add(sink);
mBrowserMediaRouter.onSinksReceived(SOURCE_ID2, mRouteProvider, sinkList);
diff --git a/components/media_router/browser/android/junit/src/org/chromium/components/media_router/DiscoveryCallbackTest.java b/components/media_router/browser/android/junit/src/org/chromium/components/media_router/DiscoveryCallbackTest.java
--- a/components/media_router/browser/android/junit/src/org/chromium/components/media_router/DiscoveryCallbackTest.java
+++ b/components/media_router/browser/android/junit/src/org/chromium/components/media_router/DiscoveryCallbackTest.java
@@ -58,7 +58,7 @@ public class DiscoveryCallbackTest extends BrowserMediaRouterTestBase {
@Feature({"MediaRouter"})
public void testInitCallbackWithNonemptyKnownSinks() {
List<MediaSink> knownSinks = new ArrayList<MediaSink>();
- MediaSink sink = new MediaSink(SINK_ID1, SINK_NAME1, null);
+ MediaSink sink = new MediaSink(/*SINK_ID1, SINK_NAME1, null*/);
DiscoveryCallback callback =
new DiscoveryCallback(SOURCE_ID1, knownSinks, mDiscoveryDelegate, null);
@@ -74,7 +74,7 @@ public class DiscoveryCallbackTest extends BrowserMediaRouterTestBase {
callback.onRouteAdded(null, createMockRouteInfo(SINK_ID1, SINK_NAME1));
List<MediaSink> expectedSinks = new ArrayList<MediaSink>();
- expectedSinks.add(new MediaSink(SINK_ID1, SINK_NAME1, null));
+ expectedSinks.add(new MediaSink(/*SINK_ID1, SINK_NAME1, null*/));
verify(mDiscoveryDelegate).onSinksReceived(eq(SOURCE_ID1), eq(expectedSinks));
}
@@ -88,8 +88,8 @@ public class DiscoveryCallbackTest extends BrowserMediaRouterTestBase {
callback.onRouteAdded(null, createMockRouteInfo(SINK_ID1, SINK_NAME1));
callback.onRouteAdded(null, createMockRouteInfo(SINK_ID2, SINK_NAME2));
List<MediaSink> expectedSinks = new ArrayList<MediaSink>();
- expectedSinks.add(new MediaSink(SINK_ID1, SINK_NAME1, null));
- expectedSinks.add(new MediaSink(SINK_ID2, SINK_NAME2, null));
+ expectedSinks.add(new MediaSink(/*SINK_ID1, SINK_NAME1, null*/));
+ expectedSinks.add(new MediaSink(/*SINK_ID2, SINK_NAME2, null*/));
verify(mDiscoveryDelegate).onSinksReceived(eq(SOURCE_ID1), eq(expectedSinks));
}
@@ -103,7 +103,7 @@ public class DiscoveryCallbackTest extends BrowserMediaRouterTestBase {
callback.onRouteAdded(null, createMockRouteInfo(SINK_ID1, SINK_NAME1));
callback.onRouteAdded(null, createMockRouteInfo(SINK_ID1, SINK_NAME1));
List<MediaSink> expectedSinks = new ArrayList<MediaSink>();
- expectedSinks.add(new MediaSink(SINK_ID1, SINK_NAME1, null));
+ expectedSinks.add(new MediaSink(/*SINK_ID1, SINK_NAME1, null*/));
// Only expect one time. The duplicate add will not be notified.
verify(mDiscoveryDelegate).onSinksReceived(eq(SOURCE_ID1), eq(expectedSinks));
}
@@ -147,7 +147,7 @@ public class DiscoveryCallbackTest extends BrowserMediaRouterTestBase {
callback.onRouteChanged(null, createMockRouteInfo(SINK_ID1, SINK_NAME1));
List<MediaSink> expectedSinks = new ArrayList<MediaSink>();
- expectedSinks.add(new MediaSink(SINK_ID1, SINK_NAME1, null));
+ expectedSinks.add(new MediaSink(/*SINK_ID1, SINK_NAME1, null*/));
verify(mDiscoveryDelegate).onSinksReceived(eq(SOURCE_ID1), eq(expectedSinks));
}
@@ -180,7 +180,7 @@ public class DiscoveryCallbackTest extends BrowserMediaRouterTestBase {
callback.addSourceUrn(SOURCE_ID2);
List<MediaSink> expectedSinks = new ArrayList<MediaSink>();
- expectedSinks.add(new MediaSink(SINK_ID1, SINK_NAME1, null));
+ expectedSinks.add(new MediaSink(/*SINK_ID1, SINK_NAME1, null*/));
verify(mDiscoveryDelegate).onSinksReceived(eq(SOURCE_ID2), eq(expectedSinks));
}
@@ -195,7 +195,7 @@ public class DiscoveryCallbackTest extends BrowserMediaRouterTestBase {
callback.addSourceUrn(SOURCE_ID1);
List<MediaSink> expectedSinks = new ArrayList<MediaSink>();
- expectedSinks.add(new MediaSink(SINK_ID1, SINK_NAME1, null));
+ expectedSinks.add(new MediaSink(/*SINK_ID1, SINK_NAME1, null*/));
// Only the one time after onRouteAdded().
verify(mDiscoveryDelegate).onSinksReceived(eq(SOURCE_ID1), eq(expectedSinks));
}
diff --git a/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc b/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc
--- a/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc
+++ b/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc
@@ -125,7 +125,7 @@ TEST_F(PrefProxyConfigTrackerImplTest, DynamicPrefOverrides) {
pref_service_->SetManagedPref(
proxy_config::prefs::kProxy,
std::make_unique<base::Value>(ProxyConfigDictionary::CreateFixedServers(
- "http://example.com:3128", std::string())));
+ "http://example.com:3128", std::string(), false)));
base::RunLoop().RunUntilIdle();
net::ProxyConfigWithAnnotation actual_config;
diff --git a/components/proxy_config/proxy_config_dictionary_unittest.cc b/components/proxy_config/proxy_config_dictionary_unittest.cc
--- a/components/proxy_config/proxy_config_dictionary_unittest.cc
+++ b/components/proxy_config/proxy_config_dictionary_unittest.cc
@@ -55,7 +55,7 @@ TEST(ProxyConfigDictionaryTest, CreatePacScript) {
TEST(ProxyConfigDictionaryTest, CreateFixedServers) {
ProxyConfigDictionary dict(ProxyConfigDictionary::CreateFixedServers(
- "http://1.2.3.4", "http://foo"));
+ "http://1.2.3.4", "http://foo", false));
ProxyConfigHolder h;
ASSERT_TRUE(dict.GetMode(&h.mode));
diff --git a/components/signin/public/android/BUILD.gn b/components/signin/public/android/BUILD.gn
--- a/components/signin/public/android/BUILD.gn
+++ b/components/signin/public/android/BUILD.gn
@@ -125,7 +125,6 @@ java_library("junit") {
testonly = true
sources = [
"junit/src/org/chromium/components/signin/AccountManagerFacadeImplTest.java",
- "junit/src/org/chromium/components/signin/AccountRenameCheckerTest.java",
"junit/src/org/chromium/components/signin/AccountTrackerServiceTest.java",
"junit/src/org/chromium/components/signin/ObservableValueTest.java",
"junit/src/org/chromium/components/signin/PatternMatcherTest.java",
diff --git a/content/browser/file_system_access/fake_file_system_access_permission_context.cc b/content/browser/file_system_access/fake_file_system_access_permission_context.cc
--- a/content/browser/file_system_access/fake_file_system_access_permission_context.cc
+++ b/content/browser/file_system_access/fake_file_system_access_permission_context.cc
@@ -45,13 +45,6 @@ void FakeFileSystemAccessPermissionContext::ConfirmSensitiveDirectoryAccess(
std::move(callback).Run(SensitiveDirectoryResult::kAllowed);
}
-void FakeFileSystemAccessPermissionContext::PerformAfterWriteChecks(
- std::unique_ptr<FileSystemAccessWriteItem> item,
- GlobalFrameRoutingId frame_id,
- base::OnceCallback<void(AfterWriteCheckResult)> callback) {
- std::move(callback).Run(AfterWriteCheckResult::kAllow);
-}
-
bool FakeFileSystemAccessPermissionContext::CanObtainReadPermission(
const url::Origin& origin) {
return true;
diff --git a/content/browser/file_system_access/fake_file_system_access_permission_context.h b/content/browser/file_system_access/fake_file_system_access_permission_context.h
--- a/content/browser/file_system_access/fake_file_system_access_permission_context.h
+++ b/content/browser/file_system_access/fake_file_system_access_permission_context.h
@@ -40,11 +40,6 @@ class FakeFileSystemAccessPermissionContext
GlobalFrameRoutingId frame_id,
base::OnceCallback<void(SensitiveDirectoryResult)> callback) override;
- void PerformAfterWriteChecks(
- std::unique_ptr<FileSystemAccessWriteItem> item,
- GlobalFrameRoutingId frame_id,
- base::OnceCallback<void(AfterWriteCheckResult)> callback) override;
-
bool CanObtainReadPermission(const url::Origin& origin) override;
bool CanObtainWritePermission(const url::Origin& origin) override;
diff --git a/content/browser/file_system_access/file_system_chooser_test_helpers.cc b/content/browser/file_system_access/file_system_chooser_test_helpers.cc
--- a/content/browser/file_system_access/file_system_chooser_test_helpers.cc
+++ b/content/browser/file_system_access/file_system_chooser_test_helpers.cc
@@ -18,6 +18,8 @@ class CancellingSelectFileDialog : public ui::SelectFileDialog {
: ui::SelectFileDialog(listener, std::move(policy)),
out_params_(out_params) {}
+ void ShowToast(const std::string& message) override {}
+
protected:
void SelectFileImpl(Type type,
const std::u16string& title,
@@ -61,6 +63,8 @@ class FakeSelectFileDialog : public ui::SelectFileDialog {
result_(std::move(result)),
out_params_(out_params) {}
+ void ShowToast(const std::string& message) override {}
+
protected:
void SelectFileImpl(Type type,
const std::u16string& title,
diff --git a/content/browser/file_system_access/mock_file_system_access_permission_context.cc b/content/browser/file_system_access/mock_file_system_access_permission_context.cc
--- a/content/browser/file_system_access/mock_file_system_access_permission_context.cc
+++ b/content/browser/file_system_access/mock_file_system_access_permission_context.cc
@@ -22,11 +22,11 @@ void MockFileSystemAccessPermissionContext::ConfirmSensitiveDirectoryAccess(
frame_id, callback);
}
-void MockFileSystemAccessPermissionContext::PerformAfterWriteChecks(
- std::unique_ptr<FileSystemAccessWriteItem> item,
- GlobalFrameRoutingId frame_id,
- base::OnceCallback<void(AfterWriteCheckResult)> callback) {
- PerformAfterWriteChecks_(item.get(), frame_id, callback);
-}
+// void MockFileSystemAccessPermissionContext::PerformAfterWriteChecks(
+// std::unique_ptr<FileSystemAccessWriteItem> item,
+// GlobalFrameRoutingId frame_id,
+// base::OnceCallback<void(AfterWriteCheckResult)> callback) {
+// PerformAfterWriteChecks_(item.get(), frame_id, callback);
+// }
} // namespace content
diff --git a/content/browser/file_system_access/mock_file_system_access_permission_context.h b/content/browser/file_system_access/mock_file_system_access_permission_context.h
--- a/content/browser/file_system_access/mock_file_system_access_permission_context.h
+++ b/content/browser/file_system_access/mock_file_system_access_permission_context.h
@@ -49,15 +49,15 @@ class MockFileSystemAccessPermissionContext
GlobalFrameRoutingId frame_id,
base::OnceCallback<void(SensitiveDirectoryResult)>& callback));
- void PerformAfterWriteChecks(
- std::unique_ptr<FileSystemAccessWriteItem> item,
- GlobalFrameRoutingId frame_id,
- base::OnceCallback<void(AfterWriteCheckResult)> callback) override;
- MOCK_METHOD(void,
- PerformAfterWriteChecks_,
- (FileSystemAccessWriteItem * item,
- GlobalFrameRoutingId frame_id,
- base::OnceCallback<void(AfterWriteCheckResult)>& callback));
+// void PerformAfterWriteChecks(
+// std::unique_ptr<FileSystemAccessWriteItem> item,
+// GlobalFrameRoutingId frame_id,
+// base::OnceCallback<void(AfterWriteCheckResult)> callback) override;
+ // MOCK_METHOD(void,
+ // PerformAfterWriteChecks_,
+ // (FileSystemAccessWriteItem * item,
+ // GlobalFrameRoutingId frame_id,
+ // base::OnceCallback<void(AfterWriteCheckResult)>& callback));
MOCK_METHOD(bool,
CanObtainReadPermission,
diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn
--- a/content/shell/android/BUILD.gn
+++ b/content/shell/android/BUILD.gn
@@ -260,7 +260,7 @@ android_library("content_shell_test_java") {
]
sources = [
"javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java",
- "javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java",
+ #"javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java",
"javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java",
"javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java",
]
diff --git a/services/BUILD.gn b/services/BUILD.gn
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -129,30 +129,30 @@ if (is_android) {
]
}
- android_library("services_javatests") {
- testonly = true
- sources = [
- "shape_detection/android/javatests/src/org/chromium/shape_detection/BarcodeDetectionImplTest.java",
- "shape_detection/android/javatests/src/org/chromium/shape_detection/FaceDetectionImplTest.java",
- "shape_detection/android/javatests/src/org/chromium/shape_detection/TestUtils.java",
- "shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java",
- ]
- deps = [
- "//base:base_java",
- "//base:base_java_test_support",
- "//mojo/public/java:base_java",
- "//mojo/public/java:bindings_java",
- "//mojo/public/mojom/base:base_java",
- "//services/shape_detection:shape_detection_java",
- "//services/shape_detection/public/mojom:mojom_java",
- "//skia/public/mojom:mojom_java",
- "//third_party/android_deps:chromium_play_services_availability_java",
- "//third_party/android_support_test_runner:runner_java",
- "//third_party/androidx:androidx_test_monitor_java",
- "//third_party/androidx:androidx_test_runner_java",
- "//third_party/junit",
- "//ui/gfx/geometry/mojom:mojom_java",
- ]
- data = [ "test/data/" ]
- }
+ # android_library("services_javatests") {
+ # testonly = true
+ # sources = [
+ # "shape_detection/android/javatests/src/org/chromium/shape_detection/BarcodeDetectionImplTest.java",
+ # "shape_detection/android/javatests/src/org/chromium/shape_detection/FaceDetectionImplTest.java",
+ # "shape_detection/android/javatests/src/org/chromium/shape_detection/TestUtils.java",
+ # "shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java",
+ # ]
+ # deps = [
+ # "//base:base_java",
+ # "//base:base_java_test_support",
+ # "//mojo/public/java:base_java",
+ # "//mojo/public/java:bindings_java",
+ # "//mojo/public/mojom/base:base_java",
+ # "//services/shape_detection:shape_detection_java",
+ # "//services/shape_detection/public/mojom:mojom_java",
+ # "//skia/public/mojom:mojom_java",
+ # "//third_party/android_deps:chromium_play_services_availability_java",
+ # "//third_party/android_support_test_runner:runner_java",
+ # "//third_party/androidx:androidx_test_monitor_java",
+ # "//third_party/androidx:androidx_test_runner_java",
+ # "//third_party/junit",
+ # "//ui/gfx/geometry/mojom:mojom_java",
+ # ]
+ # data = [ "test/data/" ]
+ # }
}
--
2.17.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment