diff --git a/.vpython3 b/.vpython3 index 426cba23..43cd4d5c 100644 --- a/.vpython3 +++ b/.vpython3
@@ -163,8 +163,8 @@ version: "version:1.0.1" > wheel: < - name: "infra/python/wheels/mozdebug-py2_py3" - version: "version:0.2" + name: "infra/python/wheels/mozdebug-py3" + version: "version:0.3.0" > wheel: < name: "infra/python/wheels/mozinfo-py2_py3" @@ -175,8 +175,8 @@ version: "version:7.1.0" > wheel: < - name: "infra/python/wheels/mozprocess-py2_py3" - version: "version:1.2.1" + name: "infra/python/wheels/mozprocess-py3" + version: "version:1.3.0" > wheel: < name: "infra/python/wheels/urllib3-py2_py3"
diff --git a/DEPS b/DEPS index a685fcbc..a0eda6a 100644 --- a/DEPS +++ b/DEPS
@@ -253,11 +253,11 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': '0361abf39d1504966799b1cdb5450e07f88b2bc2', + 'skia_revision': '54d5be6c66aa9c95d371b010b27b511c190abfa0', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': '41c4ff564b2a2c1332cc660b97f655c5c0ddb572', + 'v8_revision': '961b499cf4b39a41f66ace8e218fca95eeabba69', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. @@ -276,7 +276,7 @@ # # Note this revision should be updated with # third_party/boringssl/roll_boringssl.py, not roll-dep. - 'boringssl_revision': '4d955d20d27bcf3ae71df091ad17d95229a7eb56', + 'boringssl_revision': '225e8d39b50757af56e61cd0aa7958c56c487d54', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling google-toolbox-for-mac # and whatever else without interference from each other. @@ -328,7 +328,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling devtools-frontend # and whatever else without interference from each other. - 'devtools_frontend_revision': '02de12c839bce5e5eba2605a23ece72245fb1d38', + 'devtools_frontend_revision': '769d885983fbd1aee93cd8cce456859e54424f84', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libprotobuf-mutator # and whatever else without interference from each other. @@ -364,7 +364,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'dawn_revision': '9be06c8d2396e637935c3d2bef7aa74e152191ab', + 'dawn_revision': 'bf9fde32ac1eb609357fdb0ba6c7d913f00d6f9f', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -431,7 +431,7 @@ 'libcxx_revision': '79a2e924d96e2fc1e4b937c42efd08898fa472d7', # GN CIPD package version. - 'gn_version': 'git_revision:d6b7f0dd209c650ce90da6b749c947519d58f3dc', + 'gn_version': 'git_revision:aa313126da6bf3bf8b672173331e1ed02a635f8f', } # Only these hosts are allowed for dependencies in this DEPS file. @@ -720,7 +720,7 @@ Var('chromium_git') + '/external/github.com/toji/webvr.info.git' + '@' + 'c58ae99b9ff9e2aa4c524633519570bf33536248', 'src/docs/website': { - 'url': Var('chromium_git') + '/website.git' + '@' + 'f44cece3430cde0318db3c6c87b14d7ff240a62b', + 'url': Var('chromium_git') + '/website.git' + '@' + '842df861899d1a5df1bbb9a13d58a8d22144894f', }, 'src/ios/third_party/earl_grey2/src': { @@ -1117,7 +1117,7 @@ }, 'src/third_party/cld_3/src': - Var('chromium_git') + '/external/github.com/google/cld_3.git' + '@' + '576305689d23da93e2f5e04a3de5afbe60d339da', + Var('chromium_git') + '/external/github.com/google/cld_3.git' + '@' + 'b48dc46512566f5a2d41118c8c1116c4f96dc661', 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', @@ -1132,7 +1132,7 @@ }, 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'c0169f32a31c17c50c7bcaab4462e8c17a8a986a', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '7f02c0d981d384cbb129de04c6ffc900bf578dab', 'src/third_party/devtools-frontend/src': Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'), @@ -1272,7 +1272,7 @@ Var('chromium_git') + '/chromium/deps/hunspell_dictionaries.git' + '@' + '41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e', 'src/third_party/icu': - Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'a84f25cef95162b6d1ecd94552b7bb41c3934639', + Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '493fb324ba81643b49bed81b31b73e4150b019e5', 'src/third_party/icu4j': { 'packages': [ @@ -1697,7 +1697,7 @@ 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/github.com/sctplab/usrsctp' + '@' + '62d7d0c928c9a040dce96aa2f16c00e7e67d59cb', - 'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@8ecd4bddb9370f290f32bfb3e95e1bf29be50f50', + 'src/third_party/vulkan-deps': '{chromium_git}/vulkan-deps@e37ba68c0fde1c26f6ea1fa5463b0919614f6c61', 'src/third_party/vulkan_memory_allocator': Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git' + '@' + 'ebe84bec02c041d28f902da0214bf442743fc907', @@ -1806,7 +1806,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@e03116334afbc42f293f0e3bc0acceacd7a87fb6', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@9c26e2e7ac13c467786a352829cc91dd583cff1a', 'condition': 'checkout_src_internal', },
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc index 58cbcc1..91b85fb 100644 --- a/android_webview/browser/aw_browser_context.cc +++ b/android_webview/browser/aw_browser_context.cc
@@ -30,7 +30,6 @@ #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "components/autofill/core/browser/autocomplete_history_manager.h" #include "components/autofill/core/common/autofill_prefs.h"
diff --git a/android_webview/browser/aw_contents_io_thread_client.h b/android_webview/browser/aw_contents_io_thread_client.h index 8202377d..8202103 100644 --- a/android_webview/browser/aw_contents_io_thread_client.h +++ b/android_webview/browser/aw_contents_io_thread_client.h
@@ -14,7 +14,6 @@ #include "base/android/scoped_java_ref.h" #include "base/callback_forward.h" #include "base/compiler_specific.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "content/public/browser/global_routing_id.h"
diff --git a/android_webview/browser/aw_form_database_service.cc b/android_webview/browser/aw_form_database_service.cc index 3b6980e9..1d541b7 100644 --- a/android_webview/browser/aw_form_database_service.cc +++ b/android_webview/browser/aw_form_database_service.cc
@@ -8,10 +8,10 @@ #include "base/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/autofill/core/browser/webdata/autofill_table.h" #include "components/webdata/common/webdata_constants.h"
diff --git a/android_webview/browser/aw_pac_processor.cc b/android_webview/browser/aw_pac_processor.cc index c9a07ff..c0c041a 100644 --- a/android_webview/browser/aw_pac_processor.cc +++ b/android_webview/browser/aw_pac_processor.cc
@@ -20,9 +20,9 @@ #include "base/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" -#include "base/task/post_task.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "net/base/address_list.h" #include "net/base/completion_once_callback.h" #include "net/base/net_errors.h"
diff --git a/android_webview/browser/aw_print_manager.cc b/android_webview/browser/aw_print_manager.cc index de9bd567..a63124d 100644 --- a/android_webview/browser/aw_print_manager.cc +++ b/android_webview/browser/aw_print_manager.cc
@@ -12,7 +12,6 @@ #include "base/memory/ptr_util.h" #include "base/memory/ref_counted_memory.h" #include "base/numerics/safe_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "components/printing/browser/print_manager_utils.h"
diff --git a/android_webview/browser/component_updater/loader_policies/aw_apps_package_names_allowlist_component_loader_policy.cc b/android_webview/browser/component_updater/loader_policies/aw_apps_package_names_allowlist_component_loader_policy.cc index 92e9a5f1..3016722 100644 --- a/android_webview/browser/component_updater/loader_policies/aw_apps_package_names_allowlist_component_loader_policy.cc +++ b/android_webview/browser/component_updater/loader_policies/aw_apps_package_names_allowlist_component_loader_policy.cc
@@ -28,7 +28,6 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/android_webview/browser/cookie_manager.h b/android_webview/browser/cookie_manager.h index 6f1287ca..e71553a 100644 --- a/android_webview/browser/cookie_manager.h +++ b/android_webview/browser/cookie_manager.h
@@ -14,6 +14,7 @@ #include "base/no_destructor.h" #include "base/thread_annotations.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h" #include "services/network/public/mojom/cookie_manager.mojom-forward.h"
diff --git a/android_webview/browser/gfx/test/fake_window.cc b/android_webview/browser/gfx/test/fake_window.cc index c2593c8..9040d1f2 100644 --- a/android_webview/browser/gfx/test/fake_window.cc +++ b/android_webview/browser/gfx/test/fake_window.cc
@@ -13,6 +13,7 @@ #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/init/gl_factory.h"
diff --git a/android_webview/browser/gfx/test/invalidate_test.cc b/android_webview/browser/gfx/test/invalidate_test.cc index e01e95a..0a82016 100644 --- a/android_webview/browser/gfx/test/invalidate_test.cc +++ b/android_webview/browser/gfx/test/invalidate_test.cc
@@ -12,6 +12,7 @@ #include "android_webview/browser/gfx/viz_compositor_thread_runner_webview.h" #include "base/notreached.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/viz/common/quads/solid_color_draw_quad.h" #include "components/viz/common/quads/surface_draw_quad.h" #include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
diff --git a/android_webview/browser/gfx/viz_compositor_thread_runner_webview.h b/android_webview/browser/gfx/viz_compositor_thread_runner_webview.h index b47001c..74b9ac6 100644 --- a/android_webview/browser/gfx/viz_compositor_thread_runner_webview.h +++ b/android_webview/browser/gfx/viz_compositor_thread_runner_webview.h
@@ -11,6 +11,7 @@ #include "base/no_destructor.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "components/viz/service/main/viz_compositor_thread_runner.h" namespace base {
diff --git a/android_webview/browser/lifecycle/aw_contents_lifecycle_notifier_unittest.cc b/android_webview/browser/lifecycle/aw_contents_lifecycle_notifier_unittest.cc index 2438890..14662c5 100644 --- a/android_webview/browser/lifecycle/aw_contents_lifecycle_notifier_unittest.cc +++ b/android_webview/browser/lifecycle/aw_contents_lifecycle_notifier_unittest.cc
@@ -5,7 +5,6 @@ #include "android_webview/browser/lifecycle/aw_contents_lifecycle_notifier.h" #include "base/memory/raw_ptr.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/test/browser_task_environment.h" #include "content/public/test/test_utils.h"
diff --git a/android_webview/browser/metrics/aw_metrics_service_client.h b/android_webview/browser/metrics/aw_metrics_service_client.h index f521ab4..8b919b22 100644 --- a/android_webview/browser/metrics/aw_metrics_service_client.h +++ b/android_webview/browser/metrics/aw_metrics_service_client.h
@@ -13,6 +13,7 @@ #include "base/metrics/field_trial.h" #include "base/no_destructor.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "components/embedder_support/android/metrics/android_metrics_service_client.h" #include "components/metrics/enabled_state_provider.h" #include "components/metrics/metrics_log_uploader.h"
diff --git a/android_webview/common/aw_features.h b/android_webview/common/aw_features.h index 5ab3cf9..9239f8d 100644 --- a/android_webview/common/aw_features.h +++ b/android_webview/common/aw_features.h
@@ -7,6 +7,7 @@ #include "base/feature_list.h" #include "base/metrics/field_trial_params.h" +#include "base/time/time.h" namespace android_webview { namespace features {
diff --git a/android_webview/nonembedded/net/network_fetcher_task.cc b/android_webview/nonembedded/net/network_fetcher_task.cc index 043e1414..4433e26 100644 --- a/android_webview/nonembedded/net/network_fetcher_task.cc +++ b/android_webview/nonembedded/net/network_fetcher_task.cc
@@ -19,7 +19,6 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/android_webview/renderer/js_sandbox/js_sandbox_context.cc b/android_webview/renderer/js_sandbox/js_sandbox_context.cc index b66f4c08e..577514fd 100644 --- a/android_webview/renderer/js_sandbox/js_sandbox_context.cc +++ b/android_webview/renderer/js_sandbox/js_sandbox_context.cc
@@ -17,7 +17,6 @@ #include "base/memory/raw_ptr.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/thread_restrictions.h"
diff --git a/apps/test/app_window_waiter.cc b/apps/test/app_window_waiter.cc index cf42e17..f0340f9c 100644 --- a/apps/test/app_window_waiter.cc +++ b/apps/test/app_window_waiter.cc
@@ -4,7 +4,6 @@ #include "apps/test/app_window_waiter.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "extensions/browser/app_window/app_window.h" #include "extensions/browser/app_window/native_app_window.h"
diff --git a/ash/accelerometer/accelerometer_file_reader.h b/ash/accelerometer/accelerometer_file_reader.h index d915ccb..533f21f 100644 --- a/ash/accelerometer/accelerometer_file_reader.h +++ b/ash/accelerometer/accelerometer_file_reader.h
@@ -11,6 +11,7 @@ #include "ash/accelerometer/accelerometer_reader.h" #include "base/files/file_util.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" namespace ash {
diff --git a/ash/accessibility/autoclick/autoclick_ring_handler.h b/ash/accessibility/autoclick/autoclick_ring_handler.h index 1213658..bb3937e 100644 --- a/ash/accessibility/autoclick/autoclick_ring_handler.h +++ b/ash/accessibility/autoclick/autoclick_ring_handler.h
@@ -5,6 +5,7 @@ #ifndef ASH_ACCESSIBILITY_AUTOCLICK_AUTOCLICK_RING_HANDLER_H_ #define ASH_ACCESSIBILITY_AUTOCLICK_AUTOCLICK_RING_HANDLER_H_ +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/geometry/point.h"
diff --git a/ash/accessibility/chromevox/touch_accessibility_enabler.h b/ash/accessibility/chromevox/touch_accessibility_enabler.h index 0f996c6..b38d7ec 100644 --- a/ash/accessibility/chromevox/touch_accessibility_enabler.h +++ b/ash/accessibility/chromevox/touch_accessibility_enabler.h
@@ -10,6 +10,7 @@ #include "ash/ash_export.h" #include "base/memory/weak_ptr.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/events/event.h" #include "ui/events/event_handler.h"
diff --git a/ash/accessibility/chromevox/touch_exploration_controller.h b/ash/accessibility/chromevox/touch_exploration_controller.h index 7351c9ea..b57ccd6 100644 --- a/ash/accessibility/chromevox/touch_exploration_controller.h +++ b/ash/accessibility/chromevox/touch_exploration_controller.h
@@ -11,6 +11,7 @@ #include "ash/ash_export.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/accessibility/ax_enums.mojom-forward.h" #include "ui/events/event.h"
diff --git a/ash/accessibility/test_accessibility_controller_client.cc b/ash/accessibility/test_accessibility_controller_client.cc index ead7239b..59b13b5 100644 --- a/ash/accessibility/test_accessibility_controller_client.cc +++ b/ash/accessibility/test_accessibility_controller_client.cc
@@ -7,6 +7,7 @@ #include <utility> #include "ash/public/cpp/accessibility_controller.h" +#include "base/time/time.h" #include "ui/gfx/geometry/point_f.h" namespace ash {
diff --git a/ash/accessibility/ui/accessibility_animation_one_shot.h b/ash/accessibility/ui/accessibility_animation_one_shot.h index c407060..973eacf 100644 --- a/ash/accessibility/ui/accessibility_animation_one_shot.h +++ b/ash/accessibility/ui/accessibility_animation_one_shot.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "ui/compositor/compositor.h" #include "ui/compositor/compositor_animation_observer.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ash/accessibility/ui/accessibility_focus_ring_group.cc b/ash/accessibility/ui/accessibility_focus_ring_group.cc index 035ec98a..cc536a4a 100644 --- a/ash/accessibility/ui/accessibility_focus_ring_group.cc +++ b/ash/accessibility/ui/accessibility_focus_ring_group.cc
@@ -14,6 +14,7 @@ #include "ash/accessibility/ui/layer_animation_info.h" #include "ash/public/cpp/accessibility_focus_ring_info.h" #include "base/memory/values_equivalent.h" +#include "base/time/time.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ash/ambient/ambient_photo_controller.cc b/ash/ambient/ambient_photo_controller.cc index 0c0b4a6..8dfd364a 100644 --- a/ash/ambient/ambient_photo_controller.cc +++ b/ash/ambient/ambient_photo_controller.cc
@@ -32,7 +32,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/ash/app_list/app_list_controller_impl.h b/ash/app_list/app_list_controller_impl.h index 7f6dd3c..3908f414 100644 --- a/ash/app_list/app_list_controller_impl.h +++ b/ash/app_list/app_list_controller_impl.h
@@ -35,6 +35,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "components/sync/model/string_ordinal.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/aura/window_observer.h"
diff --git a/ash/app_list/app_list_presenter_impl.h b/ash/app_list/app_list_presenter_impl.h index 1ada299f..a754098 100644 --- a/ash/app_list/app_list_presenter_impl.h +++ b/ash/app_list/app_list_presenter_impl.h
@@ -20,6 +20,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/window_observer.h" #include "ui/compositor/layer_animation_observer.h"
diff --git a/ash/app_list/views/app_list_view.h b/ash/app_list/views/app_list_view.h index 5550679..3323448 100644 --- a/ash/app_list/views/app_list_view.h +++ b/ash/app_list/views/app_list_view.h
@@ -16,6 +16,7 @@ #include "ash/public/cpp/metrics_util.h" #include "base/callback.h" #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "build/build_config.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/aura/window_observer.h"
diff --git a/ash/app_list/views/paged_apps_grid_view.h b/ash/app_list/views/paged_apps_grid_view.h index 03ba122..a6b00cf 100644 --- a/ash/app_list/views/paged_apps_grid_view.h +++ b/ash/app_list/views/paged_apps_grid_view.h
@@ -14,6 +14,7 @@ #include "ash/public/cpp/pagination/pagination_model.h" #include "ash/public/cpp/pagination/pagination_model_observer.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/presentation_time_recorder.h"
diff --git a/ash/app_list/views/productivity_launcher_search_view.h b/ash/app_list/views/productivity_launcher_search_view.h index fd1fc103..1804977 100644 --- a/ash/app_list/views/productivity_launcher_search_view.h +++ b/ash/app_list/views/productivity_launcher_search_view.h
@@ -13,6 +13,7 @@ #include "ash/app_list/model/search/search_box_model_observer.h" #include "ash/app_list/views/search_result_container_view.h" #include "ash/ash_export.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/view.h"
diff --git a/ash/app_list/views/search_result_base_view.h b/ash/app_list/views/search_result_base_view.h index 3e9e3f7..f2210cb 100644 --- a/ash/app_list/views/search_result_base_view.h +++ b/ash/app_list/views/search_result_base_view.h
@@ -7,6 +7,7 @@ #include "ash/app_list/model/search/search_result_observer.h" #include "ash/ash_export.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/views/controls/button/button.h"
diff --git a/ash/app_list/views/search_result_page_view.cc b/ash/app_list/views/search_result_page_view.cc index f76e9b7..4baac2820 100644 --- a/ash/app_list/views/search_result_page_view.cc +++ b/ash/app_list/views/search_result_page_view.cc
@@ -31,6 +31,7 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/accessibility/platform/ax_unique_id.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/ash/app_menu/app_menu_model_adapter.h b/ash/app_menu/app_menu_model_adapter.h index f3393b2..7a73afd 100644 --- a/ash/app_menu/app_menu_model_adapter.h +++ b/ash/app_menu/app_menu_model_adapter.h
@@ -10,6 +10,7 @@ #include "ash/app_menu/app_menu_export.h" #include "base/callback.h" +#include "base/time/time.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_types.h"
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd index 1d4a2b28..ad89e94 100644 --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd
@@ -4667,6 +4667,9 @@ <message name="IDS_APP_LIST_SEARCH_GAME_PLATFORMS_PREFIX" desc="Shown next to a video game search result, begins a list of cloud gaming platforms the game is playable on."> on </message> + <message name="IDS_APP_LIST_SEARCH_SCREENSHOT_SHORTCUT" desc="Template string for a keyboard shortcut describing two ways to take a screenshot: the snip key or Ctrl+Shift+Overview."> + <ph name="snip">$1<ex>Snip</ex></ph> or <ph name="ctrl">$2<ex>Ctrl</ex></ph><ph name="separator1">$3<ex>+</ex></ph><ph name="shift">$4<ex>Ctrl</ex></ph><ph name="separator2">$5<ex>+</ex></ph><ph name="overview">$6<ex>Overview</ex></ph> + </message> <message name="IDS_APP_LIST_START_ASSISTANT" desc="Tooltip for the button that starts Google Assistant from the search box in the app list."> Google Assistant </message>
diff --git a/ash/ash_strings_grd/IDS_APP_LIST_SEARCH_SCREENSHOT_SHORTCUT.png.sha1 b/ash/ash_strings_grd/IDS_APP_LIST_SEARCH_SCREENSHOT_SHORTCUT.png.sha1 new file mode 100644 index 0000000..ac6b54a --- /dev/null +++ b/ash/ash_strings_grd/IDS_APP_LIST_SEARCH_SCREENSHOT_SHORTCUT.png.sha1
@@ -0,0 +1 @@ +6ec5c5f6e2f6f34f8ccbebccf509f5c23ec3848d \ No newline at end of file
diff --git a/ash/assistant/assistant_interaction_controller_impl_unittest.cc b/ash/assistant/assistant_interaction_controller_impl_unittest.cc index 64d5bfc..3737ce5 100644 --- a/ash/assistant/assistant_interaction_controller_impl_unittest.cc +++ b/ash/assistant/assistant_interaction_controller_impl_unittest.cc
@@ -21,6 +21,7 @@ #include "ash/test/fake_android_intent_helper.h" #include "base/bind.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "chromeos/services/assistant/public/cpp/assistant_service.h" #include "chromeos/services/assistant/public/cpp/features.h" #include "chromeos/services/assistant/test_support/mock_assistant_interaction_subscriber.h"
diff --git a/ash/assistant/assistant_notification_expiry_monitor.cc b/ash/assistant/assistant_notification_expiry_monitor.cc index 1106824..25b1590 100644 --- a/ash/assistant/assistant_notification_expiry_monitor.cc +++ b/ash/assistant/assistant_notification_expiry_monitor.cc
@@ -10,6 +10,7 @@ #include "ash/assistant/model/assistant_notification_model.h" #include "ash/assistant/model/assistant_notification_model_observer.h" #include "base/bind.h" +#include "base/time/time.h" #include "chromeos/services/assistant/public/cpp/assistant_service.h" namespace ash {
diff --git a/ash/assistant/assistant_screen_context_controller_impl.cc b/ash/assistant/assistant_screen_context_controller_impl.cc index 9c2a42a..10b335a 100644 --- a/ash/assistant/assistant_screen_context_controller_impl.cc +++ b/ash/assistant/assistant_screen_context_controller_impl.cc
@@ -13,7 +13,6 @@ #include "ash/wm/mru_window_tracker.h" #include "base/bind.h" #include "base/containers/contains.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chromeos/ui/base/window_properties.h" #include "ui/aura/client/aura_constants.h"
diff --git a/ash/capture_mode/capture_label_view.cc b/ash/capture_mode/capture_label_view.cc index 59eb476..977e3bd 100644 --- a/ash/capture_mode/capture_label_view.cc +++ b/ash/capture_mode/capture_label_view.cc
@@ -16,6 +16,7 @@ #include "base/bind.h" #include "base/i18n/number_formatting.h" #include "base/task/task_runner.h" +#include "base/time/time.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/compositor/callback_layer_animation_observer.h"
diff --git a/ash/capture_mode/capture_mode_controller.h b/ash/capture_mode/capture_mode_controller.h index bc2f397e..a1ed7a9a 100644 --- a/ash/capture_mode/capture_mode_controller.h +++ b/ash/capture_mode/capture_mode_controller.h
@@ -20,6 +20,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromeos/dbus/power/power_manager_client.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/ash/child_accounts/parent_access_controller_impl_unittest.cc b/ash/child_accounts/parent_access_controller_impl_unittest.cc index be716cd..b5bcdc9c 100644 --- a/ash/child_accounts/parent_access_controller_impl_unittest.cc +++ b/ash/child_accounts/parent_access_controller_impl_unittest.cc
@@ -16,6 +16,7 @@ #include "base/bind.h" #include "base/dcheck_is_on.h" #include "base/test/metrics/histogram_tester.h" +#include "base/time/time.h" #include "components/account_id/account_id.h" #include "components/session_manager/session_manager_types.h" #include "ui/events/base_event_utils.h"
diff --git a/ash/clipboard/clipboard_history_controller_impl.h b/ash/clipboard/clipboard_history_controller_impl.h index 21b91b34..291eef5 100644 --- a/ash/clipboard/clipboard_history_controller_impl.h +++ b/ash/clipboard/clipboard_history_controller_impl.h
@@ -20,6 +20,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/one_shot_event.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/unguessable_token.h" #include "base/values.h"
diff --git a/ash/clipboard/clipboard_nudge_controller.h b/ash/clipboard/clipboard_nudge_controller.h index 2b652ff14..48a9e78 100644 --- a/ash/clipboard/clipboard_nudge_controller.h +++ b/ash/clipboard/clipboard_nudge_controller.h
@@ -14,6 +14,7 @@ #include "ash/public/cpp/session/session_observer.h" #include "ash/system/tray/system_nudge_controller.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "chromeos/crosapi/mojom/clipboard_history.mojom.h" #include "ui/base/clipboard/clipboard_observer.h"
diff --git a/ash/components/arc/arc_features_parser.cc b/ash/components/arc/arc_features_parser.cc index 8dac975..180ae68 100644 --- a/ash/components/arc/arc_features_parser.cc +++ b/ash/components/arc/arc_features_parser.cc
@@ -12,7 +12,6 @@ #include "base/json/json_reader.h" #include "base/logging.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/values.h"
diff --git a/ash/components/arc/arc_util_unittest.cc b/ash/components/arc/arc_util_unittest.cc index dfeb360..869ba663 100644 --- a/ash/components/arc/arc_util_unittest.cc +++ b/ash/components/arc/arc_util_unittest.cc
@@ -18,7 +18,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chromeos/dbus/upstart/fake_upstart_client.h"
diff --git a/ash/components/arc/crash_collector/arc_crash_collector_bridge.cc b/ash/components/arc/crash_collector/arc_crash_collector_bridge.cc index 62caeb83..fe71bb3 100644 --- a/ash/components/arc/crash_collector/arc_crash_collector_bridge.cc +++ b/ash/components/arc/crash_collector/arc_crash_collector_bridge.cc
@@ -18,7 +18,6 @@ #include "base/memory/singleton.h" #include "base/process/launch.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "mojo/public/cpp/system/platform_handle.h"
diff --git a/ash/components/arc/enterprise/arc_data_snapshotd_manager.h b/ash/components/arc/enterprise/arc_data_snapshotd_manager.h index 84ef5eb..c13fee8 100644 --- a/ash/components/arc/enterprise/arc_data_snapshotd_manager.h +++ b/ash/components/arc/enterprise/arc_data_snapshotd_manager.h
@@ -16,6 +16,7 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/session_manager/core/session_manager_observer.h"
diff --git a/ash/components/arc/enterprise/snapshot_reboot_controller.h b/ash/components/arc/enterprise/snapshot_reboot_controller.h index e299001..da4883d 100644 --- a/ash/components/arc/enterprise/snapshot_reboot_controller.h +++ b/ash/components/arc/enterprise/snapshot_reboot_controller.h
@@ -7,6 +7,7 @@ #include "ash/components/arc/enterprise/arc_snapshot_reboot_notification.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/session_manager/core/session_manager_observer.h"
diff --git a/ash/components/arc/power/arc_power_bridge.h b/ash/components/arc/power/arc_power_bridge.h index 2ff52c20..ae11f97 100644 --- a/ash/components/arc/power/arc_power_bridge.h +++ b/ash/components/arc/power/arc_power_bridge.h
@@ -13,6 +13,7 @@ #include "ash/components/arc/mojom/power.mojom.h" #include "ash/components/arc/session/connection_observer.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromeos/dbus/concierge/concierge_client.h" #include "chromeos/dbus/power/power_manager_client.h"
diff --git a/ash/components/arc/session/arc_session_impl.cc b/ash/components/arc/session/arc_session_impl.cc index 7c72f4d..71f929a 100644 --- a/ash/components/arc/session/arc_session_impl.cc +++ b/ash/components/arc/session/arc_session_impl.cc
@@ -29,7 +29,6 @@ #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h"
diff --git a/ash/components/arc/session/arc_vm_client_adapter.cc b/ash/components/arc/session/arc_vm_client_adapter.cc index 86b9cac3..03e9264 100644 --- a/ash/components/arc/session/arc_vm_client_adapter.cc +++ b/ash/components/arc/session/arc_vm_client_adapter.cc
@@ -46,7 +46,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/platform_thread.h"
diff --git a/ash/components/arc/session/arc_vm_client_adapter_unittest.cc b/ash/components/arc/session/arc_vm_client_adapter_unittest.cc index ceb32e7..50ec454 100644 --- a/ash/components/arc/session/arc_vm_client_adapter_unittest.cc +++ b/ash/components/arc/session/arc_vm_client_adapter_unittest.cc
@@ -43,7 +43,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_chromeos_version_info.h" #include "base/test/scoped_feature_list.h"
diff --git a/ash/components/arc/test/fake_file_system_instance.h b/ash/components/arc/test/fake_file_system_instance.h index 9e435d6c..4b34a60f 100644 --- a/ash/components/arc/test/fake_file_system_instance.h +++ b/ash/components/arc/test/fake_file_system_instance.h
@@ -16,6 +16,7 @@ #include "ash/components/arc/mojom/file_system.mojom.h" #include "base/files/scoped_temp_dir.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h" #include "storage/browser/file_system/watcher_manager.h"
diff --git a/ash/components/arc/volume_mounter/arc_volume_mounter_bridge.cc b/ash/components/arc/volume_mounter/arc_volume_mounter_bridge.cc index 1e9b0b94..32d34ec 100644 --- a/ash/components/arc/volume_mounter/arc_volume_mounter_bridge.cc +++ b/ash/components/arc/volume_mounter/arc_volume_mounter_bridge.cc
@@ -18,7 +18,6 @@ #include "base/metrics/histogram_functions.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "components/prefs/pref_service.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/browser_context.h"
diff --git a/ash/components/device_activity/device_activity_client_unittest.cc b/ash/components/device_activity/device_activity_client_unittest.cc index 9914e5f..4ba2ccff 100644 --- a/ash/components/device_activity/device_activity_client_unittest.cc +++ b/ash/components/device_activity/device_activity_client_unittest.cc
@@ -17,6 +17,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "base/timer/mock_timer.h" #include "chromeos/network/network_state_handler_observer.h" #include "chromeos/network/network_state_test_helper.h"
diff --git a/ash/components/drivefs/drivefs_auth.h b/ash/components/drivefs/drivefs_auth.h index b0bb8dc..c2673dc 100644 --- a/ash/components/drivefs/drivefs_auth.h +++ b/ash/components/drivefs/drivefs_auth.h
@@ -12,6 +12,7 @@ #include "ash/components/drivefs/mojom/drivefs.mojom.h" #include "base/component_export.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/ash/components/drivefs/drivefs_search.h b/ash/components/drivefs/drivefs_search.h index 7f6773d..3511116 100644 --- a/ash/components/drivefs/drivefs_search.h +++ b/ash/components/drivefs/drivefs_search.h
@@ -13,6 +13,7 @@ #include "base/component_export.h" #include "base/memory/weak_ptr.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/remote.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/ash/components/drivefs/drivefs_session_unittest.cc b/ash/components/drivefs/drivefs_session_unittest.cc index a064fb5..0657dc5e 100644 --- a/ash/components/drivefs/drivefs_session_unittest.cc +++ b/ash/components/drivefs/drivefs_session_unittest.cc
@@ -17,6 +17,7 @@ #include "base/test/gmock_move_support.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "base/timer/mock_timer.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/ash/components/drivefs/fake_drivefs.cc b/ash/components/drivefs/fake_drivefs.cc index bd68cfce..56daefc 100644 --- a/ash/components/drivefs/fake_drivefs.cc +++ b/ash/components/drivefs/fake_drivefs.cc
@@ -21,7 +21,6 @@ #include "base/numerics/safe_conversions.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "chromeos/dbus/cros_disks/fake_cros_disks_client.h"
diff --git a/ash/components/drivefs/fake_drivefs_launcher_client.cc b/ash/components/drivefs/fake_drivefs_launcher_client.cc index 76546cff..bae1fca3 100644 --- a/ash/components/drivefs/fake_drivefs_launcher_client.cc +++ b/ash/components/drivefs/fake_drivefs_launcher_client.cc
@@ -12,7 +12,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chromeos/components/mojo_bootstrap/pending_connection_manager.h" #include "chromeos/dbus/cros_disks/fake_cros_disks_client.h"
diff --git a/ash/components/geolocation/simple_geolocation_request.h b/ash/components/geolocation/simple_geolocation_request.h index 28f2098..f4a3a73 100644 --- a/ash/components/geolocation/simple_geolocation_request.h +++ b/ash/components/geolocation/simple_geolocation_request.h
@@ -13,6 +13,7 @@ #include "base/component_export.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromeos/network/network_util.h" #include "url/gurl.h"
diff --git a/ash/components/geolocation/simple_geolocation_unittest.cc b/ash/components/geolocation/simple_geolocation_unittest.cc index 93a8181b..05c8b18f 100644 --- a/ash/components/geolocation/simple_geolocation_unittest.cc +++ b/ash/components/geolocation/simple_geolocation_unittest.cc
@@ -13,6 +13,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "chromeos/dbus/shill/shill_manager_client.h" #include "chromeos/network/geolocation_handler.h" #include "chromeos/network/network_handler_test_helper.h"
diff --git a/ash/components/phonehub/cros_state_sender.h b/ash/components/phonehub/cros_state_sender.h index a346ea3c..e9040ed 100644 --- a/ash/components/phonehub/cros_state_sender.h +++ b/ash/components/phonehub/cros_state_sender.h
@@ -7,6 +7,7 @@ #include "ash/services/multidevice_setup/public/cpp/multidevice_setup_client.h" #include "ash/services/secure_channel/public/cpp/client/connection_manager.h" +#include "base/time/time.h" #include "base/timer/timer.h" namespace ash {
diff --git a/ash/components/phonehub/fake_recent_apps_interaction_handler.h b/ash/components/phonehub/fake_recent_apps_interaction_handler.h index 558d81f..d920ae8e 100644 --- a/ash/components/phonehub/fake_recent_apps_interaction_handler.h +++ b/ash/components/phonehub/fake_recent_apps_interaction_handler.h
@@ -10,6 +10,7 @@ #include "ash/components/phonehub/notification.h" #include "ash/components/phonehub/recent_apps_interaction_handler.h" #include "ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h" +#include "base/time/time.h" namespace ash { namespace phonehub {
diff --git a/ash/components/phonehub/phone_model_test_util.h b/ash/components/phonehub/phone_model_test_util.h index 02159df..20655e6 100644 --- a/ash/components/phonehub/phone_model_test_util.h +++ b/ash/components/phonehub/phone_model_test_util.h
@@ -10,6 +10,7 @@ #include "ash/components/phonehub/browser_tabs_model.h" #include "ash/components/phonehub/notification.h" #include "ash/components/phonehub/phone_status_model.h" +#include "base/time/time.h" namespace ash { namespace phonehub {
diff --git a/ash/components/phonehub/recent_apps_interaction_handler_impl.h b/ash/components/phonehub/recent_apps_interaction_handler_impl.h index bf6e37c..8b0160d 100644 --- a/ash/components/phonehub/recent_apps_interaction_handler_impl.h +++ b/ash/components/phonehub/recent_apps_interaction_handler_impl.h
@@ -15,6 +15,7 @@ #include "base/gtest_prod_util.h" #include "base/observer_list.h" #include "base/observer_list_types.h" +#include "base/time/time.h" class PrefRegistrySimple; class PrefService;
diff --git a/ash/components/power/dark_resume_controller.h b/ash/components/power/dark_resume_controller.h index 88391ae..26687e9 100644 --- a/ash/components/power/dark_resume_controller.h +++ b/ash/components/power/dark_resume_controller.h
@@ -7,6 +7,7 @@ #include "base/component_export.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/unguessable_token.h" #include "chromeos/dbus/power/power_manager_client.h"
diff --git a/ash/components/settings/timezone_settings.cc b/ash/components/settings/timezone_settings.cc index e17c21a..0887262 100644 --- a/ash/components/settings/timezone_settings.cc +++ b/ash/components/settings/timezone_settings.cc
@@ -22,7 +22,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h"
diff --git a/ash/components/tether/disconnect_tethering_operation.h b/ash/components/tether/disconnect_tethering_operation.h index ef150cd..bbd335fc4 100644 --- a/ash/components/tether/disconnect_tethering_operation.h +++ b/ash/components/tether/disconnect_tethering_operation.h
@@ -6,6 +6,7 @@ #define ASH_COMPONENTS_TETHER_DISCONNECT_TETHERING_OPERATION_H_ #include "ash/components/tether/message_transfer_operation.h" +#include "base/time/time.h" // TODO(https://crbug.com/1164001): move to forward declaration #include "ash/services/secure_channel/public/cpp/client/secure_channel_client.h" #include "base/gtest_prod_util.h"
diff --git a/ash/components/tether/host_connection_metrics_logger.h b/ash/components/tether/host_connection_metrics_logger.h index 73d1541..75959ce 100644 --- a/ash/components/tether/host_connection_metrics_logger.h +++ b/ash/components/tether/host_connection_metrics_logger.h
@@ -10,6 +10,7 @@ #include "ash/components/tether/active_host.h" #include "base/gtest_prod_util.h" +#include "base/time/time.h" namespace base { class Clock;
diff --git a/ash/components/tether/host_scanner_operation.h b/ash/components/tether/host_scanner_operation.h index 79a7c4d8..88df62601 100644 --- a/ash/components/tether/host_scanner_operation.h +++ b/ash/components/tether/host_scanner_operation.h
@@ -10,6 +10,7 @@ #include "ash/components/multidevice/remote_device_ref.h" #include "ash/components/tether/message_transfer_operation.h" +#include "base/time/time.h" // TODO(https://crbug.com/1164001): move to forward declaration #include "ash/services/secure_channel/public/cpp/client/secure_channel_client.h" #include "base/gtest_prod_util.h"
diff --git a/ash/components/tether/keep_alive_operation.h b/ash/components/tether/keep_alive_operation.h index 39e5198..4a98d97 100644 --- a/ash/components/tether/keep_alive_operation.h +++ b/ash/components/tether/keep_alive_operation.h
@@ -6,6 +6,7 @@ #define ASH_COMPONENTS_TETHER_KEEP_ALIVE_OPERATION_H_ #include "ash/components/tether/message_transfer_operation.h" +#include "base/time/time.h" // TODO(https://crbug.com/1164001): move to forward declaration #include "ash/services/secure_channel/public/cpp/client/secure_channel_client.h" #include "base/gtest_prod_util.h"
diff --git a/ash/components/tether/tether_connector_impl.h b/ash/components/tether/tether_connector_impl.h index e7086e20..4c5bd8c 100644 --- a/ash/components/tether/tether_connector_impl.h +++ b/ash/components/tether/tether_connector_impl.h
@@ -8,6 +8,7 @@ #include "ash/components/tether/connect_tethering_operation.h" #include "ash/components/tether/host_connection_metrics_logger.h" #include "ash/components/tether/tether_connector.h" +#include "base/time/time.h" // TODO(https://crbug.com/1164001): move to forward declaration #include "ash/services/secure_channel/public/cpp/client/secure_channel_client.h" #include "base/memory/weak_ptr.h"
diff --git a/ash/components/tether/wifi_hotspot_connector.h b/ash/components/tether/wifi_hotspot_connector.h index ce9df2e..55180b3 100644 --- a/ash/components/tether/wifi_hotspot_connector.h +++ b/ash/components/tether/wifi_hotspot_connector.h
@@ -10,6 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/values.h" // TODO(https://crbug.com/1164001): move to forward declaration
diff --git a/ash/components/timezone/timezone_request.h b/ash/components/timezone/timezone_request.h index 920ac4bf..72d79e61 100644 --- a/ash/components/timezone/timezone_request.h +++ b/ash/components/timezone/timezone_request.h
@@ -13,6 +13,7 @@ #include "base/component_export.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "url/gurl.h"
diff --git a/ash/display/display_color_manager.cc b/ash/display/display_color_manager.cc index b7addbdb..fdd9167 100644 --- a/ash/display/display_color_manager.cc +++ b/ash/display/display_color_manager.cc
@@ -16,7 +16,6 @@ #include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/ash/display/display_color_manager_unittest.cc b/ash/display/display_color_manager_unittest.cc index f1e17237..360f1c8a 100644 --- a/ash/display/display_color_manager_unittest.cc +++ b/ash/display/display_color_manager_unittest.cc
@@ -11,7 +11,6 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/pattern.h" -#include "base/task/post_task.h" #include "base/test/scoped_path_override.h" #include "base/test/task_environment.h" #include "components/quirks/quirks_manager.h"
diff --git a/ash/display/root_window_transformers.cc b/ash/display/root_window_transformers.cc index 12fa13fc7..70d00185 100644 --- a/ash/display/root_window_transformers.cc +++ b/ash/display/root_window_transformers.cc
@@ -143,7 +143,7 @@ return initial_root_bounds_; gfx::RectF new_bounds = gfx::RectF(gfx::SizeF(host_size)); - new_bounds.Inset(host_insets_); + new_bounds.Inset(gfx::InsetsF(host_insets_)); root_window_bounds_transform_.TransformRect(&new_bounds); // Root window origin will be (0,0) except during bounds changes.
diff --git a/ash/fast_ink/cursor/cursor_view.cc b/ash/fast_ink/cursor/cursor_view.cc index f1c36c0..e462f95 100644 --- a/ash/fast_ink/cursor/cursor_view.cc +++ b/ash/fast_ink/cursor/cursor_view.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h"
diff --git a/ash/fast_ink/cursor/cursor_view.h b/ash/fast_ink/cursor/cursor_view.h index a298142..a01e9f90 100644 --- a/ash/fast_ink/cursor/cursor_view.h +++ b/ash/fast_ink/cursor/cursor_view.h
@@ -7,6 +7,7 @@ #include "ash/fast_ink/fast_ink_view.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/viz/common/frame_sinks/delay_based_time_source.h" #include "ui/events/ozone/chromeos/cursor_controller.h"
diff --git a/ash/fast_ink/fast_ink_points_unittest.cc b/ash/fast_ink/fast_ink_points_unittest.cc index 14542560..a6f6a80 100644 --- a/ash/fast_ink/fast_ink_points_unittest.cc +++ b/ash/fast_ink/fast_ink_points_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ash/fast_ink/fast_ink_points.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/test/event_generator.h"
diff --git a/ash/fast_ink/laser/laser_pointer_view.h b/ash/fast_ink/laser/laser_pointer_view.h index 37d470c..4ae5166 100644 --- a/ash/fast_ink/laser/laser_pointer_view.h +++ b/ash/fast_ink/laser/laser_pointer_view.h
@@ -7,6 +7,7 @@ #include "ash/fast_ink/fast_ink_points.h" #include "ash/fast_ink/fast_ink_view.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/views/widget/unique_widget_ptr.h"
diff --git a/ash/highlighter/highlighter_controller.h b/ash/highlighter/highlighter_controller.h index 4a685aa..2f811c5 100644 --- a/ash/highlighter/highlighter_controller.h +++ b/ash/highlighter/highlighter_controller.h
@@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "ui/views/widget/unique_widget_ptr.h" namespace base {
diff --git a/ash/hud_display/data_source.cc b/ash/hud_display/data_source.cc index 01f41ae..2805ae26 100644 --- a/ash/hud_display/data_source.cc +++ b/ash/hud_display/data_source.cc
@@ -9,7 +9,6 @@ #include "ash/hud_display/memory_status.h" #include "base/bind.h" #include "base/cxx17_backports.h" -#include "base/task/post_task.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/ash/hud_display/fps_graph_page_view.h b/ash/hud_display/fps_graph_page_view.h index 2050977..dbda548 100644 --- a/ash/hud_display/fps_graph_page_view.h +++ b/ash/hud_display/fps_graph_page_view.h
@@ -10,6 +10,7 @@ #include "ash/hud_display/graph.h" #include "ash/hud_display/graph_page_view_base.h" #include "base/containers/circular_deque.h" +#include "base/time/time.h" #include "ui/aura/window_observer.h" #include "ui/compositor/compositor_observer.h" #include "ui/views/widget/widget_observer.h"
diff --git a/ash/hud_display/graphs_container_view.cc b/ash/hud_display/graphs_container_view.cc index 1a699087..a484e64 100644 --- a/ash/hud_display/graphs_container_view.cc +++ b/ash/hud_display/graphs_container_view.cc
@@ -11,7 +11,6 @@ #include "ash/hud_display/hud_constants.h" #include "ash/hud_display/memory_graph_page_view.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "ui/base/metadata/metadata_impl_macros.h"
diff --git a/ash/hud_display/hud_settings_view.cc b/ash/hud_display/hud_settings_view.cc index 6d5ffaa7..7c370d7 100644 --- a/ash/hud_display/hud_settings_view.cc +++ b/ash/hud_display/hud_settings_view.cc
@@ -14,6 +14,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "cc/debug/layer_tree_debug_state.h" #include "components/viz/common/display/renderer_settings.h" #include "components/viz/host/host_frame_sink_manager.h"
diff --git a/ash/login/ui/horizontal_image_sequence_animation_decoder.h b/ash/login/ui/horizontal_image_sequence_animation_decoder.h index 3bece1f..059cfe9 100644 --- a/ash/login/ui/horizontal_image_sequence_animation_decoder.h +++ b/ash/login/ui/horizontal_image_sequence_animation_decoder.h
@@ -6,6 +6,7 @@ #define ASH_LOGIN_UI_HORIZONTAL_IMAGE_SEQUENCE_ANIMATION_DECODER_H_ #include "ash/login/ui/animated_rounded_image_view.h" +#include "base/time/time.h" namespace ash {
diff --git a/ash/login/ui/lock_contents_view.h b/ash/login/ui/lock_contents_view.h index 1140d0c..43eb449 100644 --- a/ash/login/ui/lock_contents_view.h +++ b/ash/login/ui/lock_contents_view.h
@@ -27,6 +27,7 @@ #include "base/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chromeos/dbus/power/power_manager_client.h" #include "chromeos/dbus/power_manager/power_supply_properties.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/ash/login/ui/login_password_view.cc b/ash/login/ui/login_password_view.cc index 2a0d893..adb9812 100644 --- a/ash/login/ui/login_password_view.cc +++ b/ash/login/ui/login_password_view.cc
@@ -20,6 +20,7 @@ #include "base/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/accessibility/ax_node_data.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/ash/metrics/demo_session_metrics_recorder.h b/ash/metrics/demo_session_metrics_recorder.h index d47c4410..d6780494 100644 --- a/ash/metrics/demo_session_metrics_recorder.h +++ b/ash/metrics/demo_session_metrics_recorder.h
@@ -13,6 +13,7 @@ #include "ash/constants/app_types.h" #include "base/containers/flat_set.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "ui/aura/window_observer.h" #include "ui/base/user_activity/user_activity_detector.h" #include "ui/base/user_activity/user_activity_observer.h"
diff --git a/ash/projector/projector_annotation_tray.cc b/ash/projector/projector_annotation_tray.cc index 3f84b7b..5385f63 100644 --- a/ash/projector/projector_annotation_tray.cc +++ b/ash/projector/projector_annotation_tray.cc
@@ -49,13 +49,9 @@ constexpr int kColorButtonColorViewSize = 16; constexpr int kColorButtonViewRadius = 28; -// Colors. -constexpr SkColor kRedPenColor = SkColorSetRGB(0xEA, 0x43, 0x35); -constexpr SkColor kYellowPenColor = SkColorSetRGB(0xFB, 0xBC, 0x04); -constexpr SkColor kBluePenColor = SkColorSetRGB(0x1A, 0x73, 0xE8); - -constexpr SkColor kPenColors[] = {kRedPenColor, kBluePenColor, SK_ColorWHITE, - kYellowPenColor, SK_ColorBLACK}; +constexpr SkColor kPenColors[] = {kProjectorRedPenColor, kProjectorBluePenColor, + SK_ColorWHITE, kProjectorYellowPenColor, + SK_ColorBLACK}; // TODO(b/201664243): Use AnnotatorToolType. enum ProjectorTool { kToolNone, kToolPen }; @@ -96,7 +92,7 @@ image_view_->SetVerticalAlignment(views::ImageView::Alignment::kCenter); image_view_->SetPreferredSize(gfx::Size(kTrayItemSize, kTrayItemSize)); // The default pen color upon creation is red. - current_pen_color_ = kRedPenColor; + current_pen_color_ = kProjectorRedPenColor; } ProjectorAnnotationTray::~ProjectorAnnotationTray() = default; @@ -228,7 +224,7 @@ SetVisiblePreferred(false); UpdateIcon(); // Reset pen color to default color. - current_pen_color_ = kRedPenColor; + current_pen_color_ = kProjectorRedPenColor; } void ProjectorAnnotationTray::ToggleAnnotator() { @@ -277,13 +273,13 @@ int ProjectorAnnotationTray::GetAccessibleNameForColor(SkColor color) { switch (color) { - case kRedPenColor: + case kProjectorRedPenColor: return IDS_RED_COLOR_BUTTON; - case kBluePenColor: + case kProjectorBluePenColor: return IDS_BLUE_COLOR_BUTTON; case SK_ColorWHITE: return IDS_WHITE_COLOR_BUTTON; - case kYellowPenColor: + case kProjectorYellowPenColor: return IDS_YELLOW_COLOR_BUTTON; case SK_ColorBLACK: return IDS_BLACK_COLOR_BUTTON;
diff --git a/ash/projector/projector_annotation_tray.h b/ash/projector/projector_annotation_tray.h index 28a48154..c860dd4 100644 --- a/ash/projector/projector_annotation_tray.h +++ b/ash/projector/projector_annotation_tray.h
@@ -13,6 +13,11 @@ class HoverHighlightView; class TrayBubbleWrapper; +// Pen colors. +constexpr SkColor kProjectorRedPenColor = SkColorSetRGB(0xEA, 0x43, 0x35); +constexpr SkColor kProjectorYellowPenColor = SkColorSetRGB(0xFB, 0xBC, 0x04); +constexpr SkColor kProjectorBluePenColor = SkColorSetRGB(0x1A, 0x73, 0xE8); + // Status area tray which allows you to access the annotation tools for // Projector. class ProjectorAnnotationTray : public TrayBackgroundView {
diff --git a/ash/projector/projector_controller_impl.cc b/ash/projector/projector_controller_impl.cc index 615865b..9dd8923 100644 --- a/ash/projector/projector_controller_impl.cc +++ b/ash/projector/projector_controller_impl.cc
@@ -22,6 +22,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "media/mojo/mojom/speech_recognition_service.mojom.h" namespace ash {
diff --git a/ash/projector/projector_controller_unittest.cc b/ash/projector/projector_controller_unittest.cc index f649c60..caaf1cb 100644 --- a/ash/projector/projector_controller_unittest.cc +++ b/ash/projector/projector_controller_unittest.cc
@@ -30,6 +30,7 @@ #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "base/values.h" #include "chromeos/dbus/audio/audio_node.h" #include "chromeos/dbus/audio/fake_cras_audio_client.h"
diff --git a/ash/projector/projector_metrics.h b/ash/projector/projector_metrics.h index eb172921..a5c1bfc 100644 --- a/ash/projector/projector_metrics.h +++ b/ash/projector/projector_metrics.h
@@ -49,10 +49,12 @@ kBlack = 0, kWhite = 1, kBlue = 2, + kRed = 3, + kYellow = 4, // Add future entries above this comment, in sync with // "ProjectorMarkerColor" in src/tools/metrics/histograms/enums.xml. // Update kMaxValue to the last value. - kMaxValue = kBlue + kMaxValue = kYellow }; // These enum values represent steps in the Projector creation flow and log to
diff --git a/ash/projector/projector_ui_controller.cc b/ash/projector/projector_ui_controller.cc index 22c6e7a1..db31924 100644 --- a/ash/projector/projector_ui_controller.cc +++ b/ash/projector/projector_ui_controller.cc
@@ -152,6 +152,7 @@ annotator_enabled_ = !annotator_enabled_; } ash::ProjectorAnnotatorController::Get()->SetTool(tool); + RecordMarkerColorMetrics(GetMarkerColorForMetrics(tool.color)); } void ProjectorUiController::ResetTools() { @@ -166,4 +167,15 @@ if (!active) ResetTools(); } + +ProjectorMarkerColor ProjectorUiController::GetMarkerColorForMetrics( + SkColor color) { + std::map<SkColor, ProjectorMarkerColor> marker_colors_map = { + {SK_ColorBLACK, ProjectorMarkerColor::kBlack}, + {SK_ColorWHITE, ProjectorMarkerColor::kWhite}, + {ash::kProjectorBluePenColor, ProjectorMarkerColor::kBlue}, + {ash::kProjectorRedPenColor, ProjectorMarkerColor::kRed}, + {ash::kProjectorYellowPenColor, ProjectorMarkerColor::kYellow}}; + return marker_colors_map[color]; +} } // namespace ash
diff --git a/ash/projector/projector_ui_controller.h b/ash/projector/projector_ui_controller.h index c48607f4..ccf80876 100644 --- a/ash/projector/projector_ui_controller.h +++ b/ash/projector/projector_ui_controller.h
@@ -6,6 +6,7 @@ #define ASH_PROJECTOR_PROJECTOR_UI_CONTROLLER_H_ #include "ash/ash_export.h" +#include "ash/projector/projector_metrics.h" #include "ash/public/cpp/projector/projector_session.h" #include "base/scoped_observation.h" #include "third_party/skia/include/core/SkColor.h" @@ -48,6 +49,8 @@ // ProjectorSessionObserver: void OnProjectorSessionActiveStateChanged(bool active) override; + ProjectorMarkerColor GetMarkerColorForMetrics(SkColor color); + bool annotator_enabled_ = false; base::ScopedObservation<ProjectorSession, ProjectorSessionObserver>
diff --git a/ash/projector/projector_ui_controller_unittest.cc b/ash/projector/projector_ui_controller_unittest.cc index 5d7f92b..11e2830 100644 --- a/ash/projector/projector_ui_controller_unittest.cc +++ b/ash/projector/projector_ui_controller_unittest.cc
@@ -34,6 +34,8 @@ constexpr char kProjectorCreationFlowErrorHistogramName[] = "Ash.Projector.CreationFlowError.ClamshellMode"; +constexpr char kProjectorMarkerColorHistogramName[] = + "Ash.Projector.MarkerColor.ClamshellMode"; } // namespace @@ -119,9 +121,14 @@ } TEST_F(ProjectorUiControllerTest, SetAnnotatorTool) { + base::HistogramTester histogram_tester; AnnotatorTool tool; EXPECT_CALL(projector_client_, SetTool(tool)); + controller_->SetAnnotatorTool(tool); + histogram_tester.ExpectBucketCount(kProjectorMarkerColorHistogramName, + ProjectorMarkerColor::kBlack, + /*count=*/1); } TEST_F(ProjectorUiControllerTest, ShowFailureNotification) {
diff --git a/ash/public/cpp/external_arc/message_center/arc_notification_view.cc b/ash/public/cpp/external_arc/message_center/arc_notification_view.cc index 23ad859..9b1dfc3 100644 --- a/ash/public/cpp/external_arc/message_center/arc_notification_view.cc +++ b/ash/public/cpp/external_arc/message_center/arc_notification_view.cc
@@ -196,7 +196,7 @@ if (ash::features::IsNotificationsRefreshEnabled()) { focus_painter_ = views::Painter::CreateSolidFocusPainter( GetColorProvider()->GetColor(ui::kColorFocusableBorderFocused), 2, - gfx::Insets::VH(3, 3)); + gfx::InsetsF(3)); } else { focus_painter_ = views::Painter::CreateSolidFocusPainter( GetColorProvider()->GetColor(ui::kColorFocusableBorderFocused),
diff --git a/ash/public/cpp/network_icon_image_source.cc b/ash/public/cpp/network_icon_image_source.cc index c1baff0..6b980f1 100644 --- a/ash/public/cpp/network_icon_image_source.cc +++ b/ash/public/cpp/network_icon_image_source.cc
@@ -124,7 +124,7 @@ void SignalStrengthImageSource::DrawArcs(gfx::Canvas* canvas) { gfx::RectF oval_bounds((gfx::Rect(size()))); - oval_bounds.Inset(gfx::Insets(padding_)); + oval_bounds.Inset(padding_); // Double the width and height. The new midpoint should be the former // bottom center. oval_bounds.Inset(-oval_bounds.width() / 2, 0, -oval_bounds.width() / 2,
diff --git a/ash/services/cellular_setup/ota_activator_impl.h b/ash/services/cellular_setup/ota_activator_impl.h index 8cdeadc..c014afd5 100644 --- a/ash/services/cellular_setup/ota_activator_impl.h +++ b/ash/services/cellular_setup/ota_activator_impl.h
@@ -13,6 +13,7 @@ #include "base/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/timer/timer.h" // TODO(https://crbug.com/1164001): move to forward declaration. #include "chromeos/network/network_activation_handler.h"
diff --git a/ash/services/device_sync/cryptauth_device_notifier_impl.h b/ash/services/device_sync/cryptauth_device_notifier_impl.h index cdde0bc..0cd2da9 100644 --- a/ash/services/device_sync/cryptauth_device_notifier_impl.h +++ b/ash/services/device_sync/cryptauth_device_notifier_impl.h
@@ -17,6 +17,7 @@ #include "base/callback.h" #include "base/containers/flat_set.h" #include "base/containers/queue.h" +#include "base/time/time.h" #include "base/timer/timer.h" namespace ash {
diff --git a/ash/services/device_sync/device_sync_impl.h b/ash/services/device_sync/device_sync_impl.h index 366978c..12c3ca1 100644 --- a/ash/services/device_sync/device_sync_impl.h +++ b/ash/services/device_sync/device_sync_impl.h
@@ -22,6 +22,7 @@ #include "base/containers/flat_map.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/signin/public/identity_manager/identity_manager.h"
diff --git a/ash/services/device_sync/sync_scheduler_impl.h b/ash/services/device_sync/sync_scheduler_impl.h index 81bc94e..b07d739a 100644 --- a/ash/services/device_sync/sync_scheduler_impl.h +++ b/ash/services/device_sync/sync_scheduler_impl.h
@@ -8,6 +8,7 @@ #include <stddef.h> #include "ash/services/device_sync/sync_scheduler.h" +#include "base/time/time.h" #include "base/timer/timer.h" namespace ash {
diff --git a/ash/services/device_sync/sync_scheduler_impl_unittest.cc b/ash/services/device_sync/sync_scheduler_impl_unittest.cc index fab6907..e543c28f 100644 --- a/ash/services/device_sync/sync_scheduler_impl_unittest.cc +++ b/ash/services/device_sync/sync_scheduler_impl_unittest.cc
@@ -8,6 +8,7 @@ #include <utility> #include "base/memory/ptr_util.h" +#include "base/time/time.h" #include "base/timer/mock_timer.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/services/multidevice_setup/eligible_host_devices_provider_impl.cc b/ash/services/multidevice_setup/eligible_host_devices_provider_impl.cc index 9f668c1..a0ab249 100644 --- a/ash/services/multidevice_setup/eligible_host_devices_provider_impl.cc +++ b/ash/services/multidevice_setup/eligible_host_devices_provider_impl.cc
@@ -9,6 +9,7 @@ #include "ash/constants/ash_features.h" #include "base/feature_list.h" #include "base/memory/ptr_util.h" +#include "base/time/time.h" namespace ash {
diff --git a/ash/services/multidevice_setup/host_verifier_impl.cc b/ash/services/multidevice_setup/host_verifier_impl.cc index 4269f50..d4eec6a 100644 --- a/ash/services/multidevice_setup/host_verifier_impl.cc +++ b/ash/services/multidevice_setup/host_verifier_impl.cc
@@ -15,6 +15,7 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" +#include "base/time/time.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h"
diff --git a/ash/services/recording/recording_encoder_muxer.h b/ash/services/recording/recording_encoder_muxer.h index ec00d72..0a92d12 100644 --- a/ash/services/recording/recording_encoder_muxer.h +++ b/ash/services/recording/recording_encoder_muxer.h
@@ -16,6 +16,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/thread_annotations.h" #include "base/threading/sequence_bound.h" +#include "base/time/time.h" #include "media/audio/audio_opus_encoder.h" #include "media/base/audio_bus.h" #include "media/base/audio_parameters.h"
diff --git a/ash/services/secure_channel/ble_connection_manager_impl.h b/ash/services/secure_channel/ble_connection_manager_impl.h index 7292c2a..996e7fc 100644 --- a/ash/services/secure_channel/ble_connection_manager_impl.h +++ b/ash/services/secure_channel/ble_connection_manager_impl.h
@@ -15,6 +15,7 @@ #include "ash/services/secure_channel/secure_channel.h" #include "base/containers/flat_map.h" #include "base/time/default_clock.h" +#include "base/time/time.h" namespace device { class BluetoothAdapter;
diff --git a/ash/services/secure_channel/ble_connection_manager_impl_unittest.cc b/ash/services/secure_channel/ble_connection_manager_impl_unittest.cc index a921a23..9928acad 100644 --- a/ash/services/secure_channel/ble_connection_manager_impl_unittest.cc +++ b/ash/services/secure_channel/ble_connection_manager_impl_unittest.cc
@@ -28,7 +28,6 @@ #include "base/bind.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h"
diff --git a/ash/services/secure_channel/connection_attempt.h b/ash/services/secure_channel/connection_attempt.h index 801063d..fd001346 100644 --- a/ash/services/secure_channel/connection_attempt.h +++ b/ash/services/secure_channel/connection_attempt.h
@@ -18,6 +18,7 @@ #include "ash/services/secure_channel/pending_connection_request.h" #include "ash/services/secure_channel/pending_connection_request_delegate.h" #include "base/time/clock.h" +#include "base/time/time.h" namespace ash::secure_channel {
diff --git a/ash/services/secure_channel/nearby_connection_metrics_recorder.h b/ash/services/secure_channel/nearby_connection_metrics_recorder.h index f3f64c17..17a5020 100644 --- a/ash/services/secure_channel/nearby_connection_metrics_recorder.h +++ b/ash/services/secure_channel/nearby_connection_metrics_recorder.h
@@ -8,6 +8,7 @@ #include "ash/services/secure_channel/device_id_pair.h" #include "base/containers/flat_map.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" namespace base { class Time;
diff --git a/ash/services/secure_channel/public/cpp/client/connection_manager_impl.h b/ash/services/secure_channel/public/cpp/client/connection_manager_impl.h index 6951cef..cc1638e 100644 --- a/ash/services/secure_channel/public/cpp/client/connection_manager_impl.h +++ b/ash/services/secure_channel/public/cpp/client/connection_manager_impl.h
@@ -11,6 +11,7 @@ #include "ash/services/secure_channel/public/cpp/client/connection_attempt.h" #include "ash/services/secure_channel/public/cpp/client/connection_manager.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" namespace base { class Clock;
diff --git a/ash/shelf/contextual_tooltip.cc b/ash/shelf/contextual_tooltip.cc index 1215c40..f7a044068 100644 --- a/ash/shelf/contextual_tooltip.cc +++ b/ash/shelf/contextual_tooltip.cc
@@ -15,6 +15,7 @@ #include "base/no_destructor.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "components/prefs/scoped_user_pref_update.h" namespace ash {
diff --git a/ash/shelf/contextual_tooltip_unittest.cc b/ash/shelf/contextual_tooltip_unittest.cc index 8e45876..debfeb9 100644 --- a/ash/shelf/contextual_tooltip_unittest.cc +++ b/ash/shelf/contextual_tooltip_unittest.cc
@@ -14,6 +14,7 @@ #include "base/strings/string_util.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "components/prefs/scoped_user_pref_update.h" #include "ui/aura/window.h"
diff --git a/ash/shelf/scrollable_shelf_view.h b/ash/shelf/scrollable_shelf_view.h index 5feba440..a10702d 100644 --- a/ash/shelf/scrollable_shelf_view.h +++ b/ash/shelf/scrollable_shelf_view.h
@@ -21,6 +21,7 @@ #include "ash/shelf/shelf_view.h" #include "base/callback_helpers.h" #include "base/cancelable_callback.h" +#include "base/time/time.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/views/animation/ink_drop_host_view.h" #include "ui/views/context_menu_controller.h"
diff --git a/ash/shelf/shelf_app_button.cc b/ash/shelf/shelf_app_button.cc index 871d2d5..06ac2cd 100644 --- a/ash/shelf/shelf_app_button.cc +++ b/ash/shelf/shelf_app_button.cc
@@ -664,7 +664,7 @@ gfx::RectF(button_bounds.x() + x_offset, button_bounds.y() + y_offset, icon_width, icon_height); - icon_view_bounds.Inset(insets_shadows); + icon_view_bounds.Inset(gfx::InsetsF(insets_shadows)); // Icon size has been incorrect when running // PanelLayoutManagerTest.PanelAlignmentSecondDisplay on valgrind bot, see // http://crbug.com/234854.
diff --git a/ash/shelf/shelf_background_animator.cc b/ash/shelf/shelf_background_animator.cc index a5223604..eb93f52 100644 --- a/ash/shelf/shelf_background_animator.cc +++ b/ash/shelf/shelf_background_animator.cc
@@ -17,6 +17,7 @@ #include "ash/style/default_color_constants.h" #include "ash/wallpaper/wallpaper_controller_impl.h" #include "ash/wm/tablet_mode/tablet_mode_controller.h" +#include "base/time/time.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/color_analysis.h" #include "ui/gfx/color_palette.h"
diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h index 1cb28a8..73d9032 100644 --- a/ash/shelf/shelf_view.h +++ b/ash/shelf/shelf_view.h
@@ -25,6 +25,7 @@ #include "ash/shell_observer.h" #include "base/cancelable_callback.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/ash/shelf/test/shelf_layout_manager_test_base.h b/ash/shelf/test/shelf_layout_manager_test_base.h index 4484677..6e62916 100644 --- a/ash/shelf/test/shelf_layout_manager_test_base.h +++ b/ash/shelf/test/shelf_layout_manager_test_base.h
@@ -10,6 +10,7 @@ #include "ash/public/cpp/shelf_types.h" #include "ash/test/ash_test_base.h" #include "ash/wm/workspace/workspace_types.h" +#include "base/time/time.h" namespace ui { class Layer;
diff --git a/ash/shell.cc b/ash/shell.cc index 3916dc52..98fd0b2 100644 --- a/ash/shell.cc +++ b/ash/shell.cc
@@ -190,7 +190,6 @@ #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/trace_event/trace_event.h" #include "chromeos/dbus/init/initialize_dbus_client.h" #include "chromeos/dbus/power/power_policy_controller.h"
diff --git a/ash/style/highlight_border.cc b/ash/style/highlight_border.cc index d3931c0..53d5e51 100644 --- a/ash/style/highlight_border.cc +++ b/ash/style/highlight_border.cc
@@ -62,8 +62,8 @@ canvas->DrawRoundRect(outer_border_bounds, scaled_corner_radius, flags); gfx::RectF inner_border_bounds(pixel_bounds); - inner_border_bounds.Inset(gfx::Insets(kHighlightBorderThickness)); - inner_border_bounds.Inset(half_thickness, half_thickness); + inner_border_bounds.Inset(kHighlightBorderThickness); + inner_border_bounds.Inset(half_thickness); flags.setColor(inner_color); canvas->DrawRoundRect(inner_border_bounds, scaled_corner_radius, flags); } @@ -98,4 +98,4 @@ kHighlightBorderThickness * 4); } -} // namespace ash \ No newline at end of file +} // namespace ash
diff --git a/ash/system/bluetooth/tray_bluetooth_helper_legacy.h b/ash/system/bluetooth/tray_bluetooth_helper_legacy.h index 39a18e42..3b763e19 100644 --- a/ash/system/bluetooth/tray_bluetooth_helper_legacy.h +++ b/ash/system/bluetooth/tray_bluetooth_helper_legacy.h
@@ -13,6 +13,7 @@ #include "ash/system/bluetooth/tray_bluetooth_helper.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "device/bluetooth/bluetooth_adapter.h" #include "services/device/public/mojom/bluetooth_system.mojom.h"
diff --git a/ash/system/eche/eche_tray.cc b/ash/system/eche/eche_tray.cc index d250e24..ce843ae 100644 --- a/ash/system/eche/eche_tray.cc +++ b/ash/system/eche/eche_tray.cc
@@ -74,6 +74,9 @@ // Max percentage of the screen height that can be covered by the eche bubble. constexpr float kMaxHeightPercentage = 0.85; +// Unload timeout to close Eche Bubble in case error from Ech web during closing +constexpr base::TimeDelta kUnloadTimeoutDuration = base::Milliseconds(500); + // Creates a button with the given callback, icon, and tooltip text. // `message_id` is the resource id of the tooltip text of the icon. std::unique_ptr<views::Button> CreateButton( @@ -270,10 +273,38 @@ if (bubble_view) bubble_view->ResetDelegate(); - bubble_.reset(); SetIsActive(false); SetVisiblePreferred(false); web_view_ = nullptr; + close_button_ = nullptr; + minimize_button_ = nullptr; + unload_timer_.reset(); + bubble_.reset(); +} + +void EcheTray::SetGracefulCloseCallback( + GracefulCloseCallback graceful_close_callback) { + if (!graceful_close_callback) + return; + graceful_close_callback_ = std::move(graceful_close_callback); +} + +void EcheTray::StartGracefulClose() { + if (!graceful_close_callback_) { + PurgeAndClose(); + return; + } + HideBubble(); + std::move(graceful_close_callback_).Run(); + // Graceful close will let Eche Web to close connection release then notify + // back to native code to close window. In case there is any exception happens + // in js layer, start a timer to force close widget in case unload can't be + // finished. + if (!unload_timer_) { + unload_timer_ = std::make_unique<base::DelayTimer>( + FROM_HERE, kUnloadTimeoutDuration, this, &EcheTray::PurgeAndClose); + unload_timer_->Reset(); + } } void EcheTray::HideBubble() { @@ -295,7 +326,8 @@ init_params.anchor_rect = shelf()->GetSystemTrayAnchorRect(); init_params.insets = GetTrayBubbleInsets(); init_params.shelf_alignment = shelf()->alignment(); - init_params.preferred_width = GetSizeForEche().width(); + const gfx::Size eche_size = CalculateSizeForEche(); + init_params.preferred_width = eche_size.width(); init_params.close_on_deactivate = false; init_params.has_shadow = false; init_params.translucent = true; @@ -315,7 +347,7 @@ AshWebView::InitParams params; params.can_record_media = true; auto web_view = AshWebViewFactory::Get()->Create(params); - web_view->SetPreferredSize(GetSizeForEche()); + web_view->SetPreferredSize(eche_size); if (!url_.is_empty()) web_view->Navigate(url_); web_view_ = bubble_view->AddChildView(std::move(web_view)); @@ -327,7 +359,7 @@ bubble_->GetBubbleView()->UpdateBubble(); } -gfx::Size EcheTray::GetSizeForEche() const { +gfx::Size EcheTray::CalculateSizeForEche() const { const gfx::Rect work_area_bounds = display::Screen::GetScreen() ->GetDisplayNearestWindow( @@ -375,18 +407,27 @@ title->SetHorizontalAlignment(gfx::ALIGN_LEFT); // Add minimize button - header->AddChildView(CreateButton( + minimize_button_ = header->AddChildView(CreateButton( base::BindRepeating(&EcheTray::CloseBubble, weak_factory_.GetWeakPtr()), kEcheMinimizeIcon, IDS_APP_ACCNAME_MINIMIZE)); // Add close button - header->AddChildView(CreateButton( - base::BindRepeating(&EcheTray::PurgeAndClose, weak_factory_.GetWeakPtr()), - kEcheCloseIcon, IDS_APP_ACCNAME_CLOSE)); + close_button_ = header->AddChildView( + CreateButton(base::BindRepeating(&EcheTray::StartGracefulClose, + weak_factory_.GetWeakPtr()), + kEcheCloseIcon, IDS_APP_ACCNAME_CLOSE)); return header; } +views::Button* EcheTray::GetMinimizeButtonForTesting() const { + return minimize_button_; +} + +views::Button* EcheTray::GetCloseButtonForTesting() const { + return close_button_; +} + views::ImageButton* EcheTray::GetIcon() { PhoneHubTray* phone_hub_tray = GetPhoneHubTray(); if (!phone_hub_tray)
diff --git a/ash/system/eche/eche_tray.h b/ash/system/eche/eche_tray.h index 878705d..7ddf071 100644 --- a/ash/system/eche/eche_tray.h +++ b/ash/system/eche/eche_tray.h
@@ -14,6 +14,7 @@ #include "ash/system/tray/tray_background_view.h" #include "ash/webui/eche_app_ui/mojom/eche_app.mojom.h" #include "base/gtest_prod_util.h" +#include "base/timer/timer.h" #include "components/session_manager/session_manager_types.h" #include "ui/views/controls/button/button.h" #include "url/gurl.h" @@ -50,6 +51,8 @@ public: METADATA_HEADER(EcheTray); + using GracefulCloseCallback = base::OnceCallback<void()>; + explicit EcheTray(Shelf* shelf); EcheTray(const EcheTray&) = delete; EcheTray& operator=(const EcheTray&) = delete; @@ -85,6 +88,16 @@ // Sets the icon that will be used on the tray. void SetIcon(const gfx::Image& icon, const std::u16string& tooltip_text); + // Sets graceful close callback functiion. When close Eche Bubble, it will + // notify to Eche Web to release connection resource. Be aware that once this + // is set, close button will not call PurgeAndClose() but rely on Eche Web to + // close window when connection resource is released; if it is not set, then + // it will immediaely call PurgeAndClose() to close window. + void SetGracefulCloseCallback(GracefulCloseCallback graceful_close_callback); + + views::Button* GetMinimizeButtonForTesting() const; + views::Button* GetCloseButtonForTesting() const; + // Initializes the bubble with given parameters. If there is any previous // bubble already shown with a different URL it is going to be closed. The // bubble is not shown initially until `ShowBubble` is called. @@ -118,9 +131,9 @@ private: FRIEND_TEST_ALL_PREFIXES(EcheTrayTest, EcheTrayCreatesBubbleButHideFirst); - // Returns the size of the Exo bubble based on the screen size and - // orientation. - gfx::Size GetSizeForEche() const; + // Calculates and returns the size of the Exo bubble based on the screen size + // and orientation. + gfx::Size CalculateSizeForEche() const; // Handles the click on the "back" arrow in the header. void OnArrowBackActivated(); @@ -134,6 +147,10 @@ void StartLoadingAnimation(); void SetIconVisibility(bool visibility); + // Starts graceful close to ensure connection resource is released before + // window is closed. + void StartGracefulClose(); + PhoneHubTray* GetPhoneHubTray(); EcheIconLoadingIndicatorView* GetLoadingIndicator(); @@ -156,6 +173,14 @@ base::ScopedObservation<SessionControllerImpl, SessionObserver> observed_session_{this}; + GracefulCloseCallback graceful_close_callback_; + + // The unload timer to force close EcheTray in case unload error. + std::unique_ptr<base::DelayTimer> unload_timer_; + + views::Button* close_button_ = nullptr; + views::Button* minimize_button_ = nullptr; + base::WeakPtrFactory<EcheTray> weak_factory_{this}; };
diff --git a/ash/system/eche/eche_tray_unittest.cc b/ash/system/eche/eche_tray_unittest.cc index fe4f671..d7f920564 100644 --- a/ash/system/eche/eche_tray_unittest.cc +++ b/ash/system/eche/eche_tray_unittest.cc
@@ -19,6 +19,20 @@ namespace ash { +namespace { + +bool is_web_content_unloaded_ = false; + +void UnloadWebContent() { + is_web_content_unloaded_ = true; +} + +void ResetUnloadWebContent() { + is_web_content_unloaded_ = false; +} + +} // namespace + class EcheTrayTest : public AshTestBase { public: EcheTrayTest() = default; @@ -53,6 +67,11 @@ eche_tray_->GetBoundsInScreen().CenterPoint()); } + void ClickButton(views::Button* button) { + GetEventGenerator()->GestureTapAt( + button->GetBoundsInScreen().CenterPoint()); + } + EcheTray* eche_tray() { return eche_tray_; } PhoneHubTray* phone_hub_tray() { return phone_hub_tray_; } @@ -173,4 +192,29 @@ EXPECT_FALSE(eche_tray()->GetVisible()); } +TEST_F(EcheTrayTest, EcheTrayMinimizeButtonClicked) { + eche_tray()->LoadBubble(GURL("http://google.com"), gfx::Image(), u"app 1"); + eche_tray()->ShowBubble(); + + EXPECT_TRUE( + eche_tray()->get_bubble_wrapper_for_test()->bubble_view()->GetVisible()); + + ClickButton(eche_tray()->GetMinimizeButtonForTesting()); + + EXPECT_FALSE( + eche_tray()->get_bubble_wrapper_for_test()->bubble_view()->GetVisible()); + EXPECT_FALSE(is_web_content_unloaded_); +} + +TEST_F(EcheTrayTest, EcheTrayCloseButtonClicked) { + ResetUnloadWebContent(); + eche_tray()->SetGracefulCloseCallback(base::BindOnce(&UnloadWebContent)); + eche_tray()->LoadBubble(GURL("http://google.com"), gfx::Image(), u"app 1"); + eche_tray()->ShowBubble(); + + ClickButton(eche_tray()->GetCloseButtonForTesting()); + + EXPECT_TRUE(is_web_content_unloaded_); +} + } // namespace ash
diff --git a/ash/system/geolocation/geolocation_controller_unittest.cc b/ash/system/geolocation/geolocation_controller_unittest.cc index c40276d..d763400 100644 --- a/ash/system/geolocation/geolocation_controller_unittest.cc +++ b/ash/system/geolocation/geolocation_controller_unittest.cc
@@ -12,6 +12,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/simple_test_clock.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/timer/mock_timer.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "third_party/icu/source/i18n/unicode/timezone.h" @@ -269,4 +270,4 @@ } // namespace -} // namespace ash \ No newline at end of file +} // namespace ash
diff --git a/ash/system/holding_space/holding_space_tray_icon.h b/ash/system/holding_space/holding_space_tray_icon.h index a7a00e4..8096f84 100644 --- a/ash/system/holding_space/holding_space_tray_icon.h +++ b/ash/system/holding_space/holding_space_tray_icon.h
@@ -15,6 +15,7 @@ #include "ash/shell.h" #include "ash/shell_observer.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/view.h"
diff --git a/ash/system/machine_learning/user_settings_event_logger_unittest.cc b/ash/system/machine_learning/user_settings_event_logger_unittest.cc index 09168159..14dbf63f 100644 --- a/ash/system/machine_learning/user_settings_event_logger_unittest.cc +++ b/ash/system/machine_learning/user_settings_event_logger_unittest.cc
@@ -16,6 +16,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "chromeos/dbus/power_manager/backlight.pb.h" #include "chromeos/dbus/power_manager/power_supply_properties.pb.h" #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"
diff --git a/ash/system/message_center/ash_notification_view.h b/ash/system/message_center/ash_notification_view.h index 7e2ccf9..efca803 100644 --- a/ash/system/message_center/ash_notification_view.h +++ b/ash/system/message_center/ash_notification_view.h
@@ -6,6 +6,7 @@ #define ASH_SYSTEM_MESSAGE_CENTER_ASH_NOTIFICATION_VIEW_H_ #include "ash/ash_export.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_observer.h"
diff --git a/ash/system/nearby_share/nearby_share_feature_pod_controller.h b/ash/system/nearby_share/nearby_share_feature_pod_controller.h index 61e52bd3..d880eb3d 100644 --- a/ash/system/nearby_share/nearby_share_feature_pod_controller.h +++ b/ash/system/nearby_share/nearby_share_feature_pod_controller.h
@@ -8,6 +8,7 @@ #include "ash/ash_export.h" #include "ash/system/nearby_share/nearby_share_controller_impl.h" #include "ash/system/unified/feature_pod_controller_base.h" +#include "base/time/time.h" #include "base/timer/timer.h" namespace ash {
diff --git a/ash/system/overview/overview_button_tray.h b/ash/system/overview/overview_button_tray.h index cf8bcfca..864bf83 100644 --- a/ash/system/overview/overview_button_tray.h +++ b/ash/system/overview/overview_button_tray.h
@@ -11,6 +11,7 @@ #include "ash/public/cpp/tablet_mode_observer.h" #include "ash/system/tray/tray_background_view.h" #include "ash/wm/overview/overview_observer.h" +#include "base/time/time.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/events/event_constants.h"
diff --git a/ash/system/palette/tools/metalayer_mode.h b/ash/system/palette/tools/metalayer_mode.h index 63da52da..3e0e3b0 100644 --- a/ash/system/palette/tools/metalayer_mode.h +++ b/ash/system/palette/tools/metalayer_mode.h
@@ -10,6 +10,7 @@ #include "ash/public/cpp/assistant/assistant_state.h" #include "ash/system/palette/common_palette_tool.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "ui/events/event_handler.h" namespace ash {
diff --git a/ash/system/power/peripheral_battery_listener.h b/ash/system/power/peripheral_battery_listener.h index fc45706..5016e02 100644 --- a/ash/system/power/peripheral_battery_listener.h +++ b/ash/system/power/peripheral_battery_listener.h
@@ -14,6 +14,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromeos/dbus/power/power_manager_client.h" #include "device/bluetooth/bluetooth_adapter.h"
diff --git a/ash/system/power/peripheral_battery_notifier.h b/ash/system/power/peripheral_battery_notifier.h index 964e290..2594c73 100644 --- a/ash/system/power/peripheral_battery_notifier.h +++ b/ash/system/power/peripheral_battery_notifier.h
@@ -13,6 +13,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chromeos/dbus/power/power_manager_client.h" #include "device/bluetooth/bluetooth_adapter.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/ash/system/power/power_button_controller.cc b/ash/system/power/power_button_controller.cc index 7a06485..fe37c6f 100644 --- a/ash/system/power/power_button_controller.cc +++ b/ash/system/power/power_button_controller.cc
@@ -28,6 +28,7 @@ #include "base/command_line.h" #include "base/json/json_reader.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "chromeos/dbus/power_manager/backlight.pb.h" #include "ui/compositor/layer.h" #include "ui/display/types/display_snapshot.h"
diff --git a/ash/system/power/power_button_menu_view.cc b/ash/system/power/power_button_menu_view.cc index e7dc46a..50ba8dec 100644 --- a/ash/system/power/power_button_menu_view.cc +++ b/ash/system/power/power_button_menu_view.cc
@@ -27,6 +27,7 @@ #include "ash/wm/tablet_mode/tablet_mode_controller.h" #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/time/time.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animator.h"
diff --git a/ash/system/power/power_prefs.h b/ash/system/power/power_prefs.h index 49812be..483c9f1 100644 --- a/ash/system/power/power_prefs.h +++ b/ash/system/power/power_prefs.h
@@ -11,6 +11,7 @@ #include "ash/public/cpp/session/session_observer.h" #include "base/scoped_observation.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "chromeos/dbus/power/power_manager_client.h" class PrefChangeRegistrar;
diff --git a/ash/system/time/calendar_month_view.h b/ash/system/time/calendar_month_view.h index e1b5994..2c42ee34 100644 --- a/ash/system/time/calendar_month_view.h +++ b/ash/system/time/calendar_month_view.h
@@ -8,6 +8,7 @@ #include "ash/ash_export.h" #include "ash/system/time/calendar_view_controller.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/view.h"
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc index ef1b01bd..e7a310d 100644 --- a/ash/system/tray/tray_background_view.cc +++ b/ash/system/tray/tray_background_view.cc
@@ -138,7 +138,7 @@ // HighlightPathGenerator: absl::optional<gfx::RRectF> GetRoundRect(const gfx::RectF& rect) override { gfx::RectF bounds(tray_background_view_->GetBackgroundBounds()); - bounds.Inset(insets_); + bounds.Inset(gfx::InsetsF(insets_)); return gfx::RRectF(bounds, ShelfConfig::Get()->control_border_radius()); }
diff --git a/ash/system/tray/tray_popup_utils.cc b/ash/system/tray/tray_popup_utils.cc index 736f018..7c44c98c1 100644 --- a/ash/system/tray/tray_popup_utils.cc +++ b/ash/system/tray/tray_popup_utils.cc
@@ -129,7 +129,7 @@ // views::HighlightPathGenerator: absl::optional<gfx::RRectF> GetRoundRect(const gfx::RectF& rect) override { gfx::RectF bounds = rect; - bounds.Inset(GetInkDropInsets(ink_drop_style_)); + bounds.Inset(gfx::InsetsF(GetInkDropInsets(ink_drop_style_))); float corner_radius = 0.f; switch (ink_drop_style_) { case TrayPopupInkDropStyle::HOST_CENTERED:
diff --git a/ash/system/update/update_notification_controller.cc b/ash/system/update/update_notification_controller.cc index 6e7963a..9dd78d5 100644 --- a/ash/system/update/update_notification_controller.cc +++ b/ash/system/update/update_notification_controller.cc
@@ -19,7 +19,6 @@ #include "base/files/file_util.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/vector_icons/vector_icons.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc index a848d92e..60f97d4 100644 --- a/ash/touch/touch_observer_hud_unittest.cc +++ b/ash/touch/touch_observer_hud_unittest.cc
@@ -15,6 +15,7 @@ #include "base/command_line.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "ui/aura/window.h" #include "ui/display/manager/display_manager.h" #include "ui/display/test/display_manager_test_api.h"
diff --git a/ash/wallpaper/wallpaper_controller_impl.cc b/ash/wallpaper/wallpaper_controller_impl.cc index 0f93982..e5b69ab 100644 --- a/ash/wallpaper/wallpaper_controller_impl.cc +++ b/ash/wallpaper/wallpaper_controller_impl.cc
@@ -62,7 +62,6 @@ #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/ash/wallpaper/wallpaper_controller_unittest.cc b/ash/wallpaper/wallpaper_controller_unittest.cc index ef8e065f..ac6f5f9 100644 --- a/ash/wallpaper/wallpaper_controller_unittest.cc +++ b/ash/wallpaper/wallpaper_controller_unittest.cc
@@ -40,7 +40,6 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/task/task_observer.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/bind.h"
diff --git a/ash/wallpaper/wallpaper_utils/wallpaper_resizer_unittest.cc b/ash/wallpaper/wallpaper_utils/wallpaper_resizer_unittest.cc index b56b8f62..bcfeb88 100644 --- a/ash/wallpaper/wallpaper_utils/wallpaper_resizer_unittest.cc +++ b/ash/wallpaper/wallpaper_utils/wallpaper_resizer_unittest.cc
@@ -13,6 +13,7 @@ #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/image/image_skia_rep.h"
diff --git a/ash/webui/eche_app_ui/eche_app_manager.cc b/ash/webui/eche_app_ui/eche_app_manager.cc index a6633fb..e1c1624 100644 --- a/ash/webui/eche_app_ui/eche_app_manager.cc +++ b/ash/webui/eche_app_ui/eche_app_manager.cc
@@ -29,6 +29,7 @@ const char kMetricNameDuration[] = "Eche.Connection.Duration"; const char kMetricNameLatency[] = "Eche.Connectivity.Latency"; } // namespace + namespace eche_app { EcheAppManager::EcheAppManager( @@ -136,6 +137,10 @@ stream_status_change_handler_->Bind(std::move(receiver)); } +void EcheAppManager::CloseStream() { + stream_status_change_handler_->CloseStream(); +} + AppsAccessManager* EcheAppManager::GetAppsAccessManager() { return apps_access_manager_.get(); }
diff --git a/ash/webui/eche_app_ui/eche_app_manager.h b/ash/webui/eche_app_ui/eche_app_manager.h index b9c31c0a..7d2be997 100644 --- a/ash/webui/eche_app_ui/eche_app_manager.h +++ b/ash/webui/eche_app_ui/eche_app_manager.h
@@ -87,6 +87,9 @@ AppsAccessManager* GetAppsAccessManager(); + // This trigger Eche Web to release connection resource. + void CloseStream(); + // KeyedService: void Shutdown() override;
diff --git a/ash/webui/eche_app_ui/eche_presence_manager.h b/ash/webui/eche_app_ui/eche_presence_manager.h index 425776e..2f9bfea3 100644 --- a/ash/webui/eche_app_ui/eche_presence_manager.h +++ b/ash/webui/eche_app_ui/eche_presence_manager.h
@@ -13,6 +13,7 @@ #include "ash/webui/eche_app_ui/eche_message_receiver.h" #include "ash/webui/eche_app_ui/feature_status_provider.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" namespace ash {
diff --git a/ash/webui/eche_app_ui/eche_recent_app_click_handler.cc b/ash/webui/eche_app_ui/eche_recent_app_click_handler.cc index ebe3b04e..5f5e81ed 100644 --- a/ash/webui/eche_app_ui/eche_recent_app_click_handler.cc +++ b/ash/webui/eche_app_ui/eche_recent_app_click_handler.cc
@@ -4,7 +4,6 @@ #include "ash/webui/eche_app_ui/eche_recent_app_click_handler.h" -#include "ash/components/multidevice/logging/logging.h" #include "ash/components/phonehub/phone_hub_manager.h" #include "ash/root_window_controller.h" #include "ash/shell.h"
diff --git a/ash/webui/eche_app_ui/eche_stream_status_change_handler.cc b/ash/webui/eche_app_ui/eche_stream_status_change_handler.cc index 756f2a7..5bb89701 100644 --- a/ash/webui/eche_app_ui/eche_stream_status_change_handler.cc +++ b/ash/webui/eche_app_ui/eche_stream_status_change_handler.cc
@@ -26,6 +26,13 @@ NotifyStreamStatusChanged(status); } +void EcheStreamStatusChangeHandler::SetStreamActionObserver( + mojo::PendingRemote<mojom::StreamActionObserver> observer) { + PA_LOG(INFO) << "echeapi EcheDisplayStreamHandler SetStreamActionObserver"; + observer_remote_.reset(); + observer_remote_.Bind(std::move(observer)); +} + void EcheStreamStatusChangeHandler::Bind( mojo::PendingReceiver<mojom::DisplayStreamHandler> receiver) { display_stream_receiver_.reset(); @@ -51,5 +58,11 @@ observer.OnStreamStatusChanged(status); } +void EcheStreamStatusChangeHandler::CloseStream() { + if (!observer_remote_.is_bound()) + return; + observer_remote_->OnStreamAction(mojom::StreamAction::kStreamActionClose); +} + } // namespace eche_app } // namespace ash
diff --git a/ash/webui/eche_app_ui/eche_stream_status_change_handler.h b/ash/webui/eche_app_ui/eche_stream_status_change_handler.h index 06ae6c4b..3ea0b0e 100644 --- a/ash/webui/eche_app_ui/eche_stream_status_change_handler.h +++ b/ash/webui/eche_app_ui/eche_stream_status_change_handler.h
@@ -8,7 +8,9 @@ #include "ash/webui/eche_app_ui/mojom/eche_app.mojom.h" #include "base/observer_list.h" #include "base/observer_list_types.h" +#include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" +#include "mojo/public/cpp/bindings/remote.h" namespace ash { namespace eche_app { @@ -34,9 +36,13 @@ EcheStreamStatusChangeHandler& operator=( const EcheStreamStatusChangeHandler&) = delete; + void CloseStream(); + // mojom::DisplayStreamHandler: void StartStreaming() override; void OnStreamStatusChanged(mojom::StreamStatus status) override; + void SetStreamActionObserver( + mojo::PendingRemote<mojom::StreamActionObserver> observer) override; void AddObserver(Observer* observer); void RemoveObserver(Observer* observer); @@ -49,6 +55,7 @@ private: mojo::Receiver<mojom::DisplayStreamHandler> display_stream_receiver_{this}; + mojo::Remote<mojom::StreamActionObserver> observer_remote_; base::ObserverList<Observer> observer_list_; };
diff --git a/ash/webui/eche_app_ui/eche_tray_stream_status_observer.cc b/ash/webui/eche_app_ui/eche_tray_stream_status_observer.cc index f5ac2e8..3e189eb0 100644 --- a/ash/webui/eche_app_ui/eche_tray_stream_status_observer.cc +++ b/ash/webui/eche_app_ui/eche_tray_stream_status_observer.cc
@@ -22,10 +22,12 @@ void LaunchBubble(const GURL& url, const gfx::Image& icon, - const std::u16string& visible_name) { + const std::u16string& visible_name, + EcheTray::GracefulCloseCallback graceful_close_callback) { auto* eche_tray = ash::GetEcheTray(); DCHECK(eche_tray); eche_tray->LoadBubble(url, icon, visible_name); + eche_tray->SetGracefulCloseCallback(std::move(graceful_close_callback)); } void CloseBubble() {
diff --git a/ash/webui/eche_app_ui/eche_tray_stream_status_observer.h b/ash/webui/eche_app_ui/eche_tray_stream_status_observer.h index 6ed372f..434029c 100644 --- a/ash/webui/eche_app_ui/eche_tray_stream_status_observer.h +++ b/ash/webui/eche_app_ui/eche_tray_stream_status_observer.h
@@ -5,6 +5,7 @@ #ifndef ASH_WEBUI_ECHE_APP_UI_ECHE_TRAY_STREAM_STATUS_OBSERVER_H_ #define ASH_WEBUI_ECHE_APP_UI_ECHE_TRAY_STREAM_STATUS_OBSERVER_H_ +#include "ash/system/eche/eche_tray.h" #include "ash/webui/eche_app_ui/eche_stream_status_change_handler.h" #include "ash/webui/eche_app_ui/mojom/eche_app.mojom.h" #include "base/scoped_observation.h" @@ -22,7 +23,8 @@ // `GetEcheTray` everywhere. void LaunchBubble(const GURL& url, const gfx::Image& icon, - const std::u16string& visible_name); + const std::u16string& visible_name, + EcheTray::GracefulCloseCallback graceful_close_callback); // It is called from chrome/browser/ash/eche_app/eche_app_manager_factory.cc. void CloseBubble();
diff --git a/ash/webui/eche_app_ui/eche_tray_stream_status_observer_unittest.cc b/ash/webui/eche_app_ui/eche_tray_stream_status_observer_unittest.cc index c01c449..38fec7e 100644 --- a/ash/webui/eche_app_ui/eche_tray_stream_status_observer_unittest.cc +++ b/ash/webui/eche_app_ui/eche_tray_stream_status_observer_unittest.cc
@@ -18,6 +18,10 @@ namespace ash { namespace eche_app { +namespace { +void GracefulCloseFunction() {} +} // namespace + class EcheTrayStreamStatusObserverTest : public AshTestBase { protected: EcheTrayStreamStatusObserverTest() = default; @@ -70,7 +74,8 @@ }; TEST_F(EcheTrayStreamStatusObserverTest, LaunchBubble) { - LaunchBubble(GURL("http://google.com"), gfx::Image(), u"app 1"); + LaunchBubble(GURL("http://google.com"), gfx::Image(), u"app 1", + base::BindOnce(&GracefulCloseFunction)); // Wait for Eche Tray to load Eche Web to complete. base::RunLoop().RunUntilIdle(); @@ -95,7 +100,8 @@ // The bubble should not be created if LaunchBubble be called before. EXPECT_FALSE(eche_tray()->get_bubble_wrapper_for_test()); - LaunchBubble(GURL("http://google.com"), gfx::Image(), u"app 1"); + LaunchBubble(GURL("http://google.com"), gfx::Image(), u"app 1", + base::BindOnce(&GracefulCloseFunction)); // Wait for Eche Tray to load Eche Web to complete. base::RunLoop().RunUntilIdle(); @@ -113,7 +119,8 @@ } TEST_F(EcheTrayStreamStatusObserverTest, OnStreamStatusChanged) { - LaunchBubble(GURL("http://google.com"), gfx::Image(), u"app 1"); + LaunchBubble(GURL("http://google.com"), gfx::Image(), u"app 1", + base::BindOnce(&GracefulCloseFunction)); OnStreamStatusChanged(mojom::StreamStatus::kStreamStatusStarted); // Wait for Eche Tray to load Eche Web to complete.
diff --git a/ash/webui/eche_app_ui/mojom/eche_app.mojom b/ash/webui/eche_app_ui/mojom/eche_app.mojom index 312b34b..72d9e4a 100644 --- a/ash/webui/eche_app_ui/mojom/eche_app.mojom +++ b/ash/webui/eche_app_ui/mojom/eche_app.mojom
@@ -104,6 +104,24 @@ interface DisplayStreamHandler { // Stream a display video for Eche. StartStreaming(); + // Notifies the stream status change for Eche. OnStreamStatusChanged(StreamStatus status); + + // Registers a generic interface to observe events from browser-to-renderer. + SetStreamActionObserver(pending_remote<StreamActionObserver> observer); +}; + +// Enum representing stream action from Eche SWA. Numerical values should not +// be changed because they must stay in sync with value on for Eche Web app. +enum StreamAction { + kStreamActionClose, +}; + +// A generic interface to observe stream action from Eche SWA native code for +// Eche Web app can free resource for stream +interface StreamActionObserver { + // Interface for notifying Eche web app that stream action happens from Eche + // SWA + OnStreamAction(StreamAction action); };
diff --git a/ash/webui/eche_app_ui/resources/browser_proxy.js b/ash/webui/eche_app_ui/resources/browser_proxy.js index e0e3c4a..2cebd11 100644 --- a/ash/webui/eche_app_ui/resources/browser_proxy.js +++ b/ash/webui/eche_app_ui/resources/browser_proxy.js
@@ -45,6 +45,12 @@ const displayStreamHandler = ash.echeApp.mojom.DisplayStreamHandler.getRemote(); +const streamActionObserverRouter = + new ash.echeApp.mojom.StreamActionObserverCallbackRouter(); +// Set up a message pipe to the browser process to monitor stream action. +displayStreamHandler.setStreamActionObserver( + streamActionObserverRouter.$.bindNewPipeAndPassRemote()); + /** * A pipe through which we can send messages to the guest frame. * Use an undefined `target` to find the <iframe> automatically. @@ -118,6 +124,13 @@ Message.TABLET_MODE, {/** @type {boolean} */ isTabletMode}); }); + // Add stream action listener and send result via pipes. + streamActionObserverRouter.onStreamAction.addListener((action) => { + console.log(`echeapi browser_proxy.js OnStreamAction ${action}`); + guestMessagePipe.sendMessage( + Message.STREAM_ACTION, {/** @type {number} */ action}); + }); + guestMessagePipe.registerHandler( Message.SHOW_NOTIFICATION, async (message) => { // The C++ layer uses std::u16string, which use 16 bit characters. JS
diff --git a/ash/webui/eche_app_ui/resources/message_types.js b/ash/webui/eche_app_ui/resources/message_types.js index 73259ea..4f083ad 100644 --- a/ash/webui/eche_app_ui/resources/message_types.js +++ b/ash/webui/eche_app_ui/resources/message_types.js
@@ -62,6 +62,12 @@ /* #export */ let EnumHistogram; /** + * A number that represents the action to control stream. + * @typedef {number} StreamAction + */ +/* #export */ let StreamAction; + +/** * Enum for message types. * @enum {string} */ @@ -91,4 +97,6 @@ ENUM_HISTOGRAM_MESSAGE: 'enum_histagram_message', // Message for starting the display video of Eche. START_STREAMING: 'start_streaming', + // Message for stream action + STREAM_ACTION: 'stream_action', };
diff --git a/ash/webui/eche_app_ui/resources/receiver.js b/ash/webui/eche_app_ui/resources/receiver.js index f598738..02f7c3a 100644 --- a/ash/webui/eche_app_ui/resources/receiver.js +++ b/ash/webui/eche_app_ui/resources/receiver.js
@@ -38,6 +38,14 @@ notificationCallback(/** @type {!NotificationInfo} */ (message)); }); +let streamActionCallback = null; +parentMessagePipe.registerHandler(Message.STREAM_ACTION, async (message) => { + if (!streamActionCallback) { + return; + } + streamActionCallback(/** @type {!StreamAction} */ (message.action)); +}); + // The implementation of echeapi.d.ts const EcheApiBindingImpl = new class { closeWindow() { @@ -109,6 +117,11 @@ parentMessagePipe.sendMessage( Message.ENUM_HISTOGRAM_MESSAGE, {histogram, value, maxValue}); } + + onStreamAction(callback) { + console.log('echeapi receiver.js onStreamAction'); + streamActionCallback = callback; + } }; // Declare module echeapi and bind the implementation to echeapi.d.ts @@ -142,5 +155,7 @@ EcheApiBindingImpl.sendTimeHistogram.bind(EcheApiBindingImpl); echeapi.system.sendEnumHistogram = EcheApiBindingImpl.sendEnumHistogram.bind(EcheApiBindingImpl); +echeapi.system.registerStreamActionReceiver = + EcheApiBindingImpl.onStreamAction.bind(EcheApiBindingImpl); window['echeapi'] = echeapi; console.log('echeapi receiver.js finish bind the implementation of echeapi');
diff --git a/ash/webui/media_app_ui/media_app_guest_ui.cc b/ash/webui/media_app_ui/media_app_guest_ui.cc index 1c6844d..60ec67c 100644 --- a/ash/webui/media_app_ui/media_app_guest_ui.cc +++ b/ash/webui/media_app_ui/media_app_guest_ui.cc
@@ -9,7 +9,6 @@ #include "ash/webui/web_applications/webui_test_prod_util.h" #include "base/files/file_util.h" #include "base/memory/ref_counted_memory.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "chromeos/grit/chromeos_media_app_bundle_resources.h"
diff --git a/ash/webui/os_feedback_ui/resources/BUILD.gn b/ash/webui/os_feedback_ui/resources/BUILD.gn index 85c7800..46f98ed 100644 --- a/ash/webui/os_feedback_ui/resources/BUILD.gn +++ b/ash/webui/os_feedback_ui/resources/BUILD.gn
@@ -119,6 +119,7 @@ js_library("search_page") { deps = [ + ":feedback_flow", ":help_content", ":mojo_interface_provider", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
diff --git a/ash/webui/os_feedback_ui/resources/feedback_flow.html b/ash/webui/os_feedback_ui/resources/feedback_flow.html index 768f49f2..86a062ce 100644 --- a/ash/webui/os_feedback_ui/resources/feedback_flow.html +++ b/ash/webui/os_feedback_ui/resources/feedback_flow.html
@@ -1,6 +1,7 @@ <div> <iron-pages attr-for-selected="id" selected="[[currentState_]]"> - <search-page id="searchPage"></search-page> + <search-page id="searchPage" on-continue-click="handleContinueClick_"> + </search-page> <share-data-page id="shareDataPage"></share-data-page> <confirmation-page id="confirmationPage"></confirmation-page> </iron-pages>
diff --git a/ash/webui/os_feedback_ui/resources/feedback_flow.js b/ash/webui/os_feedback_ui/resources/feedback_flow.js index edf8716..081124f0 100644 --- a/ash/webui/os_feedback_ui/resources/feedback_flow.js +++ b/ash/webui/os_feedback_ui/resources/feedback_flow.js
@@ -47,6 +47,20 @@ */ this.currentState_ = FeedbackFlowState.SEARCH; } + + /** + * @param {!Event} event + * @protected + */ + handleContinueClick_(event) { + switch (event.detail.currentState) { + case FeedbackFlowState.SEARCH: + this.currentState_ = FeedbackFlowState.SHARE_DATA; + break; + default: + console.warn('unexpected state: ', event.detail.currentState); + } + } } customElements.define(FeedbackFlowElement.is, FeedbackFlowElement);
diff --git a/ash/webui/os_feedback_ui/resources/search_page.html b/ash/webui/os_feedback_ui/resources/search_page.html index 3a3f75f..33cbd61 100644 --- a/ash/webui/os_feedback_ui/resources/search_page.html +++ b/ash/webui/os_feedback_ui/resources/search_page.html
@@ -17,7 +17,6 @@ color: var(--google-red-600); font-weight: bold; } - </style> <!--TODO(xiangdongkong): use localized strings --> <div id="container">
diff --git a/ash/webui/os_feedback_ui/resources/search_page.js b/ash/webui/os_feedback_ui/resources/search_page.js index f7020e2..329b224 100644 --- a/ash/webui/os_feedback_ui/resources/search_page.js +++ b/ash/webui/os_feedback_ui/resources/search_page.js
@@ -10,6 +10,7 @@ import {stringToMojoString16} from 'chrome://resources/ash/common/mojo_utils.js'; import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +import {FeedbackFlowState} from './feedback_flow.js'; import {HelpContentList, HelpContentProviderInterface, SearchRequest, SearchResponse, SearchResult} from './feedback_types.js'; import {getHelpContentProvider} from './mojo_interface_provider.js'; @@ -225,11 +226,17 @@ * @private */ handleContinueButtonClicked_(e) { + e.stopPropagation(); + const textInput = this.getInputElement_().value; if (textInput.length === 0) { this.onInputInvalid_(); } else { - // TODO(xiangdongkong): fire an event. + this.dispatchEvent(new CustomEvent('continue-click', { + composed: true, + bubbles: true, + detail: {currentState: FeedbackFlowState.SEARCH} + })); } } }
diff --git a/ash/webui/shimless_rma/resources/onboarding_landing_page.html b/ash/webui/shimless_rma/resources/onboarding_landing_page.html index 68a0967..9a94a0db 100644 --- a/ash/webui/shimless_rma/resources/onboarding_landing_page.html +++ b/ash/webui/shimless_rma/resources/onboarding_landing_page.html
@@ -7,6 +7,15 @@ #nextButtonCaret { margin-inline-start: 5px; } + + #navigationButtonWrapper { + bottom: var(--footer-height); + position: absolute; + } + + #getStartedButton { + margin-inline-end: 8px; + } </style> <base-page> @@ -33,20 +42,22 @@ </span> </span> </div> - <cr-button id="getStartedButton" class="action-button" - on-click="onGetStartedButtonClicked_" - disabled="[[isGetStartedButtonDisabled_(verificationInProgress_, - allButtonsDisabled)]]"> - [[i18n('getStartedButtonLabel')]] - <span id="nextButtonCaret">></span> - </cr-button> - <cr-button id="landingCancel" class="pill" - on-click="onLandingCancelButtonClicked_" - disabled="[[allButtonsDisabled]]"> - <span id="cancelButtonLabel"> - [[i18n('cancelButtonLabel')]] - </span> - </cr-button> + <div id="navigationButtonWrapper"> + <cr-button id="getStartedButton" class="action-button" + on-click="onGetStartedButtonClicked_" + disabled="[[isGetStartedButtonDisabled_(verificationInProgress_, + allButtonsDisabled)]]"> + [[i18n('getStartedButtonLabel')]] + <span id="nextButtonCaret">></span> + </cr-button> + <cr-button id="landingCancel" class="pill" + on-click="onLandingCancelButtonClicked_" + disabled="[[allButtonsDisabled]]"> + <span id="cancelButtonLabel"> + [[i18n('cancelButtonLabel')]] + </span> + </cr-button> + </div> </div> <div slot="right-pane"> <div class="illustration-wrapper">
diff --git a/ash/wm/client_controlled_state.h b/ash/wm/client_controlled_state.h index aa79303..e5a4960e 100644 --- a/ash/wm/client_controlled_state.h +++ b/ash/wm/client_controlled_state.h
@@ -10,6 +10,7 @@ #include "ash/ash_export.h" #include "ash/wm/base_state.h" #include "ash/wm/wm_event.h" +#include "base/time/time.h" #include "ui/display/display.h" #include "ui/gfx/geometry/rect.h"
diff --git a/ash/wm/desks/desk_animation_impl.h b/ash/wm/desks/desk_animation_impl.h index 5b051cd64..fc7e3f6 100644 --- a/ash/wm/desks/desk_animation_impl.h +++ b/ash/wm/desks/desk_animation_impl.h
@@ -10,6 +10,7 @@ #include "ash/wm/desks/desk_animation_base.h" #include "ash/wm/desks/desks_histogram_enums.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" namespace ui { class PresentationTimeRecorder;
diff --git a/ash/wm/desks/desks_restore_util.cc b/ash/wm/desks/desks_restore_util.cc index 0066131..7a768d8 100644 --- a/ash/wm/desks/desks_restore_util.cc +++ b/ash/wm/desks/desks_restore_util.cc
@@ -17,6 +17,7 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/values.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h"
diff --git a/ash/wm/desks/templates/desks_templates_item_view.cc b/ash/wm/desks/templates/desks_templates_item_view.cc index c22f33d..83ab1da 100644 --- a/ash/wm/desks/templates/desks_templates_item_view.cc +++ b/ash/wm/desks/templates/desks_templates_item_view.cc
@@ -30,6 +30,7 @@ #include "ash/wm/overview/overview_session.h" #include "base/i18n/time_formatting.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chromeos/ui/vector_icons/vector_icons.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/time_format.h"
diff --git a/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl.cc b/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl.cc index db51c8da..38def9f 100644 --- a/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl.cc +++ b/ash/wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl.cc
@@ -12,6 +12,7 @@ #include "ash/wm/gestures/back_gesture/back_gesture_contextual_nudge.h" #include "ash/wm/window_util.h" #include "base/bind.h" +#include "base/time/time.h" #include "components/prefs/pref_service.h" #include "ui/aura/client/window_types.h" #include "ui/wm/public/activation_client.h"
diff --git a/ash/wm/splitview/split_view_utils.cc b/ash/wm/splitview/split_view_utils.cc index 12e75b6..db108067 100644 --- a/ash/wm/splitview/split_view_utils.cc +++ b/ash/wm/splitview/split_view_utils.cc
@@ -19,6 +19,7 @@ #include "ash/wm/tablet_mode/tablet_mode_controller.h" #include "ash/wm/window_state.h" #include "base/command_line.h" +#include "base/time/time.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h"
diff --git a/ash/wm/tablet_mode/tablet_mode_window_drag_delegate.h b/ash/wm/tablet_mode/tablet_mode_window_drag_delegate.h index a84b8f6..a20d675a 100644 --- a/ash/wm/tablet_mode/tablet_mode_window_drag_delegate.h +++ b/ash/wm/tablet_mode/tablet_mode_window_drag_delegate.h
@@ -11,6 +11,7 @@ #include "ash/wm/splitview/split_view_controller.h" #include "ash/wm/toplevel_window_event_handler.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/aura/window_occlusion_tracker.h" #include "ui/compositor/presentation_time_recorder.h"
diff --git a/base/allocator/partition_allocator/thread_cache.h b/base/allocator/partition_allocator/thread_cache.h index 35b4977..c3a12bb 100644 --- a/base/allocator/partition_allocator/thread_cache.h +++ b/base/allocator/partition_allocator/thread_cache.h
@@ -21,6 +21,7 @@ #include "base/compiler_specific.h" #include "base/dcheck_is_on.h" #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "build/build_config.h" #if defined(ARCH_CPU_X86_64) && defined(PA_HAS_64_BITS_POINTERS)
diff --git a/base/android/application_status_listener_unittest.cc b/base/android/application_status_listener_unittest.cc index cf9e989..23b7ffa 100644 --- a/base/android/application_status_listener_unittest.cc +++ b/base/android/application_status_listener_unittest.cc
@@ -11,6 +11,7 @@ #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace base {
diff --git a/base/android/reached_code_profiler.cc b/base/android/reached_code_profiler.cc index d6e2c68..adaa0f9 100644 --- a/base/android/reached_code_profiler.cc +++ b/base/android/reached_code_profiler.cc
@@ -32,6 +32,7 @@ #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "build/build_config.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/base/fuchsia/build_info_unittest.cc b/base/fuchsia/build_info_unittest.cc index e0c1540..b8ff3b0 100644 --- a/base/fuchsia/build_info_unittest.cc +++ b/base/fuchsia/build_info_unittest.cc
@@ -16,6 +16,7 @@ #include "base/test/test_future.h" #include "base/threading/sequence_bound.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace base {
diff --git a/base/fuchsia/intl_profile_watcher_unittest.cc b/base/fuchsia/intl_profile_watcher_unittest.cc index b08e88c..5bd6fb3 100644 --- a/base/fuchsia/intl_profile_watcher_unittest.cc +++ b/base/fuchsia/intl_profile_watcher_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/task_environment.h" #include "base/threading/sequence_bound.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/observer_list_threadsafe_unittest.cc b/base/observer_list_threadsafe_unittest.cc index 6e82f8b..364de22 100644 --- a/base/observer_list_threadsafe_unittest.cc +++ b/base/observer_list_threadsafe_unittest.cc
@@ -15,7 +15,6 @@ #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/base/process/kill.cc b/base/process/kill.cc index 56c8c76..5f89449b 100644 --- a/base/process/kill.cc +++ b/base/process/kill.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/process/process_iterator.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/base/process/kill_fuchsia.cc b/base/process/kill_fuchsia.cc index 983c967..3fa64898 100644 --- a/base/process/kill_fuchsia.cc +++ b/base/process/kill_fuchsia.cc
@@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/process/process_iterator.h" -#include "base/task/post_task.h" #include "base/threading/platform_thread.h" namespace base {
diff --git a/base/process/kill_posix.cc b/base/process/kill_posix.cc index d2fe2fb..d68b117 100644 --- a/base/process/kill_posix.cc +++ b/base/process/kill_posix.cc
@@ -15,7 +15,6 @@ #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/process/process_iterator.h" -#include "base/task/post_task.h" #include "base/threading/platform_thread.h" #include "build/build_config.h"
diff --git a/base/process/process_posix.cc b/base/process/process_posix.cc index 60153b6..f91d829 100644 --- a/base/process/process_posix.cc +++ b/base/process/process_posix.cc
@@ -19,6 +19,7 @@ #include "base/posix/eintr_wrapper.h" #include "base/process/kill.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "base/trace_event/base_tracing.h" #include "build/build_config.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/base/sequence_checker_unittest.cc b/base/sequence_checker_unittest.cc index 6f23492..4d6398d 100644 --- a/base/sequence_checker_unittest.cc +++ b/base/sequence_checker_unittest.cc
@@ -13,7 +13,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/sequence_token.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/base/system/sys_info.cc b/base/system/sys_info.cc index c508945..df76efe 100644 --- a/base/system/sys_info.cc +++ b/base/system/sys_info.cc
@@ -13,7 +13,6 @@ #include "base/location.h" #include "base/notreached.h" #include "base/system/sys_info_internal.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/base/task/job_perftest.cc b/base/task/job_perftest.cc index 429551f0..316d0ff 100644 --- a/base/task/job_perftest.cc +++ b/base/task/job_perftest.cc
@@ -12,7 +12,6 @@ #include "base/containers/stack.h" #include "base/synchronization/lock.h" #include "base/task/post_job.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/base/task/sequence_manager/sequence_manager_perftest.cc b/base/task/sequence_manager/sequence_manager_perftest.cc index f0118cd4..ee5e926 100644 --- a/base/task/sequence_manager/sequence_manager_perftest.cc +++ b/base/task/sequence_manager/sequence_manager_perftest.cc
@@ -15,7 +15,6 @@ #include "base/run_loop.h" #include "base/sequence_checker.h" #include "base/synchronization/condition_variable.h" -#include "base/task/post_task.h" #include "base/task/sequence_manager/task_queue_impl.h" #include "base/task/sequence_manager/test/mock_time_domain.h" #include "base/task/sequence_manager/test/sequence_manager_for_test.h"
diff --git a/base/task/single_thread_task_executor_unittest.cc b/base/task/single_thread_task_executor_unittest.cc index 47c16d4..1473df4 100644 --- a/base/task/single_thread_task_executor_unittest.cc +++ b/base/task/single_thread_task_executor_unittest.cc
@@ -24,7 +24,6 @@ #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_observer.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/base/task/thread_pool/delayed_task_manager.cc b/base/task/thread_pool/delayed_task_manager.cc index b908400c..006bd64 100644 --- a/base/task/thread_pool/delayed_task_manager.cc +++ b/base/task/thread_pool/delayed_task_manager.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/check.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner.h" #include "base/task/thread_pool/task.h"
diff --git a/base/test/task_environment.cc b/base/test/task_environment.cc index b64a71a..e0117b5c 100644 --- a/base/test/task_environment.cc +++ b/base/test/task_environment.cc
@@ -23,7 +23,6 @@ #include "base/run_loop.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequence_manager/sequence_manager_impl.h" #include "base/task/sequence_manager/time_domain.h" #include "base/task/simple_task_executor.h"
diff --git a/base/test/test_future_unittest.cc b/base/test/test_future_unittest.cc index b23e6b0..4142fef7 100644 --- a/base/test/test_future_unittest.cc +++ b/base/test/test_future_unittest.cc
@@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/gtest_util.h"
diff --git a/base/test/test_io_thread.h b/base/test/test_io_thread.h index 6ec87e0..ad2d362 100644 --- a/base/test/test_io_thread.h +++ b/base/test/test_io_thread.h
@@ -10,6 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/task/task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" namespace base {
diff --git a/base/threading/sequenced_task_runner_handle_unittest.cc b/base/threading/sequenced_task_runner_handle_unittest.cc index 632954a8..248759a 100644 --- a/base/threading/sequenced_task_runner_handle_unittest.cc +++ b/base/threading/sequenced_task_runner_handle_unittest.cc
@@ -14,7 +14,6 @@ #include "base/run_loop.h" #include "base/sequence_checker_impl.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h"
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h index a22b320..bef83a0 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h
@@ -13,6 +13,7 @@ #include "base/dcheck_is_on.h" #include "base/gtest_prod_util.h" #include "base/location.h" +#include "base/time/time.h" #include "build/build_config.h" // -----------------------------------------------------------------------------
diff --git a/base/threading/thread_unittest.cc b/base/threading/thread_unittest.cc index ec1ae94..11a1f0c 100644 --- a/base/threading/thread_unittest.cc +++ b/base/threading/thread_unittest.cc
@@ -18,7 +18,6 @@ #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/task/sequence_manager/sequence_manager_impl.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_executor.h"
diff --git a/base/timer/hi_res_timer_manager_win.cc b/base/timer/hi_res_timer_manager_win.cc index ff9eeca..6fbc3e4 100644 --- a/base/timer/hi_res_timer_manager_win.cc +++ b/base/timer/hi_res_timer_manager_win.cc
@@ -11,7 +11,6 @@ #include "base/command_line.h" #include "base/metrics/histogram_macros.h" #include "base/power_monitor/power_monitor.h" -#include "base/task/post_task.h" #include "base/time/time.h" namespace base {
diff --git a/base/timer/timer_unittest.cc b/base/timer/timer_unittest.cc index 7c164f31f..909bc4f 100644 --- a/base/timer/timer_unittest.cc +++ b/base/timer/timer_unittest.cc
@@ -13,7 +13,6 @@ #include "base/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/base/trace_event/cpufreq_monitor_android.cc b/base/trace_event/cpufreq_monitor_android.cc index 8fff79f..001edff 100644 --- a/base/trace_event/cpufreq_monitor_android.cc +++ b/base/trace_event/cpufreq_monitor_android.cc
@@ -14,7 +14,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h"
diff --git a/base/trace_event/cpufreq_monitor_android_unittest.cc b/base/trace_event/cpufreq_monitor_android_unittest.cc index 6764a77..a6e2abb 100644 --- a/base/trace_event/cpufreq_monitor_android_unittest.cc +++ b/base/trace_event/cpufreq_monitor_android_unittest.cc
@@ -13,6 +13,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/raw_ptr.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace base {
diff --git a/base/trace_event/memory_dump_manager_unittest.cc b/base/trace_event/memory_dump_manager_unittest.cc index 7c6ecbdb..6205ecd 100644 --- a/base/trace_event/memory_dump_manager_unittest.cc +++ b/base/trace_event/memory_dump_manager_unittest.cc
@@ -18,7 +18,6 @@ #include "base/command_line.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h"
diff --git a/base/trace_event/trace_log.cc b/base/trace_event/trace_log.cc index 4b5c65b..204a8ba 100644 --- a/base/trace_event/trace_log.cc +++ b/base/trace_event/trace_log.cc
@@ -30,7 +30,6 @@ #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/platform_thread.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/base/tracing/perfetto_task_runner.cc b/base/tracing/perfetto_task_runner.cc index e8e15c0..d932fc8 100644 --- a/base/tracing/perfetto_task_runner.cc +++ b/base/tracing/perfetto_task_runner.cc
@@ -11,7 +11,6 @@ #include "base/containers/contains.h" #include "base/task/common/checked_lock_impl.h" #include "base/task/common/scoped_defer_task_posting.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/base/tracing/perfetto_task_runner_unittest.cc b/base/tracing/perfetto_task_runner_unittest.cc index fb40dfd..c4eccd5b 100644 --- a/base/tracing/perfetto_task_runner_unittest.cc +++ b/base/tracing/perfetto_task_runner_unittest.cc
@@ -11,7 +11,6 @@ #include "base/files/scoped_file.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/build/fuchsia/linux.sdk.sha1 b/build/fuchsia/linux.sdk.sha1 index 0804900..c50d8f99 100644 --- a/build/fuchsia/linux.sdk.sha1 +++ b/build/fuchsia/linux.sdk.sha1
@@ -1 +1 @@ -7.20220330.1.1 +7.20220330.3.1
diff --git a/build/fuchsia/linux_internal.sdk.sha1 b/build/fuchsia/linux_internal.sdk.sha1 index fc4791d..6dc5632c 100644 --- a/build/fuchsia/linux_internal.sdk.sha1 +++ b/build/fuchsia/linux_internal.sdk.sha1
@@ -1 +1 @@ -7.20220330.2.1 +7.20220331.0.1
diff --git a/build/fuchsia/mac.sdk.sha1 b/build/fuchsia/mac.sdk.sha1 index 0804900..c50d8f99 100644 --- a/build/fuchsia/mac.sdk.sha1 +++ b/build/fuchsia/mac.sdk.sha1
@@ -1 +1 @@ -7.20220330.1.1 +7.20220330.3.1
diff --git a/cc/animation/animation_events.h b/cc/animation/animation_events.h index a3f42f2d2..e5c88892 100644 --- a/cc/animation/animation_events.h +++ b/cc/animation/animation_events.h
@@ -8,6 +8,7 @@ #include <memory> #include <vector> +#include "base/time/time.h" #include "cc/animation/animation_export.h" #include "cc/trees/mutator_host.h" #include "ui/gfx/animation/keyframe/animation_curve.h"
diff --git a/cc/animation/animation_host_unittest.cc b/cc/animation/animation_host_unittest.cc index 9611656f..fa79bed6 100644 --- a/cc/animation/animation_host_unittest.cc +++ b/cc/animation/animation_host_unittest.cc
@@ -5,6 +5,7 @@ #include "cc/animation/animation_host.h" #include "base/memory/ptr_util.h" +#include "base/time/time.h" #include "cc/animation/animation_id_provider.h" #include "cc/animation/animation_timeline.h" #include "cc/animation/scroll_timeline.h"
diff --git a/cc/animation/animation_unittest.cc b/cc/animation/animation_unittest.cc index 9f62ffc7..0454c9b 100644 --- a/cc/animation/animation_unittest.cc +++ b/cc/animation/animation_unittest.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "cc/animation/animation_delegate.h" #include "cc/animation/animation_host.h" #include "cc/animation/animation_id_provider.h"
diff --git a/cc/animation/scroll_offset_animation_curve_unittest.cc b/cc/animation/scroll_offset_animation_curve_unittest.cc index 4a501d0..1d14c83c 100644 --- a/cc/animation/scroll_offset_animation_curve_unittest.cc +++ b/cc/animation/scroll_offset_animation_curve_unittest.cc
@@ -4,6 +4,7 @@ #include "cc/animation/scroll_offset_animation_curve.h" +#include "base/time/time.h" #include "cc/animation/scroll_offset_animation_curve_factory.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/animation/keyframe/timing_function.h"
diff --git a/cc/animation/worklet_animation_unittest.cc b/cc/animation/worklet_animation_unittest.cc index e3755ce..7cfe9e8 100644 --- a/cc/animation/worklet_animation_unittest.cc +++ b/cc/animation/worklet_animation_unittest.cc
@@ -8,6 +8,7 @@ #include <utility> #include <vector> #include "base/memory/ptr_util.h" +#include "base/time/time.h" #include "cc/animation/animation_id_provider.h" #include "cc/animation/keyframe_effect.h" #include "cc/animation/scroll_timeline.h"
diff --git a/cc/base/delayed_unique_notifier_unittest.cc b/cc/base/delayed_unique_notifier_unittest.cc index eb47dba..a700638 100644 --- a/cc/base/delayed_unique_notifier_unittest.cc +++ b/cc/base/delayed_unique_notifier_unittest.cc
@@ -11,6 +11,7 @@ #include "base/containers/circular_deque.h" #include "base/test/test_pending_task.h" #include "base/test/test_simple_task_runner.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace cc {
diff --git a/cc/base/devtools_instrumentation.h b/cc/base/devtools_instrumentation.h index 86de7ba..3852cfe 100644 --- a/cc/base/devtools_instrumentation.h +++ b/cc/base/devtools_instrumentation.h
@@ -12,6 +12,7 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "base/trace_event/traced_value.h" #include "base/trace_event/typed_macros.h"
diff --git a/cc/input/scrollbar_animation_controller_unittest.cc b/cc/input/scrollbar_animation_controller_unittest.cc index 611ea7b21..0d4a4a5 100644 --- a/cc/input/scrollbar_animation_controller_unittest.cc +++ b/cc/input/scrollbar_animation_controller_unittest.cc
@@ -7,6 +7,7 @@ #include <utility> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "cc/layers/solid_color_scrollbar_layer_impl.h" #include "cc/test/layer_tree_impl_test_base.h" #include "cc/trees/layer_tree_impl.h"
diff --git a/cc/input/single_scrollbar_animation_controller_thinning_unittest.cc b/cc/input/single_scrollbar_animation_controller_thinning_unittest.cc index 78df3c9..6efa8d1 100644 --- a/cc/input/single_scrollbar_animation_controller_thinning_unittest.cc +++ b/cc/input/single_scrollbar_animation_controller_thinning_unittest.cc
@@ -5,6 +5,7 @@ #include "cc/input/single_scrollbar_animation_controller_thinning.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "cc/layers/solid_color_scrollbar_layer_impl.h" #include "cc/test/layer_tree_impl_test_base.h" #include "cc/trees/layer_tree_impl.h"
diff --git a/cc/metrics/compositor_frame_reporter_unittest.cc b/cc/metrics/compositor_frame_reporter_unittest.cc index 31c54a44..014a1a4a 100644 --- a/cc/metrics/compositor_frame_reporter_unittest.cc +++ b/cc/metrics/compositor_frame_reporter_unittest.cc
@@ -12,6 +12,7 @@ #include "base/strings/strcat.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "cc/metrics/compositor_frame_reporting_controller.h" #include "cc/metrics/dropped_frame_counter.h" #include "cc/metrics/event_metrics.h"
diff --git a/cc/metrics/compositor_frame_reporting_controller_unittest.cc b/cc/metrics/compositor_frame_reporting_controller_unittest.cc index a02b23fc..524f144d 100644 --- a/cc/metrics/compositor_frame_reporting_controller_unittest.cc +++ b/cc/metrics/compositor_frame_reporting_controller_unittest.cc
@@ -11,6 +11,7 @@ #include "base/strings/strcat.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "cc/metrics/dropped_frame_counter.h" #include "cc/metrics/event_metrics.h" #include "cc/metrics/total_frame_counter.h"
diff --git a/cc/metrics/compositor_timing_history.h b/cc/metrics/compositor_timing_history.h index 3b130bd..d8ad8df 100644 --- a/cc/metrics/compositor_timing_history.h +++ b/cc/metrics/compositor_timing_history.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "cc/base/rolling_time_delta_history.h" #include "cc/cc_export.h" #include "cc/metrics/event_metrics.h"
diff --git a/cc/metrics/compositor_timing_history_unittest.cc b/cc/metrics/compositor_timing_history_unittest.cc index c077c87..ee60812f 100644 --- a/cc/metrics/compositor_timing_history_unittest.cc +++ b/cc/metrics/compositor_timing_history_unittest.cc
@@ -6,6 +6,7 @@ #include "base/logging.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "cc/debug/rendering_stats_instrumentation.h" #include "cc/metrics/dropped_frame_counter.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/metrics/dropped_frame_counter.h b/cc/metrics/dropped_frame_counter.h index b93fc7c..da28e514 100644 --- a/cc/metrics/dropped_frame_counter.h +++ b/cc/metrics/dropped_frame_counter.h
@@ -14,6 +14,7 @@ #include "base/callback_forward.h" #include "base/containers/ring_buffer.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "cc/cc_export.h" #include "cc/metrics/frame_info.h" #include "cc/metrics/frame_sorter.h"
diff --git a/cc/metrics/frame_sequence_tracker.h b/cc/metrics/frame_sequence_tracker.h index e395c17..0200a35 100644 --- a/cc/metrics/frame_sequence_tracker.h +++ b/cc/metrics/frame_sequence_tracker.h
@@ -11,6 +11,7 @@ #include "base/containers/circular_deque.h" #include "base/containers/flat_set.h" +#include "base/time/time.h" #include "cc/cc_export.h" #include "cc/metrics/frame_sequence_metrics.h"
diff --git a/cc/metrics/jank_injector.cc b/cc/metrics/jank_injector.cc index da18a0c..5c2871b 100644 --- a/cc/metrics/jank_injector.cc +++ b/cc/metrics/jank_injector.cc
@@ -15,6 +15,7 @@ #include "base/metrics/field_trial_params.h" #include "base/no_destructor.h" #include "base/strings/string_split.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "cc/base/features.h" #include "url/gurl.h"
diff --git a/cc/metrics/jank_injector_unittest.cc b/cc/metrics/jank_injector_unittest.cc index ad5472f..1fc07fc 100644 --- a/cc/metrics/jank_injector_unittest.cc +++ b/cc/metrics/jank_injector_unittest.cc
@@ -8,6 +8,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/test_simple_task_runner.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace cc {
diff --git a/cc/metrics/jank_metrics.h b/cc/metrics/jank_metrics.h index 7f8c9d4..ca8af4c7 100644 --- a/cc/metrics/jank_metrics.h +++ b/cc/metrics/jank_metrics.h
@@ -9,6 +9,7 @@ #include <queue> #include <utility> +#include "base/time/time.h" #include "cc/metrics/frame_sequence_metrics.h" namespace cc {
diff --git a/cc/metrics/video_playback_roughness_reporter_unittest.cc b/cc/metrics/video_playback_roughness_reporter_unittest.cc index ae74ea08..86cd2ad9cc 100644 --- a/cc/metrics/video_playback_roughness_reporter_unittest.cc +++ b/cc/metrics/video_playback_roughness_reporter_unittest.cc
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/test/bind.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" using VideoFrame = media::VideoFrame;
diff --git a/cc/resources/resource_pool.h b/cc/resources/resource_pool.h index e9ffde0..3aedcd7 100644 --- a/cc/resources/resource_pool.h +++ b/cc/resources/resource_pool.h
@@ -19,6 +19,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "base/trace_event/memory_allocator_dump_guid.h" #include "base/trace_event/memory_dump_provider.h" #include "base/unguessable_token.h"
diff --git a/cc/resources/resource_pool_unittest.cc b/cc/resources/resource_pool_unittest.cc index f463d2c..24d04f3 100644 --- a/cc/resources/resource_pool_unittest.cc +++ b/cc/resources/resource_pool_unittest.cc
@@ -13,6 +13,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/viz/client/client_resource_provider.h" #include "components/viz/common/resources/resource_sizes.h" #include "components/viz/common/resources/returned_resource.h"
diff --git a/cc/scheduler/begin_frame_tracker.h b/cc/scheduler/begin_frame_tracker.h index 1165a0ca..8a8196c0 100644 --- a/cc/scheduler/begin_frame_tracker.h +++ b/cc/scheduler/begin_frame_tracker.h
@@ -8,6 +8,7 @@ #include <set> #include <string> +#include "base/time/time.h" #include "cc/cc_export.h" #include "components/viz/common/frame_sinks/begin_frame_args.h"
diff --git a/cc/test/animation_test_common.h b/cc/test/animation_test_common.h index a636f9c..b90a6fe4 100644 --- a/cc/test/animation_test_common.h +++ b/cc/test/animation_test_common.h
@@ -7,6 +7,7 @@ #include <memory> +#include "base/time/time.h" #include "cc/animation/animation_timeline.h" #include "cc/animation/keyframe_model.h" #include "cc/paint/element_id.h"
diff --git a/cc/test/animation_timelines_test_common.h b/cc/test/animation_timelines_test_common.h index 8febc289..50b0801 100644 --- a/cc/test/animation_timelines_test_common.h +++ b/cc/test/animation_timelines_test_common.h
@@ -9,6 +9,7 @@ #include <unordered_map> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "cc/animation/animation_delegate.h" #include "cc/animation/animation_host.h" #include "cc/animation/keyframe_model.h"
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h index 0bd30bc7..e1d52f9 100644 --- a/cc/test/layer_tree_test.h +++ b/cc/test/layer_tree_test.h
@@ -12,6 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/animation/animation_delegate.h" #include "cc/base/features.h"
diff --git a/cc/tiles/image_controller.cc b/cc/tiles/image_controller.cc index 0fe837a..9fba377 100644 --- a/cc/tiles/image_controller.cc +++ b/cc/tiles/image_controller.cc
@@ -5,7 +5,6 @@ #include "cc/tiles/image_controller.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/threading/thread_restrictions.h" #include "base/trace_event/trace_event.h"
diff --git a/cc/trees/frame_rate_estimator.h b/cc/trees/frame_rate_estimator.h index 750c42d8..53d794c 100644 --- a/cc/trees/frame_rate_estimator.h +++ b/cc/trees/frame_rate_estimator.h
@@ -6,6 +6,7 @@ #define CC_TREES_FRAME_RATE_ESTIMATOR_H_ #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "cc/base/delayed_unique_notifier.h" #include "cc/cc_export.h"
diff --git a/cc/trees/frame_rate_estimator_unittest.cc b/cc/trees/frame_rate_estimator_unittest.cc index d8c89ec..c8b15e58 100644 --- a/cc/trees/frame_rate_estimator_unittest.cc +++ b/cc/trees/frame_rate_estimator_unittest.cc
@@ -5,6 +5,7 @@ #include "cc/trees/frame_rate_estimator.h" #include "base/test/test_simple_task_runner.h" +#include "base/time/time.h" #include "components/viz/common/frame_sinks/begin_frame_args.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/trees/image_animation_controller_unittest.cc b/cc/trees/image_animation_controller_unittest.cc index 62788088..b5fd41b 100644 --- a/cc/trees/image_animation_controller_unittest.cc +++ b/cc/trees/image_animation_controller_unittest.cc
@@ -11,6 +11,7 @@ #include "base/run_loop.h" #include "base/test/gtest_util.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace cc {
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc index 69c6271..0a61548 100644 --- a/cc/trees/layer_tree_host_unittest_animation.cc +++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/metrics/statistics_recorder.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/animation/animation.h" #include "cc/animation/animation_host.h"
diff --git a/cc/trees/presentation_time_callback_buffer.h b/cc/trees/presentation_time_callback_buffer.h index af7be740..ee3dd81 100644 --- a/cc/trees/presentation_time_callback_buffer.h +++ b/cc/trees/presentation_time_callback_buffer.h
@@ -9,6 +9,7 @@ #include "base/callback_forward.h" #include "base/containers/circular_deque.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "cc/cc_export.h" #include "ui/gfx/presentation_feedback.h"
diff --git a/cc/trees/proxy_main.h b/cc/trees/proxy_main.h index 31f6c4c..79c20ca 100644 --- a/cc/trees/proxy_main.h +++ b/cc/trees/proxy_main.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "cc/cc_export.h" #include "cc/input/browser_controls_state.h" #include "cc/trees/layer_tree_host.h"
diff --git a/cc/trees/ukm_manager.cc b/cc/trees/ukm_manager.cc index 801e8ce7..7547024c 100644 --- a/cc/trees/ukm_manager.cc +++ b/cc/trees/ukm_manager.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <utility> +#include "base/time/time.h" #include "cc/metrics/compositor_frame_reporter.h" #include "cc/metrics/throughput_ukm_reporter.h" #include "components/viz/common/quads/compositor_frame.h"
diff --git a/chrome/VERSION b/chrome/VERSION index c79c1501..4a36b279 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=102 MINOR=0 -BUILD=4975 +BUILD=4976 PATCH=0
diff --git a/chrome/android/features/cablev2_authenticator/native/cablev2_authenticator_android.cc b/chrome/android/features/cablev2_authenticator/native/cablev2_authenticator_android.cc index 5865b7c..a2ca8b2 100644 --- a/chrome/android/features/cablev2_authenticator/native/cablev2_authenticator_android.cc +++ b/chrome/android/features/cablev2_authenticator/native/cablev2_authenticator_android.cc
@@ -30,6 +30,7 @@ // These "headers" actually contain several function definitions and thus can // only be included once across Chromium. +#include "base/time/time.h" #include "chrome/android/features/cablev2_authenticator/jni_headers/BLEAdvert_jni.h" #include "chrome/android/features/cablev2_authenticator/jni_headers/CableAuthenticator_jni.h" #include "chrome/android/features/cablev2_authenticator/jni_headers/USBHandler_jni.h"
diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java index 6a52acf..5262e8c 100644 --- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java +++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java
@@ -21,6 +21,7 @@ import androidx.vectordrawable.graphics.drawable.AnimationUtilsCompat; import org.chromium.base.Log; +import org.chromium.base.MathUtils; import org.chromium.base.TraceEvent; import org.chromium.base.jank_tracker.JankScenario; import org.chromium.base.jank_tracker.JankTracker; @@ -41,7 +42,6 @@ import org.chromium.chrome.browser.layouts.animation.CompositorAnimator; import org.chromium.chrome.browser.layouts.scene_layer.SceneLayer; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.tab.TabUtils; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; import org.chromium.chrome.browser.tasks.TasksSurface; @@ -187,7 +187,10 @@ }; mController.addOverviewModeObserver(mStartSurfaceObserver); - mThumbnailAspectRatio = TabUtils.getTabThumbnailAspectRatio(getContext()); + if (TabUiFeatureUtilities.isTabThumbnailAspectRatioNotOne()) { + mThumbnailAspectRatio = (float) TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO.getValue(); + mThumbnailAspectRatio = MathUtils.clamp(mThumbnailAspectRatio, 0.5f, 2.0f); + } } @Override @@ -512,8 +515,10 @@ // down, making the "create group" visible for a while. animationList.add(CompositorAnimator.ofWritableFloatPropertyKey(handler, sourceLayoutTab, LayoutTab.MAX_CONTENT_HEIGHT, sourceLayoutTab.getUnclampedOriginalContentHeight(), - Math.min(getWidth() / mThumbnailAspectRatio, - sourceLayoutTab.getUnclampedOriginalContentHeight()), + TabUiFeatureUtilities.isTabThumbnailAspectRatioNotOne() + ? Math.min(getWidth() / mThumbnailAspectRatio, + sourceLayoutTab.getUnclampedOriginalContentHeight()) + : getWidth(), ZOOMING_DURATION, Interpolators.FAST_OUT_SLOW_IN_INTERPOLATOR)); CompositorAnimator backgroundAlpha = @@ -566,8 +571,10 @@ // down, making the "create group" visible for a while. animationList.add(CompositorAnimator.ofWritableFloatPropertyKey(handler, sourceLayoutTab, LayoutTab.MAX_CONTENT_HEIGHT, - Math.min(getWidth() / mThumbnailAspectRatio, - sourceLayoutTab.getUnclampedOriginalContentHeight()), + TabUiFeatureUtilities.isTabThumbnailAspectRatioNotOne() + ? Math.min(getWidth() / mThumbnailAspectRatio, + sourceLayoutTab.getUnclampedOriginalContentHeight()) + : getWidth(), sourceLayoutTab.getUnclampedOriginalContentHeight(), ZOOMING_DURATION, Interpolators.FAST_OUT_SLOW_IN_INTERPOLATOR));
diff --git a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTabSwitcherTest.java b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTabSwitcherTest.java index fd519f6c..29600df0 100644 --- a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTabSwitcherTest.java +++ b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTabSwitcherTest.java
@@ -45,6 +45,7 @@ import org.junit.Test; import org.junit.runner.RunWith; +import org.chromium.base.MathUtils; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.test.params.ParameterAnnotations; import org.chromium.base.test.params.ParameterAnnotations.UseMethodParameter; @@ -72,6 +73,7 @@ import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; import org.chromium.chrome.browser.tasks.pseudotab.PseudoTab; import org.chromium.chrome.browser.tasks.pseudotab.TabAttributeCache; +import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities; import org.chromium.chrome.browser.tasks.tab_management.TabUiTestHelper; import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate; import org.chromium.chrome.test.ChromeTabbedActivityTestRule; @@ -433,8 +435,10 @@ onViewWaiting(allOf(withId(org.chromium.chrome.test.R.id.tab_thumbnail), isDisplayed())); View tabThumbnail = cta.findViewById(org.chromium.chrome.test.R.id.tab_thumbnail); + float defaultRatio = (float) TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO.getValue(); + defaultRatio = MathUtils.clamp(defaultRatio, 0.5f, 2.0f); assertEquals(tabThumbnail.getMeasuredHeight(), - (int) (tabThumbnail.getMeasuredWidth() * 1.0 / 0.85f), 2); + (int) (tabThumbnail.getMeasuredWidth() * 1.0 / defaultRatio), 2); } @Test
diff --git a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTest.java b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTest.java index d680adf..35582b50 100644 --- a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTest.java +++ b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTest.java
@@ -145,7 +145,7 @@ @Restriction({Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE, UiRestriction.RESTRICTION_TYPE_PHONE, UiRestriction.RESTRICTION_TYPE_TABLET}) @CommandLineFlags.Add({ChromeSwitches.DISABLE_NATIVE_INITIALIZATION, - "force-fieldtrial-params=Study.Group:allow_to_refetch/true"}) + "force-fieldtrial-params=Study.Group:allow_to_refetch/true/thumbnail_aspect_ratio/2.0"}) public void fetchThumbnailsPreNativeTest() { // clang-format on StartSurfaceTestUtils.startMainActivityFromLauncher(mActivityTestRule);
diff --git a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutTest.java b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutTest.java index 5b3f204..e45c501 100644 --- a/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutTest.java +++ b/chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/StartSurfaceLayoutTest.java
@@ -8,7 +8,6 @@ import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.click; -import static androidx.test.espresso.action.ViewActions.swipeUp; import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist; import static androidx.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition; @@ -169,7 +168,7 @@ @Restriction( {UiRestriction.RESTRICTION_TYPE_PHONE, Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE}) @DisableIf.Build(message = "Flaky on emulators; see https://crbug.com/1130830", - supported_abis_includes = "x86") + supported_abis_includes = "x86") public class StartSurfaceLayoutTest { // clang-format on private static final String BASE_PARAMS = "force-fieldtrial-params=" @@ -869,7 +868,8 @@ @EnableFeatures({ChromeFeatureList.CLOSE_TAB_SUGGESTIONS + "<Study", ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) @CommandLineFlags.Add({BASE_PARAMS + "/baseline_tab_suggestions/true" + - "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0"}) + "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0/" + + "thumbnail_aspect_ratio/1.0"}) public void testTabSuggestionMessageCard_dismiss() throws InterruptedException { // clang-format on prepareTabs(3, 0, null); @@ -887,7 +887,6 @@ // TabSwitcherCoordinator::hasAppendedMessagesForTesting. Instead, we can query the number // of items that the inner model of the TabSwitcher has. CriteriaHelper.pollUiThread(TabSwitcherCoordinator::hasAppendedMessagesForTesting); - onView(tabSwitcherViewMatcher()).perform(swipeUp()); onView(withId(R.id.tab_grid_message_item)).check(matches(isDisplayed())); onView(allOf(withId(R.id.close_button), withParent(withId(R.id.tab_grid_message_item)))) .perform(click()); @@ -901,7 +900,8 @@ @EnableFeatures({ChromeFeatureList.CLOSE_TAB_SUGGESTIONS + "<Study", ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) @CommandLineFlags.Add({BASE_PARAMS + "/baseline_tab_suggestions/true" + - "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0"}) + "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0" + + "/thumbnail_aspect_ratio/1.0"}) public void testTabSuggestionMessageCard_review() throws InterruptedException { // clang-format on prepareTabs(3, 0, null); @@ -913,7 +913,6 @@ enterGTSWithThumbnailChecking(); CriteriaHelper.pollUiThread(TabSwitcherCoordinator::hasAppendedMessagesForTesting); - onView(tabSwitcherViewMatcher()).perform(swipeUp()); onView(withId(R.id.tab_grid_message_item)).check(matches(isDisplayed())); onView(allOf(withId(R.id.action_button), withParent(withId(R.id.tab_grid_message_item)))) .perform(click()); @@ -934,7 +933,8 @@ @EnableFeatures({ChromeFeatureList.CLOSE_TAB_SUGGESTIONS + "<Study", ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) @CommandLineFlags.Add({BASE_PARAMS + "/baseline_tab_suggestions/true" + - "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0"}) + "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0/" + + "thumbnail_aspect_ratio/1.0"}) public void testShowOnlyOneTabSuggestionMessageCard_withSoftCleanup() throws InterruptedException { // clang-format on @@ -948,7 +948,8 @@ @EnableFeatures({ChromeFeatureList.CLOSE_TAB_SUGGESTIONS + "<Study", ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) @CommandLineFlags.Add({BASE_PARAMS + "/baseline_tab_suggestions/true" + - "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0"}) + "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0/" + + "thumbnail_aspect_ratio/1.0"}) @FlakyTest(message = "https://crbug.com/1198484") public void testShowOnlyOneTabSuggestionMessageCard_withHardCleanup() throws InterruptedException { @@ -963,7 +964,8 @@ @EnableFeatures({ChromeFeatureList.CLOSE_TAB_SUGGESTIONS + "<Study", ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) @CommandLineFlags.Add({BASE_PARAMS + "/baseline_tab_suggestions/true" + - "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0"}) + "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0/" + + "thumbnail_aspect_ratio/1.0"}) public void testTabSuggestionMessageCardDismissAfterTabClosing() throws InterruptedException { // clang-format on prepareTabs(3, 0, mUrl); @@ -973,7 +975,6 @@ enterGTSWithThumbnailChecking(); CriteriaHelper.pollUiThread(TabSwitcherCoordinator::hasAppendedMessagesForTesting); - onView(tabSwitcherViewMatcher()).perform(swipeUp()); onView(withId(R.id.tab_grid_message_item)).check(matches(isDisplayed())); closeFirstTabInTabSwitcher(); @@ -1053,7 +1054,8 @@ @EnableFeatures({ChromeFeatureList.CLOSE_TAB_SUGGESTIONS + "<Study", ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) @CommandLineFlags.Add({BASE_PARAMS + "/baseline_tab_suggestions/true" + - "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0"}) + "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0/" + + "thumbnail_aspect_ratio/1.0"}) public void testTabSuggestionMessageCard_orientation() throws InterruptedException { // clang-format on ChromeTabbedActivity cta = mActivityTestRule.getActivity(); @@ -1149,26 +1151,39 @@ prepareTabs(2, 0, mUrl); enterTabSwitcher(mActivityTestRule.getActivity()); onView(tabSwitcherViewMatcher()) - .check(ThumbnailAspectRatioAssertion.havingAspectRatio(0.85)); + .check(ThumbnailAspectRatioAssertion.havingAspectRatio(1.0)); + } + + @Test + @MediumTest + @EnableFeatures({ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) + @CommandLineFlags.Add({BASE_PARAMS + "/thumbnail_aspect_ratio/0.75"}) + @DisabledTest(message = "https://crbug.com/1122657") + public void testThumbnailAspectRatio_point75() { + prepareTabs(2, 0, mUrl); + enterTabSwitcher(mActivityTestRule.getActivity()); + onView(tabSwitcherViewMatcher()) + .check(ThumbnailAspectRatioAssertion.havingAspectRatio(0.75)); + leaveGTSAndVerifyThumbnailsAreReleased(); Tab tab = mActivityTestRule.getActivity().getTabModelSelector().getCurrentTab(); mActivityTestRule.loadUrlInTab( NTP_URL, PageTransition.TYPED | PageTransition.FROM_ADDRESS_BAR, tab); enterTabSwitcher(mActivityTestRule.getActivity()); onView(tabSwitcherViewMatcher()) - .check(ThumbnailAspectRatioAssertion.havingAspectRatio(0.85)); + .check(ThumbnailAspectRatioAssertion.havingAspectRatio(0.75)); } @Test @MediumTest @EnableFeatures({ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) - @CommandLineFlags.Add({BASE_PARAMS + "allow_to_refetch/true"}) + @CommandLineFlags.Add({BASE_PARAMS + "/thumbnail_aspect_ratio/2.0/allow_to_refetch/true"}) @DisabledTest(message = "Flaky - https://crbug.com/1124041") - public void testThumbnailAspectRatio_fromPoint85ToPoint75() throws Exception { + public void testThumbnailAspectRatio_fromTwoToPoint75() throws Exception { prepareTabs(2, 0, mUrl); enterTabSwitcher(mActivityTestRule.getActivity()); onView(tabSwitcherViewMatcher()) - .check(ThumbnailAspectRatioAssertion.havingAspectRatio(0.85)); + .check(ThumbnailAspectRatioAssertion.havingAspectRatio(2.0)); TabModel currentTabModel = mActivityTestRule.getActivity().getTabModelSelector().getCurrentModel(); for (int i = 0; i < currentTabModel.getCount(); i++) { @@ -1181,7 +1196,7 @@ enterTabSwitcher(mActivityTestRule.getActivity()); onView(tabSwitcherViewMatcher()) - .check(ThumbnailAspectRatioAssertion.havingAspectRatio(0.85)); + .check(ThumbnailAspectRatioAssertion.havingAspectRatio(2.0)); TabUiTestHelper.finishActivity(mActivityTestRule.getActivity()); } @@ -1265,7 +1280,7 @@ @Test @MediumTest @EnableFeatures({ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) - @CommandLineFlags.Add({BASE_PARAMS + "allow_to_refetch/true"}) + @CommandLineFlags.Add({BASE_PARAMS + "/thumbnail_aspect_ratio/2.0/allow_to_refetch/true"}) @DisabledTest(message = "http://crbug/1119527 - Flaky on bots.") public void testThumbnailFetchingResult_changingAspectRatio() throws Exception { prepareTabs(2, 0, mUrl); @@ -1308,7 +1323,7 @@ oldDifferentAspectRatioJpegCount = currentDifferentAspectRatioJpegCount; onView(tabSwitcherViewMatcher()) - .check(ThumbnailAspectRatioAssertion.havingAspectRatio(0.85)); + .check(ThumbnailAspectRatioAssertion.havingAspectRatio(2.0)); TabModel currentTabModel = mActivityTestRule.getActivity().getTabModelSelector().getCurrentModel(); @@ -1342,14 +1357,14 @@ TabContentManager.ThumbnailFetchingResult.GOT_NOTHING) - oldNothingCount); onView(tabSwitcherViewMatcher()) - .check(ThumbnailAspectRatioAssertion.havingAspectRatio(0.85)); + .check(ThumbnailAspectRatioAssertion.havingAspectRatio(2.0)); } @Test @MediumTest @EnableFeatures({ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) @CommandLineFlags.Add({BASE_PARAMS}) - public void testRecycling() { + public void testRecycling_defaultAspectRatio() { prepareTabs(10, 0, mUrl); ChromeTabUtils.switchTabInCurrentTabModel(mActivityTestRule.getActivity(), 0); enterTabSwitcher(mActivityTestRule.getActivity()); @@ -1360,8 +1375,21 @@ @MediumTest // clang-format off @EnableFeatures({ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) - @CommandLineFlags.Add({BASE_PARAMS}) - public void testExpandTab() { + @CommandLineFlags.Add({BASE_PARAMS + "/thumbnail_aspect_ratio/0.75"}) + public void testRecycling_aspectRatioPoint75() { + // clang-format on + prepareTabs(10, 0, mUrl); + ChromeTabUtils.switchTabInCurrentTabModel(mActivityTestRule.getActivity(), 0); + enterTabSwitcher(mActivityTestRule.getActivity()); + onView(tabSwitcherViewMatcher()).perform(RecyclerViewActions.scrollToPosition(9)); + } + + @Test + @MediumTest + // clang-format off + @EnableFeatures({ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) + @CommandLineFlags.Add({BASE_PARAMS + "/thumbnail_aspect_ratio/0.75"}) + public void testExpandTab_withAspectRatioPoint75() { // clang-format on prepareTabs(1, 0, mUrl); enterTabSwitcher(mActivityTestRule.getActivity()); @@ -1374,9 +1402,9 @@ // clang-format off @EnableFeatures({ChromeFeatureList.TAB_GROUPS_ANDROID, ChromeFeatureList.TAB_TO_GTS_ANIMATION + "<Study"}) - @CommandLineFlags.Add({BASE_PARAMS}) + @CommandLineFlags.Add({BASE_PARAMS + "/thumbnail_aspect_ratio/1.0"}) @DisabledTest(message = "https://crbug.com/1205952") - public void testRenderGrid() throws IOException { + public void testRenderGrid_withAspectRatioOfOne() throws IOException { // clang-format on ChromeTabbedActivity cta = mActivityTestRule.getActivity(); prepareTabs(3, 0, "about:blank"); @@ -1871,7 +1899,8 @@ ChromeFeatureList.CLOSE_TAB_SUGGESTIONS + "<Study"}) @DisableFeatures(ChromeFeatureList.TAB_TO_GTS_ANIMATION) @CommandLineFlags.Add({BASE_PARAMS + "/baseline_tab_suggestions/true" + - "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0"}) + "/baseline_close_tab_suggestions/true/min_time_between_prefetches/0" + + "/thumbnail_aspect_ratio/1.0"}) public void testTabGroupManualSelection_AfterReviewTabSuggestion() throws InterruptedException { // clang-format on ChromeTabbedActivity cta = mActivityTestRule.getActivity(); @@ -1889,7 +1918,6 @@ // thumbnail checking here is to ensure the suggestion is valid when entering tab switcher. enterGTSWithThumbnailChecking(); CriteriaHelper.pollUiThread(TabSwitcherCoordinator::hasAppendedMessagesForTesting); - onView(tabSwitcherViewMatcher()).perform(swipeUp()); onView(withId(R.id.tab_grid_message_item)).check(matches(isDisplayed())); onView(allOf(withId(R.id.action_button), withParent(withId(R.id.tab_grid_message_item)))) .perform(click());
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/MultiThumbnailCardProvider.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/MultiThumbnailCardProvider.java index 135f49f..b31392fd 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/MultiThumbnailCardProvider.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/MultiThumbnailCardProvider.java
@@ -17,10 +17,10 @@ import android.graphics.drawable.Drawable; import org.chromium.base.Callback; +import org.chromium.base.MathUtils; import org.chromium.base.task.PostTask; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.tab.TabUtils; import org.chromium.chrome.browser.tabmodel.TabModel; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver; @@ -215,7 +215,9 @@ TabModelSelector tabModelSelector) { mContext = context; Resources resource = context.getResources(); - float expectedThumbnailAspectRatio = TabUtils.getTabThumbnailAspectRatio(context); + float expectedThumbnailAspectRatio = + (float) TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO.getValue(); + expectedThumbnailAspectRatio = MathUtils.clamp(expectedThumbnailAspectRatio, 0.5f, 2.0f); mThumbnailWidth = (int) resource.getDimension(R.dimen.tab_grid_thumbnail_card_default_size); mThumbnailHeight = (int) (mThumbnailWidth / expectedThumbnailAspectRatio);
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileMediator.java index 2ee27f9a..0faa39b 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileMediator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/NewTabTileMediator.java
@@ -6,8 +6,9 @@ import static org.chromium.chrome.browser.tasks.tab_management.NewTabTileViewProperties.IS_INCOGNITO; +import org.chromium.base.MathUtils; import org.chromium.base.metrics.RecordUserAction; -import org.chromium.chrome.browser.tab.TabUtils; +import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.tabmodel.TabCreatorManager; import org.chromium.chrome.browser.tabmodel.TabModel; import org.chromium.chrome.browser.tabmodel.TabModelSelector; @@ -27,7 +28,10 @@ mTabModelSelector = tabModelSelector; // Deliberately use un-cached value to match with native. - float aspectRatio = TabUtils.getTabThumbnailAspectRatio(null); + float aspectRatio = (float) ChromeFeatureList.getFieldTrialParamByFeatureAsDouble( + ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID, + TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO_PARAM, 1.0); + aspectRatio = MathUtils.clamp(aspectRatio, 0.5f, 2.0f); model.set(NewTabTileViewProperties.THUMBNAIL_ASPECT_RATIO, aspectRatio); model.set(NewTabTileViewProperties.CARD_HEIGHT_INTERCEPT, 0); model.set(NewTabTileViewProperties.ON_CLICK_LISTENER, view -> {
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridThumbnailView.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridThumbnailView.java index 8effabf5..dfda4ef 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridThumbnailView.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridThumbnailView.java
@@ -8,7 +8,7 @@ import android.graphics.drawable.ColorDrawable; import android.util.AttributeSet; -import org.chromium.chrome.browser.tab.TabUtils; +import org.chromium.base.MathUtils; import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; import org.chromium.components.browser_ui.widget.RoundedCornerImageView; @@ -23,7 +23,8 @@ public TabGridThumbnailView(Context context, AttributeSet attrs) { super(context, attrs); - mAspectRatio = TabUtils.getTabThumbnailAspectRatio(context); + mAspectRatio = MathUtils.clamp( + (float) TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO.getValue(), 0.5f, 2.0f); } @Override @@ -73,8 +74,15 @@ return; } - float expectedThumbnailAspectRatio = TabUtils.getTabThumbnailAspectRatio(getContext()); - int height = (int) (getWidth() * 1.0 / expectedThumbnailAspectRatio); - setMinimumHeight(Math.min(getHeight(), height)); + if (TabUiFeatureUtilities.isTabThumbnailAspectRatioNotOne()) { + float expectedThumbnailAspectRatio = + (float) TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO.getValue(); + expectedThumbnailAspectRatio = + MathUtils.clamp(expectedThumbnailAspectRatio, 0.5f, 2.0f); + int height = (int) (getWidth() * 1.0 / expectedThumbnailAspectRatio); + setMinimumHeight(Math.min(getHeight(), height)); + } else { + setMinimumHeight(getWidth()); + } } } \ No newline at end of file
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java index 1f9d8ef..321ebc7 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
@@ -24,10 +24,10 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import org.chromium.base.MathUtils; import org.chromium.chrome.browser.lifecycle.DestroyObserver; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.tab.TabUtils; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil; import org.chromium.chrome.browser.tasks.pseudotab.PseudoTab; @@ -174,10 +174,18 @@ return; } - float expectedThumbnailAspectRatio = TabUtils.getTabThumbnailAspectRatio(context); - int height = (int) (thumbnail.getWidth() * 1.0 / expectedThumbnailAspectRatio); - thumbnail.setMinimumHeight(Math.min(thumbnail.getHeight(), height)); - thumbnail.setImageDrawable(null); + if (TabUiFeatureUtilities.isTabThumbnailAspectRatioNotOne()) { + float expectedThumbnailAspectRatio = + (float) TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO.getValue(); + expectedThumbnailAspectRatio = + MathUtils.clamp(expectedThumbnailAspectRatio, 0.5f, 2.0f); + int height = (int) (thumbnail.getWidth() * 1.0 / expectedThumbnailAspectRatio); + thumbnail.setMinimumHeight(Math.min(thumbnail.getHeight(), height)); + thumbnail.setImageDrawable(null); + } else { + thumbnail.setImageDrawable(null); + thumbnail.setMinimumHeight(thumbnail.getWidth()); + } }; } else if (mMode == TabListMode.STRIP) { mAdapter.registerType(UiType.STRIP, parent -> { @@ -328,11 +336,17 @@ mContext.getResources().getConfiguration().orientation, mContext.getResources().getConfiguration().screenWidthDp); + float expectedThumbnailAspectRatio = 1.f; + if (TabUiFeatureUtilities.isTabThumbnailAspectRatioNotOne()) { + expectedThumbnailAspectRatio = + (float) TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO.getValue(); + expectedThumbnailAspectRatio = + MathUtils.clamp(expectedThumbnailAspectRatio, 0.5f, 2.0f); + } final int screenWidthPx = ViewUtils.dpToPx( mContext, mContext.getResources().getConfiguration().screenWidthDp); int itemWidthPx = (screenWidthPx / layoutManager.getSpanCount()); - int itemHeightPx = - ((int) ((itemWidthPx * 1f) / TabUtils.getTabThumbnailAspectRatio(mContext))); + int itemHeightPx = ((int) ((itemWidthPx * 1f) / expectedThumbnailAspectRatio)); for (int i = 0; i < mModel.size(); i++) { mModel.get(i).model.set(TabProperties.GRID_CARD_WIDTH, itemWidthPx); mModel.get(i).model.set(TabProperties.GRID_CARD_HEIGHT, itemHeightPx);
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiFeatureUtilities.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiFeatureUtilities.java index aec39565..8299a7f8 100644 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiFeatureUtilities.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiFeatureUtilities.java
@@ -41,6 +41,11 @@ new StringCachedFieldTrialParameter(ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID, TAB_GRID_LAYOUT_ANDROID_NEW_TAB_TILE_PARAM, ""); + public static final String THUMBNAIL_ASPECT_RATIO_PARAM = "thumbnail_aspect_ratio"; + public static final DoubleCachedFieldTrialParameter THUMBNAIL_ASPECT_RATIO = + new DoubleCachedFieldTrialParameter( + ChromeFeatureList.TAB_GRID_LAYOUT_ANDROID, THUMBNAIL_ASPECT_RATIO_PARAM, 0.85); + private static final String SEARCH_CHIP_PARAM = "enable_search_term_chip"; public static final BooleanCachedFieldTrialParameter ENABLE_SEARCH_CHIP = new BooleanCachedFieldTrialParameter( @@ -185,6 +190,13 @@ && !ConditionalTabStripUtils.getOptOutIndicator(); } + /** + * @return Whether the thumbnail_aspect_ratio field trail is set. + */ + public static boolean isTabThumbnailAspectRatioNotOne() { + return Double.compare(1.0, THUMBNAIL_ASPECT_RATIO.getValue()) != 0; + } + public static boolean isTabGridLayoutAndroidNewTabTileEnabled() { return TextUtils.equals(TAB_GRID_LAYOUT_ANDROID_NEW_TAB_TILE.getValue(), "NewTabTile"); }
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageCardTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageCardTest.java index 9a7ccdc..1a3a136 100644 --- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageCardTest.java +++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageCardTest.java
@@ -6,7 +6,6 @@ import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.click; -import static androidx.test.espresso.action.ViewActions.swipeUp; import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist; import static androidx.test.espresso.assertion.ViewAssertions.matches; import static androidx.test.espresso.matcher.ViewMatchers.assertThat; @@ -73,7 +72,7 @@ // clang-format on private static final String BASE_PARAMS = "force-fieldtrial-params=" + "Study.Group:baseline_tab_suggestions/true/enable_launch_polish/true" - + "/min_time_between_prefetches/0"; + + "/min_time_between_prefetches/0/thumbnail_aspect_ratio/1.0"; private static final String ENABLE_CLOSE_SUGGESTION_PARAM = "/baseline_close_tab_suggestions/true"; private static final String ENABLE_GROUP_SUGGESTION_PARAM = @@ -138,8 +137,6 @@ private void enteringTabSwitcherAndVerifySuggestionIsShown(String suggestionText) { TabUiTestHelper.enterTabSwitcher(mActivityTestRule.getActivity()); CriteriaHelper.pollUiThread(TabSwitcherCoordinator::hasAppendedMessagesForTesting); - onView(allOf(withParent(withId(R.id.compositor_view_holder)), withId(R.id.tab_list_view))) - .perform(swipeUp()); onView(allOf(withParent(withId(R.id.tab_grid_message_item)), withText(suggestionText))) .check(matches(isDisplayed())); }
diff --git a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherThumbnailTest.java b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherThumbnailTest.java index 0cb8cca3..0d3be5ff 100644 --- a/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherThumbnailTest.java +++ b/chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherThumbnailTest.java
@@ -79,6 +79,22 @@ @Test @MediumTest + @CommandLineFlags.Add({BASE_PARAMS + "/thumbnail_aspect_ratio/1.0"}) + @FlakyTest(message = "https://crbug.com/1208059") + public void testThumbnailAspectRatio_one() { + int tabCounts = 11; + TabUiTestHelper.prepareTabsWithThumbnail(mActivityTestRule, tabCounts, 0, "about:blank"); + TabUiTestHelper.enterTabSwitcher(mActivityTestRule.getActivity()); + verifyAllThumbnailHeightWithAspectRatio(tabCounts, 1.f); + + // With hard cleanup. + TabUiTestHelper.leaveTabSwitcher(mActivityTestRule.getActivity()); + TabUiTestHelper.enterTabSwitcher(mActivityTestRule.getActivity()); + verifyAllThumbnailHeightWithAspectRatio(tabCounts, 1.f); + } + + @Test + @MediumTest @CommandLineFlags.Add({BASE_PARAMS}) @FlakyTest(message = "https://crbug.com/1208059") public void testThumbnailAspectRatio_point85() {
diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tab/TabUtilsUnitTest.java b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tab/TabUtilsUnitTest.java deleted file mode 100644 index 4a43fc00..0000000 --- a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tab/TabUtilsUnitTest.java +++ /dev/null
@@ -1,53 +0,0 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -package org.chromium.chrome.browser.tab; - -import static com.google.common.truth.Truth.assertThat; - -import android.content.Context; -import android.content.res.Configuration; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; - -import org.chromium.base.ContextUtils; -import org.chromium.base.test.BaseRobolectricTestRunner; - -/** - * Tests for {@link TabUtils}. - */ -@RunWith(BaseRobolectricTestRunner.class) -public final class TabUtilsUnitTest { - @Test - public void testGetTabThumbnailAspectRatio_withNullContext() { - assertThat(TabUtils.getTabThumbnailAspectRatio(null)) - .isEqualTo(TabUtils.TAB_THUMBNAIL_ASPECT_RATIO); - } - - @Test - @Config(qualifiers = "sw320dp") - public void testGetTabThumbnailAspectRatio_withNonTabletContext() { - assertThat(TabUtils.getTabThumbnailAspectRatio(ContextUtils.getApplicationContext())) - .isEqualTo(TabUtils.TAB_THUMBNAIL_ASPECT_RATIO); - } - - @Test - @Config(qualifiers = "sw800dp-port") - public void testGetTabThumbnailAspectRatio_withTabletPortraitContext() { - assertThat(TabUtils.getTabThumbnailAspectRatio(ContextUtils.getApplicationContext())) - .isEqualTo(TabUtils.TAB_THUMBNAIL_ASPECT_RATIO); - } - - @Test - @Config(qualifiers = "sw800dp-land") - public void testGetTabThumbnailAspectRatio_withTabletLandscapeContext() { - final Context applicationContext = ContextUtils.getApplicationContext(); - final Configuration configuration = applicationContext.getResources().getConfiguration(); - float expectedAspectRatio = - (configuration.screenWidthDp * 1f) / (configuration.screenHeightDp * 1f); - assertThat(TabUtils.getTabThumbnailAspectRatio(applicationContext)) - .isEqualTo(expectedAspectRatio); - } -} \ No newline at end of file
diff --git a/chrome/android/features/tab_ui/tab_management_java_sources.gni b/chrome/android/features/tab_ui/tab_management_java_sources.gni index d8b5e2f3..695a5e7 100644 --- a/chrome/android/features/tab_ui/tab_management_java_sources.gni +++ b/chrome/android/features/tab_ui/tab_management_java_sources.gni
@@ -63,7 +63,6 @@ ] tab_management_junit_java_sources = [ - "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tab/TabUtilsUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/SingleTabSwitcherMediatorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/TasksSurfaceMediatorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/pseudotab/PseudoTabUnitTest.java",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java index 2eb809f0..408cee8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
@@ -175,6 +175,7 @@ add(TabUiFeatureUtilities.ZOOMING_MIN_SDK); add(TabUiFeatureUtilities.SKIP_SLOW_ZOOMING); add(TabUiFeatureUtilities.TAB_GRID_LAYOUT_ANDROID_NEW_TAB_TILE); + add(TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO); add(TabUiFeatureUtilities.GRID_TAB_SWITCHER_FOR_TABLETS_POLISH); add(TabUiFeatureUtilities.TAB_STRIP_TAB_WIDTH); add(ThemeUtils.ENABLE_FULL_DYNAMIC_COLORS);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderSelectActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderSelectActivity.java index e5c637a..6672feb7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderSelectActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFolderSelectActivity.java
@@ -197,17 +197,26 @@ FolderListEntry.TYPE_NEW_FOLDER)); } + FolderListEntry scrollToEntry = null; for (int i = 0; i < folderList.size(); i++) { BookmarkId folder = folderList.get(i); if (!mModel.isFolderVisible(folder)) continue; String title = mModel.getBookmarkById(folder).getTitle(); - entryList.add(new FolderListEntry(folder, depthList.get(i), title, - folder.equals(mParentId), FolderListEntry.TYPE_NORMAL)); + FolderListEntry entry = new FolderListEntry(folder, depthList.get(i), title, + folder.equals(mParentId), FolderListEntry.TYPE_NORMAL); + entryList.add(entry); + if (!mIsCreatingFolder && mParentId.equals(folder)) { + scrollToEntry = entry; + } } mBookmarkIdsAdapter.setEntryList(entryList); + if (scrollToEntry != null) { + mBookmarkIdsList.smoothScrollToPosition( + mBookmarkIdsAdapter.getPositionForEntry(scrollToEntry)); + } } @Override @@ -308,6 +317,10 @@ mPaddingIncrement = mBasePadding * 2; } + public int getPositionForEntry(FolderListEntry entry) { + return mEntryList.indexOf(entry); + } + @Override public int getCount() { return mEntryList.size();
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java index f960f8a9..9d3dd97d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java
@@ -21,6 +21,7 @@ import org.chromium.base.Callback; import org.chromium.base.CommandLine; +import org.chromium.base.MathUtils; import org.chromium.base.PathUtils; import org.chromium.base.ThreadUtils; import org.chromium.base.TraceEvent; @@ -34,7 +35,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.tab.TabUtils; import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities; import org.chromium.chrome.browser.ui.native_page.FrozenNativePage; import org.chromium.chrome.browser.ui.native_page.NativePage; @@ -184,8 +184,12 @@ mPriorityTabIds = new int[mFullResThumbnailsMaxSize]; - if (ALLOW_TO_REFETCH_TAB_THUMBNAIL_VARIATION.getValue()) { - mExpectedThumbnailAspectRatio = TabUtils.getTabThumbnailAspectRatio(context); + if (TabUiFeatureUtilities.isTabThumbnailAspectRatioNotOne() + || ALLOW_TO_REFETCH_TAB_THUMBNAIL_VARIATION.getValue()) { + mExpectedThumbnailAspectRatio = + (float) TabUiFeatureUtilities.THUMBNAIL_ASPECT_RATIO.getValue(); + mExpectedThumbnailAspectRatio = + MathUtils.clamp(mExpectedThumbnailAspectRatio, 0.5f, 2.0f); } } @@ -210,8 +214,7 @@ mNativeTabContentManager = TabContentManagerJni.get().init(TabContentManager.this, mFullResThumbnailsMaxSize, approximationCacheSize, compressionQueueMaxSize, - writeQueueMaxSize, useApproximationThumbnails, saveJpegThumbnails, - mExpectedThumbnailAspectRatio); + writeQueueMaxSize, useApproximationThumbnails, saveJpegThumbnails); } /** @@ -472,8 +475,7 @@ mRefectchedTabIds.add(tabId); TabContentManagerJni.get().getEtc1TabThumbnail(mNativeTabContentManager, - TabContentManager.this, tabId, mExpectedThumbnailAspectRatio, - callback); + TabContentManager.this, tabId, callback); return; } } @@ -483,8 +485,8 @@ return; } if (mNativeTabContentManager == 0 || !mSnapshotsEnabled) return; - TabContentManagerJni.get().getEtc1TabThumbnail(mNativeTabContentManager, - TabContentManager.this, tabId, mExpectedThumbnailAspectRatio, (etc1) -> { + TabContentManagerJni.get().getEtc1TabThumbnail( + mNativeTabContentManager, TabContentManager.this, tabId, (etc1) -> { if (etc1 != null) { recordThumbnailFetchingResult(ThumbnailFetchingResult.GOT_ETC1); } else { @@ -517,8 +519,7 @@ Bitmap nativeBitmap = readbackNativeBitmap(tab, mThumbnailScale); if (nativeBitmap == null) return null; TabContentManagerJni.get().cacheTabWithBitmap(mNativeTabContentManager, - TabContentManager.this, tab, nativeBitmap, mThumbnailScale, - mExpectedThumbnailAspectRatio); + TabContentManager.this, tab, nativeBitmap, mThumbnailScale); return nativeBitmap; } @@ -554,8 +555,10 @@ Matrix matrix = new Matrix(); matrix.setScale(downsamplingScale, downsamplingScale); Bitmap resized = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), - Math.min(bitmap.getHeight(), - (int) (bitmap.getWidth() * 1.0 / mExpectedThumbnailAspectRatio)), + TabUiFeatureUtilities.isTabThumbnailAspectRatioNotOne() + ? Math.min(bitmap.getHeight(), + (int) (bitmap.getWidth() * 1.0 / mExpectedThumbnailAspectRatio)) + : min(bitmap.getWidth(), bitmap.getHeight()), matrix, true); callback.onResult(resized); } else { @@ -565,8 +568,8 @@ // This faster path is essential to Tab-to-Grid animation to be smooth. final float downsamplingScale = writeToCache ? 1 : 0.5f; TabContentManagerJni.get().captureThumbnail(mNativeTabContentManager, - TabContentManager.this, tab, mThumbnailScale * downsamplingScale, - mExpectedThumbnailAspectRatio, writeToCache, callback); + TabContentManager.this, tab, mThumbnailScale * downsamplingScale, writeToCache, + callback); } } @@ -650,24 +653,23 @@ // Class Object Methods long init(TabContentManager caller, int defaultCacheSize, int approximationCacheSize, int compressionQueueMaxSize, int writeQueueMaxSize, - boolean useApproximationThumbnail, boolean saveJpegThumbnails, float aspectRatio); + boolean useApproximationThumbnail, boolean saveJpegThumbnails); void attachTab(long nativeTabContentManager, TabContentManager caller, Tab tab, int tabId); void detachTab(long nativeTabContentManager, TabContentManager caller, Tab tab, int tabId); boolean hasFullCachedThumbnail( long nativeTabContentManager, TabContentManager caller, int tabId); void captureThumbnail(long nativeTabContentManager, TabContentManager caller, Object tab, - float thumbnailScale, float aspectRatio, boolean writeToCache, - Callback<Bitmap> callback); + float thumbnailScale, boolean writeToCache, Callback<Bitmap> callback); void cacheTabWithBitmap(long nativeTabContentManager, TabContentManager caller, Object tab, - Object bitmap, float thumbnailScale, float aspectRatio); + Object bitmap, float thumbnailScale); void invalidateIfChanged( long nativeTabContentManager, TabContentManager caller, int tabId, GURL url); void updateVisibleIds(long nativeTabContentManager, TabContentManager caller, int[] priority, int primaryTabId); void removeTabThumbnail(long nativeTabContentManager, TabContentManager caller, int tabId); void getEtc1TabThumbnail(long nativeTabContentManager, TabContentManager caller, int tabId, - float aspectRatio, Callback<Bitmap> callback); + Callback<Bitmap> callback); void setCaptureMinRequestTimeForTesting( long nativeTabContentManager, TabContentManager caller, int timeMs); int getPendingReadbacksForTesting(long nativeTabContentManager, TabContentManager caller);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java index e5ce4194..5b5aaaec 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabUtils.java
@@ -6,14 +6,12 @@ import android.app.Activity; import android.content.Context; -import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Point; import android.graphics.Rect; import android.view.Display; import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; import org.chromium.base.ApplicationStatus; import org.chromium.chrome.R; @@ -35,8 +33,7 @@ */ public class TabUtils { private static final String REQUEST_DESKTOP_SCREEN_WIDTH_PARAM = "screen_width_dp"; - @VisibleForTesting - static final float TAB_THUMBNAIL_ASPECT_RATIO = 0.85f; + // Do not instantiate this class. private TabUtils() {} @@ -160,20 +157,4 @@ profile, ContentSettingsType.REQUEST_DESKTOP_SITE, url, url) == ContentSettingValues.ALLOW; } - - /** - * Return tab thumbnail aspect ratio for grid view. - * @param context - to retrieve info on device and layout. - * @return aspect ratio. - */ - public static float getTabThumbnailAspectRatio(Context context) { - if (context != null && DeviceFormFactor.isNonMultiDisplayContextOnTablet(context) - && context.getResources().getConfiguration().orientation - == Configuration.ORIENTATION_LANDSCAPE) { - return (context.getResources().getConfiguration().screenWidthDp * 1f) - / (context.getResources().getConfiguration().screenHeightDp * 1f); - } - - return TAB_THUMBNAIL_ASPECT_RATIO; - } }
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 8947d562..366afcdd 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd
@@ -5266,8 +5266,8 @@ </message> <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="States how many deprecated apps are present, with a link to a help article"> {NUM_APPS, plural, - =1 {1 of your apps is no longer supported. <ph name="LEARN_MORE">$1<ex>Learn more</ex></ph>} - other {# of your apps are no longer supported. <ph name="LEARN_MORE">$1<ex>Learn more</ex></ph>}} + =1 {1 of your apps is no longer supported.} + other {# of your apps are no longer supported.}} </message> <message name="IDS_DEPRECATED_APPS_LEARN_MORE" desc="Redirects to a link with more information on chrome apps deprecation"> Learn more
diff --git a/chrome/app/generated_resources_grd/IDS_DEPRECATED_APPS_MONITOR_RENDERER.png.sha1 b/chrome/app/generated_resources_grd/IDS_DEPRECATED_APPS_MONITOR_RENDERER.png.sha1 index e20a484..1b2ad4ec 100644 --- a/chrome/app/generated_resources_grd/IDS_DEPRECATED_APPS_MONITOR_RENDERER.png.sha1 +++ b/chrome/app/generated_resources_grd/IDS_DEPRECATED_APPS_MONITOR_RENDERER.png.sha1
@@ -1 +1 @@ -d9b944ef5ef27e0f1295241c9f406b9c8cb72aee \ No newline at end of file +9e28ad20100395c69d134fa5af69a1b20a557d8d \ No newline at end of file
diff --git a/chrome/app_shim/chrome_main_app_mode_mac.mm b/chrome/app_shim/chrome_main_app_mode_mac.mm index d52f957a..4eb71fe4 100644 --- a/chrome/app_shim/chrome_main_app_mode_mac.mm +++ b/chrome/app_shim/chrome_main_app_mode_mac.mm
@@ -25,6 +25,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_executor.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chrome/app/chrome_crash_reporter_client.h" #include "chrome/app_shim/app_shim_controller.h" #include "chrome/common/chrome_constants.h"
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 53c7217..43e4cded 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -4559,8 +4559,6 @@ if (is_chromeos_ash) { assert(enable_system_notifications) sources += [ - "apps/app_discovery_service/app_discovery_features.cc", - "apps/app_discovery_service/app_discovery_features.h", "apps/app_discovery_service/app_discovery_service.cc", "apps/app_discovery_service/app_discovery_service.h", "apps/app_discovery_service/app_discovery_service_factory.cc", @@ -4576,12 +4574,6 @@ "apps/app_discovery_service/play_extras.h", "apps/app_discovery_service/recommended_arc_app_fetcher.cc", "apps/app_discovery_service/recommended_arc_app_fetcher.h", - "apps/app_discovery_service/remote_url_search/remote_url_client.cc", - "apps/app_discovery_service/remote_url_search/remote_url_client.h", - "apps/app_discovery_service/remote_url_search/remote_url_fetcher.cc", - "apps/app_discovery_service/remote_url_search/remote_url_fetcher.h", - "apps/app_discovery_service/remote_url_search/remote_url_index.cc", - "apps/app_discovery_service/remote_url_search/remote_url_index.h", "apps/app_discovery_service/result.cc", "apps/app_discovery_service/result.h", "apps/app_discovery_service/test_fetcher.cc",
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 81a9402..884566f 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -32,7 +32,6 @@ #include "build/build_config.h" #include "cc/base/features.h" #include "cc/base/switches.h" -#include "chrome/browser/apps/app_discovery_service/app_discovery_features.h" #include "chrome/browser/ash/android_sms/android_sms_switches.h" #include "chrome/browser/browser_features.h" #include "chrome/browser/feature_guide/notifications/feature_notification_guide_service.h" @@ -1866,6 +1865,7 @@ {"tab_grid_layout_android_new_tab_tile", "NewTabTile"}}; const FeatureEntry::FeatureParam kTabGridLayoutAndroid_TallNTV[] = { + {"thumbnail_aspect_ratio", "0.85"}, {"allow_to_refetch", "true"}, {"tab_grid_layout_android_new_tab", "NewTabVariation"}, {"enable_launch_polish", "true"}, @@ -6853,6 +6853,9 @@ flag_descriptions::kForceShowContinueSectionName, flag_descriptions::kForceShowContinueSectionDescription, kOsCrOS, FEATURE_VALUE_TYPE(app_list_features::kForceShowContinueSection)}, + {"launcher-game-search", flag_descriptions::kLauncherGameSearchName, + flag_descriptions::kLauncherGameSearchDescription, kOsCrOS, + FEATURE_VALUE_TYPE(search_features::kLauncherGameSearch)}, {"launcher-nudge", flag_descriptions::kLauncherNudgeName, flag_descriptions::kLauncherNudgeDescription, kOsCrOS, FEATURE_VALUE_TYPE(ash::features::kShelfLauncherNudge)}, @@ -6892,11 +6895,6 @@ app_list_features::kDynamicSearchUpdateAnimation, kDynamicSearchUpdateAnimationVariations, "LauncherDynamicAnimations")}, - - {"app-discovery-remote-url-search", - flag_descriptions::kAppDiscoveryRemoteUrlSearchName, - flag_descriptions::kAppDiscoveryRemoteUrlSearchDescription, kOsCrOS, - FEATURE_VALUE_TYPE(apps::kAppDiscoveryRemoteUrlSearch)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) {"enable-bluetooth-spp-in-serial-api",
diff --git a/chrome/browser/accessibility/caption_settings_dialog_win.cc b/chrome/browser/accessibility/caption_settings_dialog_win.cc index a1893fba..3e91bb7 100644 --- a/chrome/browser/accessibility/caption_settings_dialog_win.cc +++ b/chrome/browser/accessibility/caption_settings_dialog_win.cc
@@ -8,7 +8,6 @@ #include <shellapi.h> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/win/windows_version.h"
diff --git a/chrome/browser/after_startup_task_utils_unittest.cc b/chrome/browser/after_startup_task_utils_unittest.cc index 6b9ddf30..95a7401 100644 --- a/chrome/browser/after_startup_task_utils_unittest.cc +++ b/chrome/browser/after_startup_task_utils_unittest.cc
@@ -11,7 +11,6 @@ #include "base/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/android/compositor/tab_content_manager.cc b/chrome/browser/android/compositor/tab_content_manager.cc index 7ca5769..6f60ff72 100644 --- a/chrome/browser/android/compositor/tab_content_manager.cc +++ b/chrome/browser/android/compositor/tab_content_manager.cc
@@ -44,6 +44,8 @@ namespace { +const double kDefaultThumbnailAspectRatio = 0.85; + using TabReadbackCallback = base::OnceCallback<void(float, const SkBitmap&)>; } // namespace @@ -54,7 +56,6 @@ public: TabReadbackRequest(content::RenderWidgetHostView* rwhv, float thumbnail_scale, - float aspect_ratio, bool crop_to_match_aspect_ratio, TabReadbackCallback end_callback) : thumbnail_scale_(thumbnail_scale), @@ -72,6 +73,10 @@ return; } if (crop_to_match_aspect_ratio) { + double aspect_ratio = base::GetFieldTrialParamByFeatureAsDouble( + chrome::android::kTabGridLayoutAndroid, "thumbnail_aspect_ratio", + kDefaultThumbnailAspectRatio); + aspect_ratio = base::clamp(aspect_ratio, 0.5, 2.0); int height = std::min(view_size_in_pixels.height(), (int)(view_size_in_pixels.width() / aspect_ratio)); view_size_in_pixels.set_height(height); @@ -126,9 +131,11 @@ jint compression_queue_max_size, jint write_queue_max_size, jboolean use_approximation_thumbnail, - jboolean save_jpeg_thumbnails, - jfloat jpeg_aspect_ratio) + jboolean save_jpeg_thumbnails) : weak_java_tab_content_manager_(env, obj) { + double jpeg_aspect_ratio = base::GetFieldTrialParamByFeatureAsDouble( + chrome::android::kTabGridLayoutAndroid, "thumbnail_aspect_ratio", + kDefaultThumbnailAspectRatio); thumbnail_cache_ = std::make_unique<ThumbnailCache>( static_cast<size_t>(default_cache_size), static_cast<size_t>(approximation_cache_size), @@ -255,7 +262,6 @@ const JavaParamRef<jobject>& obj, const JavaParamRef<jobject>& tab, jfloat thumbnail_scale, - jfloat aspect_ratio, jboolean write_to_cache, const base::android::JavaParamRef<jobject>& j_callback) { TabAndroid* tab_android = TabAndroid::GetNativeTab(env, tab); @@ -274,10 +280,9 @@ } TabReadbackCallback readback_done_callback = base::BindOnce( &TabContentManager::OnTabReadback, weak_factory_.GetWeakPtr(), tab_id, - base::android::ScopedJavaGlobalRef<jobject>(j_callback), write_to_cache, - aspect_ratio); + base::android::ScopedJavaGlobalRef<jobject>(j_callback), write_to_cache); pending_tab_readbacks_[tab_id] = std::make_unique<TabReadbackRequest>( - rwhv, thumbnail_scale, aspect_ratio, !write_to_cache, + rwhv, thumbnail_scale, !write_to_cache, std::move(readback_done_callback)); } @@ -285,8 +290,7 @@ const JavaParamRef<jobject>& obj, const JavaParamRef<jobject>& tab, const JavaParamRef<jobject>& bitmap, - jfloat thumbnail_scale, - jfloat aspect_ratio) { + jfloat thumbnail_scale) { TabAndroid* tab_android = TabAndroid::GetNativeTab(env, tab); DCHECK(tab_android); int tab_id = tab_android->GetAndroidId(); @@ -297,8 +301,7 @@ skbitmap.setImmutable(); if (thumbnail_cache_->CheckAndUpdateThumbnailMetaData(tab_id, url)) - OnTabReadback(tab_id, nullptr, true, aspect_ratio, thumbnail_scale, - skbitmap); + OnTabReadback(tab_id, nullptr, true, thumbnail_scale, skbitmap); } void TabContentManager::InvalidateIfChanged(JNIEnv* env, @@ -342,14 +345,13 @@ JNIEnv* env, const base::android::JavaParamRef<jobject>& obj, jint tab_id, - jfloat aspect_ratio, const base::android::JavaParamRef<jobject>& j_callback) { thumbnail_cache_->DecompressThumbnailFromFile( tab_id, base::BindOnce(&TabContentManager::SendThumbnailToJava, weak_factory_.GetWeakPtr(), base::android::ScopedJavaGlobalRef<jobject>(j_callback), - /* need_downsampling */ true, aspect_ratio)); + /* need_downsampling */ true)); } void TabContentManager::OnUIResourcesWereEvicted() { @@ -366,7 +368,6 @@ int tab_id, base::android::ScopedJavaGlobalRef<jobject> j_callback, bool write_to_cache, - float aspect_ratio, float thumbnail_scale, const SkBitmap& bitmap) { TabReadbackRequestMap::iterator readback_iter = @@ -376,7 +377,7 @@ pending_tab_readbacks_.erase(tab_id); if (j_callback) { - SendThumbnailToJava(j_callback, write_to_cache, aspect_ratio, true, bitmap); + SendThumbnailToJava(j_callback, write_to_cache, true, bitmap); } if (write_to_cache && thumbnail_scale > 0 && !bitmap.empty()) @@ -386,7 +387,6 @@ void TabContentManager::SendThumbnailToJava( base::android::ScopedJavaGlobalRef<jobject> j_callback, bool need_downsampling, - float aspect_ratio, bool result, const SkBitmap& bitmap) { ScopedJavaLocalRef<jobject> j_bitmap; @@ -397,6 +397,11 @@ // portrait mode, or it would be shown in the wrong aspect ratio in // landscape mode. int scale = need_downsampling ? 2 : 1; + double aspect_ratio = base::GetFieldTrialParamByFeatureAsDouble( + chrome::android::kTabGridLayoutAndroid, "thumbnail_aspect_ratio", + kDefaultThumbnailAspectRatio); + aspect_ratio = base::clamp(aspect_ratio, 0.5, 2.0); + int width = std::min(bitmap.width() / scale, (int)(bitmap.height() * aspect_ratio / scale)); int height = std::min(bitmap.height() / scale, @@ -437,12 +442,11 @@ jint compression_queue_max_size, jint write_queue_max_size, jboolean use_approximation_thumbnail, - jboolean save_jpeg_thumbnails, - jfloat jpeg_aspect_ratio) { + jboolean save_jpeg_thumbnails) { TabContentManager* manager = new TabContentManager( env, obj, default_cache_size, approximation_cache_size, compression_queue_max_size, write_queue_max_size, - use_approximation_thumbnail, save_jpeg_thumbnails, jpeg_aspect_ratio); + use_approximation_thumbnail, save_jpeg_thumbnails); return reinterpret_cast<intptr_t>(manager); }
diff --git a/chrome/browser/android/compositor/tab_content_manager.h b/chrome/browser/android/compositor/tab_content_manager.h index d8fc5c2..be66ab6 100644 --- a/chrome/browser/android/compositor/tab_content_manager.h +++ b/chrome/browser/android/compositor/tab_content_manager.h
@@ -45,8 +45,7 @@ jint compression_queue_max_size, jint write_queue_max_size, jboolean use_approximation_thumbnail, - jboolean save_jpeg_thumbnails, - jfloat jpeg_aspect_ratio); + jboolean save_jpeg_thumbnails); TabContentManager(const TabContentManager&) = delete; TabContentManager& operator=(const TabContentManager&) = delete; @@ -89,15 +88,13 @@ const base::android::JavaParamRef<jobject>& obj, const base::android::JavaParamRef<jobject>& tab, jfloat thumbnail_scale, - jfloat aspect_ratio, jboolean write_to_cache, const base::android::JavaParamRef<jobject>& j_callback); void CacheTabWithBitmap(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj, const base::android::JavaParamRef<jobject>& tab, const base::android::JavaParamRef<jobject>& bitmap, - jfloat thumbnail_scale, - jfloat aspect_ratio); + jfloat thumbnail_scale); void InvalidateIfChanged(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj, jint tab_id, @@ -115,7 +112,6 @@ JNIEnv* env, const base::android::JavaParamRef<jobject>& obj, jint tab_id, - jfloat aspect_ratio, const base::android::JavaParamRef<jobject>& j_callback); void SetCaptureMinRequestTimeForTesting( JNIEnv* env, @@ -145,13 +141,11 @@ base::android::ScopedJavaGlobalRef<jobject> j_callback, bool write_to_cache, float thumbnail_scale, - float aspect_ratio, const SkBitmap& bitmap); void SendThumbnailToJava( base::android::ScopedJavaGlobalRef<jobject> j_callback, bool need_downsampling, - float aspect_ratio, bool result, const SkBitmap& bitmap);
diff --git a/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc b/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc index 364d804..a1dd761 100644 --- a/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc +++ b/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" +#include "base/time/time.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "components/offline_pages/core/offline_store_utils.h" #include "components/offline_pages/task/task.h"
diff --git a/chrome/browser/android/explore_sites/explore_sites_fetcher_unittest.cc b/chrome/browser/android/explore_sites/explore_sites_fetcher_unittest.cc index 455e2fdf..092fa38 100644 --- a/chrome/browser/android/explore_sites/explore_sites_fetcher_unittest.cc +++ b/chrome/browser/android/explore_sites/explore_sites_fetcher_unittest.cc
@@ -13,6 +13,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/test/test_mock_time_task_runner.h" +#include "base/time/time.h" #include "chrome/browser/android/explore_sites/catalog.pb.h" #include "chrome/browser/android/explore_sites/explore_sites_feature.h" #include "chrome/browser/android/explore_sites/explore_sites_types.h"
diff --git a/chrome/browser/android/explore_sites/explore_sites_service_factory.cc b/chrome/browser/android/explore_sites/explore_sites_service_factory.cc index 9fa9b051e..7862cea 100644 --- a/chrome/browser/android/explore_sites/explore_sites_service_factory.cc +++ b/chrome/browser/android/explore_sites/explore_sites_service_factory.cc
@@ -10,7 +10,6 @@ #include "base/files/file_path.h" #include "base/memory/raw_ptr.h" #include "base/memory/singleton.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/time/default_clock.h"
diff --git a/chrome/browser/android/explore_sites/explore_sites_service_impl.cc b/chrome/browser/android/explore_sites/explore_sites_service_impl.cc index 403f39b..d840c5a0 100644 --- a/chrome/browser/android/explore_sites/explore_sites_service_impl.cc +++ b/chrome/browser/android/explore_sites/explore_sites_service_impl.cc
@@ -9,7 +9,6 @@ #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "chrome/browser/android/explore_sites/block_site_task.h" #include "chrome/browser/android/explore_sites/catalog.pb.h" #include "chrome/browser/android/explore_sites/clear_activities_task.h"
diff --git a/chrome/browser/android/history_report/delta_file_service.cc b/chrome/browser/android/history_report/delta_file_service.cc index 10dea57..0ec0c32 100644 --- a/chrome/browser/android/history_report/delta_file_service.cc +++ b/chrome/browser/android/history_report/delta_file_service.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/trace_event/memory_dump_manager.h"
diff --git a/chrome/browser/android/history_report/usage_reports_buffer_service.cc b/chrome/browser/android/history_report/usage_reports_buffer_service.cc index e8b4372..cd3d264 100644 --- a/chrome/browser/android/history_report/usage_reports_buffer_service.cc +++ b/chrome/browser/android/history_report/usage_reports_buffer_service.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/trace_event/memory_dump_manager.h"
diff --git a/chrome/browser/android/usage_stats/usage_stats_database.cc b/chrome/browser/android/usage_stats/usage_stats_database.cc index f498fc8..2a067ec 100644 --- a/chrome/browser/android/usage_stats/usage_stats_database.cc +++ b/chrome/browser/android/usage_stats/usage_stats_database.cc
@@ -10,7 +10,6 @@ #include "base/callback.h" #include "base/strings/safe_sprintf.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/android/usage_stats/website_event.pb.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/android/vr/gvr_scheduler_delegate.h b/chrome/browser/android/vr/gvr_scheduler_delegate.h index 605c261..6bcd1b1 100644 --- a/chrome/browser/android/vr/gvr_scheduler_delegate.h +++ b/chrome/browser/android/vr/gvr_scheduler_delegate.h
@@ -13,6 +13,7 @@ #include "base/cancelable_callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "chrome/browser/android/vr/android_vsync_helper.h" #include "chrome/browser/android/vr/gvr_graphics_delegate.h" #include "chrome/browser/vr/base_scheduler_delegate.h"
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 953e9637..41a2626 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm
@@ -26,7 +26,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/apps/app_discovery_service/app_discovery_features.cc b/chrome/browser/apps/app_discovery_service/app_discovery_features.cc deleted file mode 100644 index 80c296f1..0000000 --- a/chrome/browser/apps/app_discovery_service/app_discovery_features.cc +++ /dev/null
@@ -1,19 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/apps/app_discovery_service/app_discovery_features.h" - -#include "base/feature_list.h" -#include "base/metrics/field_trial_params.h" - -namespace apps { - -const base::Feature kAppDiscoveryRemoteUrlSearch{ - "AppDiscoveryRemoteUrlSearch", base::FEATURE_DISABLED_BY_DEFAULT}; - -bool IsRemoteUrlSearchEnabled() { - return base::FeatureList::IsEnabled(kAppDiscoveryRemoteUrlSearch); -} - -} // namespace apps
diff --git a/chrome/browser/apps/app_discovery_service/app_discovery_features.h b/chrome/browser/apps/app_discovery_service/app_discovery_features.h deleted file mode 100644 index ce9d053..0000000 --- a/chrome/browser/apps/app_discovery_service/app_discovery_features.h +++ /dev/null
@@ -1,20 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_APP_DISCOVERY_FEATURES_H_ -#define CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_APP_DISCOVERY_FEATURES_H_ - -namespace base { -struct Feature; -} - -namespace apps { - -extern const base::Feature kAppDiscoveryRemoteUrlSearch; - -bool IsRemoteUrlSearchEnabled(); - -} // namespace apps - -#endif // CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_APP_DISCOVERY_FEATURES_H_
diff --git a/chrome/browser/apps/app_discovery_service/app_discovery_util.h b/chrome/browser/apps/app_discovery_service/app_discovery_util.h index 219566b2..56f249d1 100644 --- a/chrome/browser/apps/app_discovery_service/app_discovery_util.h +++ b/chrome/browser/apps/app_discovery_service/app_discovery_util.h
@@ -15,7 +15,6 @@ enum class ResultType { kTestType, kRecommendedArcApps, - kRemoteUrlSearch, }; enum class AppSource {
diff --git a/chrome/browser/apps/app_discovery_service/app_fetcher_manager.cc b/chrome/browser/apps/app_discovery_service/app_fetcher_manager.cc index 0c2426ff..9cabc74 100644 --- a/chrome/browser/apps/app_discovery_service/app_fetcher_manager.cc +++ b/chrome/browser/apps/app_discovery_service/app_fetcher_manager.cc
@@ -6,9 +6,7 @@ #include <utility> -#include "chrome/browser/apps/app_discovery_service/app_discovery_features.h" #include "chrome/browser/apps/app_discovery_service/recommended_arc_app_fetcher.h" -#include "chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_fetcher.h" namespace apps { @@ -17,8 +15,7 @@ AppFetcherManager::AppFetcherManager(Profile* profile) : recommended_arc_app_fetcher_( - std::make_unique<RecommendedArcAppFetcher>()), - remote_url_fetcher_(std::make_unique<RemoteUrlFetcher>(profile)) {} + std::make_unique<RecommendedArcAppFetcher>()) {} AppFetcherManager::~AppFetcherManager() = default; @@ -33,10 +30,6 @@ DCHECK(recommended_arc_app_fetcher_); recommended_arc_app_fetcher_->GetApps(std::move(callback)); return; - case ResultType::kRemoteUrlSearch: - DCHECK(remote_url_fetcher_); - remote_url_fetcher_->GetApps(std::move(callback)); - return; } }
diff --git a/chrome/browser/apps/app_discovery_service/app_fetcher_manager.h b/chrome/browser/apps/app_discovery_service/app_fetcher_manager.h index ddf0d69f..172466d 100644 --- a/chrome/browser/apps/app_discovery_service/app_fetcher_manager.h +++ b/chrome/browser/apps/app_discovery_service/app_fetcher_manager.h
@@ -35,7 +35,6 @@ private: std::unique_ptr<AppFetcher> recommended_arc_app_fetcher_; - std::unique_ptr<AppFetcher> remote_url_fetcher_; static AppFetcher* g_test_fetcher_; };
diff --git a/chrome/browser/apps/app_discovery_service/game_fetcher.cc b/chrome/browser/apps/app_discovery_service/game_fetcher.cc index be47e477..5629286 100644 --- a/chrome/browser/apps/app_discovery_service/game_fetcher.cc +++ b/chrome/browser/apps/app_discovery_service/game_fetcher.cc
@@ -6,7 +6,6 @@ #include <utility> -#include "chrome/browser/apps/app_discovery_service/app_discovery_features.h" #include "chrome/browser/apps/app_provisioning_service/app_provisioning_data_manager.h" namespace apps {
diff --git a/chrome/browser/apps/app_discovery_service/remote_url_search/OWNERS b/chrome/browser/apps/app_discovery_service/remote_url_search/OWNERS deleted file mode 100644 index a5a1018..0000000 --- a/chrome/browser/apps/app_discovery_service/remote_url_search/OWNERS +++ /dev/null
@@ -1 +0,0 @@ -tby@chromium.org
diff --git a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client.cc b/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client.cc deleted file mode 100644 index 8e9fd58..0000000 --- a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client.cc +++ /dev/null
@@ -1,16 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client.h" - -namespace apps { - -RemoteUrlClient::RemoteUrlClient(const GURL& url) : url_(url) {} - -void RemoteUrlClient::Fetch(ResultsCallback callback) { - // TODO(crbug.com/1244221): Unimplemented. - std::move(callback).Run(Status::kOk, base::Value()); -} - -} // namespace apps
diff --git a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client.h b/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client.h deleted file mode 100644 index 1514830..0000000 --- a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client.h +++ /dev/null
@@ -1,46 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_REMOTE_URL_SEARCH_REMOTE_URL_CLIENT_H_ -#define CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_REMOTE_URL_SEARCH_REMOTE_URL_CLIENT_H_ - -#include "base/callback.h" -#include "base/values.h" -#include "url/gurl.h" - -namespace apps { - -// A client that queries the URL provided at construction for app -// recommendations. The intended usage here is to periodically call Fetch, which -// will pass results or an error to its callback. -class RemoteUrlClient { - public: - // Possible outcomes of a call to the URL. These values persist to logs. - // Entries should not be renumbered and numeric values should never be reused. - enum class Status { - kOk = 0, - kMaxValue = kOk, - }; - - using ResultsCallback = base::OnceCallback<void(Status, base::Value)>; - - explicit RemoteUrlClient(const GURL& url); - ~RemoteUrlClient() = default; - - RemoteUrlClient(const RemoteUrlClient&) = delete; - RemoteUrlClient& operator=(const RemoteUrlClient&) = delete; - - // Fetch results from the given URL. |callback| will be called in one of two - // ways: - // - with Status::kOk and a valid base::Value* if the fetch was successful - // - with any other Status and a nullptr base::Value* otherwise - void Fetch(ResultsCallback callback); - - private: - GURL url_; -}; - -} // namespace apps - -#endif // CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_REMOTE_URL_SEARCH_REMOTE_URL_CLIENT_H_
diff --git a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client_unittest.cc b/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client_unittest.cc deleted file mode 100644 index fa2f9480..0000000 --- a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client_unittest.cc +++ /dev/null
@@ -1,23 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client.h" - -#include "base/values.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace apps { - -// TODO(crbug.com/1244221): This test just exercises the unimplemented Fetch -// method as a stand-in for proper tests once the logic is implemented. -TEST(RemoteUrlClientTest, FetchReturnsOk) { - RemoteUrlClient client(GURL("test.url")); - client.Fetch( - base::BindOnce([](RemoteUrlClient::Status status, base::Value value) { - EXPECT_EQ(status, RemoteUrlClient::Status::kOk); - })); -} - -} // namespace apps
diff --git a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_fetcher.h b/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_fetcher.h deleted file mode 100644 index 31052a26..0000000 --- a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_fetcher.h +++ /dev/null
@@ -1,37 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_REMOTE_URL_SEARCH_REMOTE_URL_FETCHER_H_ -#define CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_REMOTE_URL_SEARCH_REMOTE_URL_FETCHER_H_ - -#include "chrome/browser/apps/app_discovery_service/app_discovery_util.h" -#include "chrome/browser/apps/app_discovery_service/app_fetcher_manager.h" -#include "chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index.h" - -class Profile; - -namespace apps { - -// A fetcher for app recommendations coming from a hardcoded URL. This manages -// the querying the URL, and indexing and searching the results. -class RemoteUrlFetcher : public AppFetcher { - public: - explicit RemoteUrlFetcher(Profile* profile); - ~RemoteUrlFetcher() override; - - RemoteUrlFetcher(const RemoteUrlFetcher&) = delete; - RemoteUrlFetcher& operator=(const RemoteUrlFetcher&) = delete; - - // AppFetcher: - void GetApps(ResultCallback callback) override; - - private: - std::unique_ptr<RemoteUrlIndex> index_; - - bool enabled_ = false; -}; - -} // namespace apps - -#endif // CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_REMOTE_URL_SEARCH_REMOTE_URL_FETCHER_H_
diff --git a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index.cc b/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index.cc deleted file mode 100644 index 9fd9f0b5f..0000000 --- a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index.cc +++ /dev/null
@@ -1,46 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index.h" - -#include "base/time/time.h" -#include "base/values.h" - -namespace apps { -namespace { - -constexpr base::TimeDelta kUpdateInterval = base::Hours(24); - -} // namespace - -RemoteUrlIndex::RemoteUrlIndex(std::unique_ptr<RemoteUrlClient> client, - const base::FilePath& storage_path) - : client_(std::move(client)), storage_path_(storage_path) { - MaybeUpdateAndReschedule(); -} - -RemoteUrlIndex::~RemoteUrlIndex() = default; - -base::Value* RemoteUrlIndex::GetApps(const std::string& query) { - // TODO(crbug.com/1244221): Unimplemented. - return nullptr; -} - -void RemoteUrlIndex::MaybeUpdateAndReschedule() { - client_->Fetch(base::BindOnce(&RemoteUrlIndex::OnUpdateComplete, - weak_factory_.GetWeakPtr())); - - base::SequencedTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, - base::BindOnce(&RemoteUrlIndex::MaybeUpdateAndReschedule, - weak_factory_.GetWeakPtr()), - kUpdateInterval); -} - -void RemoteUrlIndex::OnUpdateComplete(RemoteUrlClient::Status status, - base::Value value) { - // TODO(crbug.com/1244221): Unimplemented. -} - -} // namespace apps
diff --git a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index.h b/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index.h deleted file mode 100644 index 7653f52..0000000 --- a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index.h +++ /dev/null
@@ -1,51 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_REMOTE_URL_SEARCH_REMOTE_URL_INDEX_H_ -#define CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_REMOTE_URL_SEARCH_REMOTE_URL_INDEX_H_ - -#include "base/callback.h" -#include "base/files/file_path.h" -#include "base/memory/scoped_refptr.h" -#include "base/memory/weak_ptr.h" -#include "base/task/sequenced_task_runner.h" -#include "base/threading/sequenced_task_runner_handle.h" -#include "chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client.h" - -namespace base { -class Value; -} // namespace base - -namespace apps { -class RemoteUrlClient; - -// An index of app recommendations. Uses the RemoteUrlClient given at -// construction to periodically request app recommendations. The results are -// then indexed and made available for querying via the GetApps method. -class RemoteUrlIndex { - public: - RemoteUrlIndex(std::unique_ptr<RemoteUrlClient> client, - const base::FilePath& storage_path); - ~RemoteUrlIndex(); - - RemoteUrlIndex(const RemoteUrlIndex&) = delete; - RemoteUrlIndex& operator=(const RemoteUrlIndex&) = delete; - - base::Value* GetApps(const std::string& query); - - private: - void MaybeUpdateAndReschedule(); - void OnUpdateComplete(RemoteUrlClient::Status status, base::Value value); - - const std::unique_ptr<RemoteUrlClient> client_; - - const base::FilePath storage_path_; - - scoped_refptr<base::SequencedTaskRunner> task_runner_; - base::WeakPtrFactory<RemoteUrlIndex> weak_factory_{this}; -}; - -} // namespace apps - -#endif // CHROME_BROWSER_APPS_APP_DISCOVERY_SERVICE_REMOTE_URL_SEARCH_REMOTE_URL_INDEX_H_
diff --git a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index_unittest.cc b/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index_unittest.cc deleted file mode 100644 index b28361a..0000000 --- a/chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index_unittest.cc +++ /dev/null
@@ -1,54 +0,0 @@ -// Copyright 2021 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_index.h" - -#include "base/files/scoped_temp_dir.h" -#include "base/test/simple_test_clock.h" -#include "base/test/task_environment.h" -#include "chrome/browser/apps/app_discovery_service/remote_url_search/remote_url_client.h" -#include "content/public/test/browser_task_environment.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace apps { - -class RemoteUrlIndexTest : public testing::Test { - protected: - RemoteUrlIndexTest() = default; - ~RemoteUrlIndexTest() override = default; - - void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); } - - base::FilePath GetPath() { - return temp_dir_.GetPath().AppendASCII("storage.json"); - } - - void Wait() { task_environment_.RunUntilIdle(); } - - base::test::TaskEnvironment task_environment_{ - base::test::TaskEnvironment::MainThreadType::UI, - base::test::TaskEnvironment::TimeSource::MOCK_TIME, - base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED}; - base::ScopedTempDir temp_dir_; -}; - -// TODO(crbug.com/1244221): This test just exercises the unimplemented GetApps -// method as a stand-in for proper tests once the logic is implemented. -TEST_F(RemoteUrlIndexTest, GetApps) { - auto client = std::make_unique<RemoteUrlClient>(GURL("test.url")); - RemoteUrlIndex index(std::move(client), GetPath()); - EXPECT_EQ(index.GetApps(""), nullptr); -} - -// Tests that one iteration of the update loop doesn't crash. -TEST_F(RemoteUrlIndexTest, WaitForUpdate) { - auto client = std::make_unique<RemoteUrlClient>(GURL("test.url")); - RemoteUrlIndex index(std::move(client), GetPath()); - task_environment_.AdvanceClock(base::Days(2)); - Wait(); - SUCCEED(); -} - -} // namespace apps
diff --git a/chrome/browser/apps/app_service/app_icon/app_icon_factory.cc b/chrome/browser/apps/app_service/app_icon/app_icon_factory.cc index b0257e95..9effcea 100644 --- a/chrome/browser/apps/app_service/app_icon/app_icon_factory.cc +++ b/chrome/browser/apps/app_service/app_icon/app_icon_factory.cc
@@ -14,7 +14,6 @@ #include "base/memory/ref_counted.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/apps/app_service/app_icon/app_icon_loader.cc b/chrome/browser/apps/app_service/app_icon/app_icon_loader.cc index d3060e2b..689be02 100644 --- a/chrome/browser/apps/app_service/app_icon/app_icon_loader.cc +++ b/chrome/browser/apps/app_service/app_icon/app_icon_loader.cc
@@ -14,7 +14,6 @@ #include "base/files/file_util.h" #include "base/memory/ref_counted.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_browsertest.cc b/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_browsertest.cc index 0e12d79..3fb6a9e6 100644 --- a/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_browsertest.cc +++ b/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_browsertest.cc
@@ -9,7 +9,6 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/apps/platform_apps/app_shim_interactive_uitest_mac.mm b/chrome/browser/apps/platform_apps/app_shim_interactive_uitest_mac.mm index 2dbee2e..866f99c 100644 --- a/chrome/browser/apps/platform_apps/app_shim_interactive_uitest_mac.mm +++ b/chrome/browser/apps/platform_apps/app_shim_interactive_uitest_mac.mm
@@ -19,7 +19,6 @@ #include "base/process/launch.h" #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/test_timeouts.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/ash/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/ash/accessibility/spoken_feedback_browsertest.cc index 372cbd9..7c2193da 100644 --- a/chrome/browser/ash/accessibility/spoken_feedback_browsertest.cc +++ b/chrome/browser/ash/accessibility/spoken_feedback_browsertest.cc
@@ -27,7 +27,6 @@ #include "ash/system/unified/unified_system_tray.h" #include "base/bind.h" #include "base/command_line.h" -#include "base/task/post_task.h" #include "base/test/simple_test_tick_clock.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl.h b/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl.h index e8e60df..e02db02 100644 --- a/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl.h +++ b/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl.h
@@ -7,6 +7,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "chrome/browser/ash/android_sms/android_sms_app_setup_controller.h" #include "chrome/browser/web_applications/externally_managed_app_manager.h"
diff --git a/chrome/browser/ash/android_sms/fcm_connection_establisher.h b/chrome/browser/ash/android_sms/fcm_connection_establisher.h index 7a1c1d1..a7ec13b9 100644 --- a/chrome/browser/ash/android_sms/fcm_connection_establisher.h +++ b/chrome/browser/ash/android_sms/fcm_connection_establisher.h
@@ -11,6 +11,7 @@ #include "base/containers/queue.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/android_sms/connection_establisher.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_app_data_base.cc b/chrome/browser/ash/app_mode/kiosk_app_data_base.cc index 7fbd2d8..b94dc58 100644 --- a/chrome/browser/ash/app_mode/kiosk_app_data_base.cc +++ b/chrome/browser/ash/app_mode/kiosk_app_data_base.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_app_manager.cc b/chrome/browser/ash/app_mode/kiosk_app_manager.cc index 2e11e9b1..41af901 100644 --- a/chrome/browser/ash/app_mode/kiosk_app_manager.cc +++ b/chrome/browser/ash/app_mode/kiosk_app_manager.cc
@@ -19,7 +19,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/ash/app_mode/web_app/web_kiosk_app_data.cc b/chrome/browser/ash/app_mode/web_app/web_kiosk_app_data.cc index 819f63f5..b6a3096 100644 --- a/chrome/browser/ash/app_mode/web_app/web_kiosk_app_data.cc +++ b/chrome/browser/ash/app_mode/web_app/web_kiosk_app_data.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_data.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "chrome/browser/ash/app_mode/kiosk_app_data_delegate.h"
diff --git a/chrome/browser/ash/app_restore/app_launch_handler.h b/chrome/browser/ash/app_restore/app_launch_handler.h index 562a1635..7fbad9d 100644 --- a/chrome/browser/ash/app_restore/app_launch_handler.h +++ b/chrome/browser/ash/app_restore/app_launch_handler.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_ASH_APP_RESTORE_APP_LAUNCH_HANDLER_H_ #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/app_restore/restore_data.h" #include "components/services/app_service/public/cpp/app_registry_cache.h" #include "components/services/app_service/public/cpp/app_types.h"
diff --git a/chrome/browser/ash/app_restore/arc_app_launch_handler.h b/chrome/browser/ash/app_restore/arc_app_launch_handler.h index 6500df7..fce5afb 100644 --- a/chrome/browser/ash/app_restore/arc_app_launch_handler.h +++ b/chrome/browser/ash/app_restore/arc_app_launch_handler.h
@@ -11,6 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/scoped_multi_source_observation.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/scheduler_configuration_manager.h" #include "chromeos/dbus/resourced/resourced_client.h"
diff --git a/chrome/browser/ash/app_restore/arc_ghost_window_view.cc b/chrome/browser/ash/app_restore/arc_ghost_window_view.cc index 3123e90..0521775c0 100644 --- a/chrome/browser/ash/app_restore/arc_ghost_window_view.cc +++ b/chrome/browser/ash/app_restore/arc_ghost_window_view.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ash/app_restore/arc_ghost_window_view.h" #include "ash/public/cpp/app_list/app_list_config.h" +#include "base/time/time.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/ash/app_restore/arc_window_handler.h"
diff --git a/chrome/browser/ash/apps/apk_web_app_service.cc b/chrome/browser/ash/apps/apk_web_app_service.cc index 7dd2946e..0f554d8 100644 --- a/chrome/browser/ash/apps/apk_web_app_service.cc +++ b/chrome/browser/ash/apps/apk_web_app_service.cc
@@ -92,6 +92,12 @@ apps::AppServiceProxyFactory::GetForProfile(profile) ->AppRegistryCache(); app_registry_cache_observer_.Observe(&app_registry_cache); + + // null in unit tests + if (auto* browser_manager = crosapi::BrowserManager::Get()) { + keep_alive_ = browser_manager->KeepAlive( + crosapi::BrowserManager::Feature::kApkWebAppService); + } } // Can be null in tests.
diff --git a/chrome/browser/ash/apps/apk_web_app_service.h b/chrome/browser/ash/apps/apk_web_app_service.h index 85bfcc2..2b952d0 100644 --- a/chrome/browser/ash/apps/apk_web_app_service.h +++ b/chrome/browser/ash/apps/apk_web_app_service.h
@@ -13,6 +13,7 @@ #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ash/apps/apk_web_app_installer.h" +#include "chrome/browser/ash/crosapi/browser_manager.h" #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" #include "chrome/browser/web_applications/web_app_id.h" #include "chrome/browser/web_applications/web_app_install_manager.h" @@ -140,6 +141,11 @@ base::ScopedObservation<ArcAppListPrefs, ArcAppListPrefs::Observer> arc_app_list_prefs_observer_{this}; + // Web app installation currently requires Lacros to be always running. + // TODO(crbug.com/1174246): support web app installation in lacros when lacros + // is not running all the time (idempotent installation). + std::unique_ptr<crosapi::BrowserManager::ScopedKeepAlive> keep_alive_; + // Must go last. base::WeakPtrFactory<ApkWebAppService> weak_ptr_factory_{this}; };
diff --git a/chrome/browser/ash/arc/arc_util.cc b/chrome/browser/ash/arc/arc_util.cc index 6875453f..adb1fa97 100644 --- a/chrome/browser/ash/arc/arc_util.cc +++ b/chrome/browser/ash/arc/arc_util.cc
@@ -24,7 +24,6 @@ #include "base/memory/scoped_refptr.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "chrome/browser/ash/arc/policy/arc_policy_util.h"
diff --git a/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc b/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc index 99f456c..ca4c6810 100644 --- a/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc +++ b/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher_browsertest.cc
@@ -10,7 +10,6 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "chrome/browser/ash/arc/arc_support_host.h" #include "chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.h"
diff --git a/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc b/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc index e0a7f52..45eb3c9 100644 --- a/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc +++ b/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc
@@ -25,7 +25,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/ash/account_manager/account_apps_availability_factory.h"
diff --git a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc b/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc index cd01836..da15eef 100644 --- a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc +++ b/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher_browsertest.cc
@@ -10,7 +10,6 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "chrome/browser/ash/arc/auth/arc_auth_service.h" #include "chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.h"
diff --git a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc index 23006fae..8c7071d 100644 --- a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc +++ b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc
@@ -28,7 +28,6 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/posix/eintr_wrapper.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge_unittest.cc b/chrome/browser/ash/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge_unittest.cc index d986a7948..e32cd91 100644 --- a/chrome/browser/ash/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge_unittest.cc +++ b/chrome/browser/ash/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge_unittest.cc
@@ -13,6 +13,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "chrome/browser/ash/arc/arc_util.h" #include "chrome/browser/ash/arc/session/arc_session_manager.h" #include "chrome/browser/ash/arc/test/test_arc_session_manager.h"
diff --git a/chrome/browser/ash/arc/file_system_watcher/file_system_scanner.cc b/chrome/browser/ash/arc/file_system_watcher/file_system_scanner.cc index 5abae55..610276ec 100644 --- a/chrome/browser/ash/arc/file_system_watcher/file_system_scanner.cc +++ b/chrome/browser/ash/arc/file_system_watcher/file_system_scanner.cc
@@ -10,7 +10,6 @@ #include "ash/components/arc/mojom/file_system.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "base/files/file_enumerator.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_util.h"
diff --git a/chrome/browser/ash/arc/file_system_watcher/file_system_scanner_unittest.cc b/chrome/browser/ash/arc/file_system_watcher/file_system_scanner_unittest.cc index a144159..e3e1dbe 100644 --- a/chrome/browser/ash/arc/file_system_watcher/file_system_scanner_unittest.cc +++ b/chrome/browser/ash/arc/file_system_watcher/file_system_scanner_unittest.cc
@@ -17,6 +17,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/time/time.h" #include "chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_util.h" #include "chrome/browser/ash/arc/fileapi/arc_file_system_bridge.h" #include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader.cc b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader.cc index 4c378af..9c8bf5f 100644 --- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader.cc +++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/files/file.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "chrome/browser/ash/arc/fileapi/arc_content_file_system_size_util.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer.cc b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer.cc index f9a591ae..969590bc 100644 --- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer.cc +++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer.cc
@@ -12,7 +12,6 @@ #include "base/callback_helpers.h" #include "base/files/file.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_file_system_bridge_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_file_system_bridge_unittest.cc index 4fd55a6..06962580 100644 --- a/chrome/browser/ash/arc/fileapi/arc_file_system_bridge_unittest.cc +++ b/chrome/browser/ash/arc/fileapi/arc_file_system_bridge_unittest.cc
@@ -16,6 +16,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/ash/arc/fileapi/chrome_content_provider_url_util.h" #include "chrome/browser/ash/file_manager/path_util.h" #include "chrome/browser/ash/file_system_provider/fake_extension_provider.h"
diff --git a/chrome/browser/ash/arc/fileapi/file_stream_forwarder.cc b/chrome/browser/ash/arc/fileapi/file_stream_forwarder.cc index 6e0535c..9d619db 100644 --- a/chrome/browser/ash/arc/fileapi/file_stream_forwarder.cc +++ b/chrome/browser/ash/arc/fileapi/file_stream_forwarder.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_power_throttle_observer.cc b/chrome/browser/ash/arc/instance_throttle/arc_power_throttle_observer.cc index 0f6e69c..903fb2d 100644 --- a/chrome/browser/ash/arc/instance_throttle/arc_power_throttle_observer.cc +++ b/chrome/browser/ash/arc/instance_throttle/arc_power_throttle_observer.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ash/arc/instance_throttle/arc_power_throttle_observer.h" +#include "base/time/time.h" namespace arc {
diff --git a/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter.cc b/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter.cc index 75d58e1..8121c05 100644 --- a/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter.cc +++ b/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter.cc
@@ -11,7 +11,6 @@ #include "base/files/file_util.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/arc/nearby_share/arc_nearby_share_uma.h"
diff --git a/chrome/browser/ash/arc/print_spooler/arc_print_spooler_bridge.cc b/chrome/browser/ash/arc/print_spooler/arc_print_spooler_bridge.cc index 13be0d7..f87cd4f 100644 --- a/chrome/browser/ash/arc/print_spooler/arc_print_spooler_bridge.cc +++ b/chrome/browser/ash/arc/print_spooler/arc_print_spooler_bridge.cc
@@ -12,7 +12,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/memory/singleton.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/arc/arc_util.h"
diff --git a/chrome/browser/ash/arc/print_spooler/print_session_impl.cc b/chrome/browser/ash/arc/print_spooler/print_session_impl.cc index 7ea7c35e0..b8367fd 100644 --- a/chrome/browser/ash/arc/print_spooler/print_session_impl.cc +++ b/chrome/browser/ash/arc/print_spooler/print_session_impl.cc
@@ -17,7 +17,6 @@ #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/numerics/safe_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ash/arc/process/arc_process_service.cc b/chrome/browser/ash/arc/process/arc_process_service.cc index 8a89f2d..df1b1c37 100644 --- a/chrome/browser/ash/arc/process/arc_process_service.cc +++ b/chrome/browser/ash/arc/process/arc_process_service.cc
@@ -29,7 +29,6 @@ #include "base/memory/singleton.h" #include "base/process/process.h" #include "base/process/process_iterator.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/arc/process/arc_process_service.h b/chrome/browser/ash/arc/process/arc_process_service.h index 13142c8a..eabfb0a 100644 --- a/chrome/browser/ash/arc/process/arc_process_service.h +++ b/chrome/browser/ash/arc/process/arc_process_service.h
@@ -17,6 +17,7 @@ #include "base/memory/weak_ptr.h" #include "base/process/process_iterator.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "chrome/browser/ash/arc/process/arc_process.h" #include "chrome/browser/ash/process_snapshot_server.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ash/arc/session/arc_session_manager.cc b/chrome/browser/ash/arc/session/arc_session_manager.cc index a148d25..129f7cc1 100644 --- a/chrome/browser/ash/arc/session/arc_session_manager.cc +++ b/chrome/browser/ash/arc/session/arc_session_manager.cc
@@ -29,7 +29,6 @@ #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/arc/session/arc_session_manager.h b/chrome/browser/ash/arc/session/arc_session_manager.h index 0dd699b1..7aa2185 100644 --- a/chrome/browser/ash/arc/session/arc_session_manager.h +++ b/chrome/browser/ash/arc/session/arc_session_manager.h
@@ -14,6 +14,7 @@ #include "ash/components/arc/session/arc_stop_reason.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/arc/arc_support_host.h" #include "chrome/browser/ash/arc/session/adb_sideloading_availability_delegate_impl.h"
diff --git a/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector_unittest.cc b/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector_unittest.cc index 1d7827d..3041a0a6 100644 --- a/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector_unittest.cc +++ b/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ash/arc/tracing/arc_graphics_jank_detector.h" #include "base/bind.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace arc {
diff --git a/chrome/browser/ash/arc/tracing/arc_system_stat_collector.cc b/chrome/browser/ash/arc/tracing/arc_system_stat_collector.cc index 433e20f..e4b43fb5 100644 --- a/chrome/browser/ash/arc/tracing/arc_system_stat_collector.cc +++ b/chrome/browser/ash/arc/tracing/arc_system_stat_collector.cc
@@ -20,11 +20,11 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/ash/arc/tracing/arc_system_model.h"
diff --git a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc index f95741f..7a48602 100644 --- a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc +++ b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc
@@ -14,7 +14,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/memory/singleton.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ui/ash/wallpaper_controller_client_impl.h" #include "components/account_id/account_id.h"
diff --git a/chrome/browser/ash/authpolicy/authpolicy_helper.cc b/chrome/browser/ash/authpolicy/authpolicy_helper.cc index 120bad96..6593468c 100644 --- a/chrome/browser/ash/authpolicy/authpolicy_helper.cc +++ b/chrome/browser/ash/authpolicy/authpolicy_helper.cc
@@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/authpolicy/data_pipe_utils.h" #include "chromeos/dbus/authpolicy/authpolicy_client.h"
diff --git a/chrome/browser/ash/authpolicy/kerberos_files_handler.cc b/chrome/browser/ash/authpolicy/kerberos_files_handler.cc index 9eff844d..e7253fbb 100644 --- a/chrome/browser/ash/authpolicy/kerberos_files_handler.cc +++ b/chrome/browser/ash/authpolicy/kerberos_files_handler.cc
@@ -15,7 +15,6 @@ #include "base/location.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/browser_process.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ash/base/locale_util.cc b/chrome/browser/ash/base/locale_util.cc index dd25624c..e877839 100644 --- a/chrome/browser/ash/base/locale_util.cc +++ b/chrome/browser/ash/base/locale_util.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/containers/contains.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/login/session/user_session_manager.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/borealis/borealis_context_manager_impl.h b/chrome/browser/ash/borealis/borealis_context_manager_impl.h index d0fb329..025bfd3 100644 --- a/chrome/browser/ash/borealis/borealis_context_manager_impl.h +++ b/chrome/browser/ash/borealis/borealis_context_manager_impl.h
@@ -9,6 +9,7 @@ #include "base/containers/queue.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/ash/borealis/borealis_context.h" #include "chrome/browser/ash/borealis/borealis_context_manager.h" #include "chrome/browser/ash/borealis/infra/described.h"
diff --git a/chrome/browser/ash/borealis/borealis_disk_manager_impl.cc b/chrome/browser/ash/borealis/borealis_disk_manager_impl.cc index a2287ba..3c3dab5 100644 --- a/chrome/browser/ash/borealis/borealis_disk_manager_impl.cc +++ b/chrome/browser/ash/borealis/borealis_disk_manager_impl.cc
@@ -12,7 +12,6 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/borealis/borealis_context.h" #include "chrome/browser/ash/borealis/borealis_context_manager.h"
diff --git a/chrome/browser/ash/borealis/borealis_features.cc b/chrome/browser/ash/borealis/borealis_features.cc index 38fa326e..4fe8d8b 100644 --- a/chrome/browser/ash/borealis/borealis_features.cc +++ b/chrome/browser/ash/borealis/borealis_features.cc
@@ -18,7 +18,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/ash/borealis/borealis_installer_impl.h b/chrome/browser/ash/borealis/borealis_installer_impl.h index 593e8fb..bab6bf39 100644 --- a/chrome/browser/ash/borealis/borealis_installer_impl.h +++ b/chrome/browser/ash/borealis/borealis_installer_impl.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/observer_list.h" +#include "base/time/time.h" #include "chrome/browser/ash/borealis/borealis_installer.h" #include "chrome/browser/ash/borealis/borealis_metrics.h" #include "chrome/browser/ash/borealis/infra/expected.h"
diff --git a/chrome/browser/ash/borealis/borealis_task.h b/chrome/browser/ash/borealis/borealis_task.h index 8259d56b..eb4dadd1 100644 --- a/chrome/browser/ash/borealis/borealis_task.h +++ b/chrome/browser/ash/borealis/borealis_task.h
@@ -7,6 +7,7 @@ #include "base/files/file.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/ash/borealis/borealis_context_manager.h" #include "chrome/browser/ash/borealis/borealis_features.h" #include "chrome/browser/ash/borealis/borealis_launch_options.h"
diff --git a/chrome/browser/ash/borealis/borealis_util.cc b/chrome/browser/ash/borealis/borealis_util.cc index b25aeb0..ae62c3cc 100644 --- a/chrome/browser/ash/borealis/borealis_util.cc +++ b/chrome/browser/ash/borealis/borealis_util.cc
@@ -106,12 +106,12 @@ json_root.SetInteger(kJSONMonitorsExternal, external_displays); // Proton/SLR versions - borealis::ProtonVersionInfo version_info; + borealis::CompatToolInfo version_info; std::string output; - if (borealis::GetProtonVersionInfo(owner_id, &output)) { - version_info = borealis::ParseProtonVersionInfo(game_id, output); + if (borealis::GetCompatToolInfo(owner_id, &output)) { + version_info = borealis::ParseCompatToolInfo(game_id, output); } else { - LOG(WARNING) << "Failed to run get_proton_version.py:"; + LOG(WARNING) << "Failed to run get_compat_tool_versions.py:"; LOG(WARNING) << output; } json_root.SetString(kJSONProtonKey, version_info.proton); @@ -196,10 +196,10 @@ return false; } -bool GetProtonVersionInfo(const std::string& owner_id, std::string* output) { +bool GetCompatToolInfo(const std::string& owner_id, std::string* output) { std::vector<std::string> command = {"/usr/bin/vsh", "--owner_id=" + owner_id, "--vm_name=borealis", "--", - "/usr/bin/get_proton_version.py"}; + "/usr/bin/get_compat_tool_versions.py"}; bool success = base::GetAppOutput(command, output); if (!success) { // Re-run with stderr capture. It is not done initially since @@ -211,9 +211,9 @@ return success; } -ProtonVersionInfo ParseProtonVersionInfo(absl::optional<int> game_id, - const std::string& output) { - // Expected stdout of get_proton_version.py: +CompatToolInfo ParseCompatToolInfo(absl::optional<int> game_id, + const std::string& output) { + // Expected stdout of get_compat_tool_versions.py: // GameID: <game_id>, Proton:<proton_version>, SLR: <slr_version>, Timestamp: <timestamp> // GameID: <game_id>, Proton:<proton_version>, SLR: <slr_version>, Timestamp: <timestamp> // ... @@ -221,7 +221,7 @@ // Only grab the first line, which is for the last game played. std::string raw_info = output.substr(0, output.find("\n")); - ProtonVersionInfo version_info; + CompatToolInfo version_info; std::string parsed_game_id; base::StringPairs tokenized_info; base::SplitStringIntoKeyValuePairs(raw_info, ':', ',', &tokenized_info); @@ -243,6 +243,7 @@ // If the app id is known and doesn't match, return the version "UNKNOWN" if (game_id.has_value() && !parsed_game_id.empty() && + parsed_game_id != "None" && parsed_game_id != base::NumberToString(game_id.value())) { LOG(WARNING) << "Expected GameID " << game_id.value() << " got " << parsed_game_id;
diff --git a/chrome/browser/ash/borealis/borealis_util.h b/chrome/browser/ash/borealis/borealis_util.h index e4c59ec..c6eb827 100644 --- a/chrome/browser/ash/borealis/borealis_util.h +++ b/chrome/browser/ash/borealis/borealis_util.h
@@ -36,7 +36,7 @@ // Base64-encoded allow list of URLs that can be handled by Borealis apps. extern const base::StringPiece kURLAllowlist[]; // Error string to replace Proton version info in the event that a GameID -// parsed with /usr/bin/get_proton_version.py in the Borealis VM does not +// parsed with /usr/bin/get_compat_tool_versions.py in the Borealis VM does not // match the GameID expected based on extraction with kBorealisAppIdRegex. extern const char kProtonVersionGameMismatch[]; // Query parameter key for device information in the borealis feedback @@ -48,9 +48,9 @@ extern const char kInsertCoinSuccessMessage[]; extern const char kInsertCoinRejectMessage[]; -struct ProtonVersionInfo { - std::string proton = "Not applicable"; - std::string slr = "Not applicable"; +struct CompatToolInfo { + std::string proton = "None"; + std::string slr = "None"; }; // Shows the Borealis installer (borealis_installer_view). @@ -81,13 +81,13 @@ // with one of the URLs in the allowlist. bool IsExternalURLAllowed(const GURL& url); -// Executes /usr/bin/get_proton_version.py in the borealis VM, which outputs -// the Proton version information of any recent Proton game session. -bool GetProtonVersionInfo(const std::string& owner_id, std::string* output); +// Executes /usr/bin/get_compat_tool_versions.py in the borealis VM, which +// outputs the compat tool version information of any recent game session. +bool GetCompatToolInfo(const std::string& owner_id, std::string* output); -// Parses the output returned by GetProtonVersionInfo. -ProtonVersionInfo ParseProtonVersionInfo(absl::optional<int> game_id, - const std::string& output); +// Parses the output returned by GetCompatToolInfo. +CompatToolInfo ParseCompatToolInfo(absl::optional<int> game_id, + const std::string& output); // Used in the splash screen to get the dlc path as dlcservice could not be // imported directly.
diff --git a/chrome/browser/ash/borealis/borealis_util_unittest.cc b/chrome/browser/ash/borealis/borealis_util_unittest.cc index 92615f4..46fed91 100644 --- a/chrome/browser/ash/borealis/borealis_util_unittest.cc +++ b/chrome/browser/ash/borealis/borealis_util_unittest.cc
@@ -109,70 +109,125 @@ EXPECT_EQ(json_root.value().GetDict().size(), 7); } -TEST_F(BorealisUtilTest, ProtonVersionProtonTitle) { +TEST_F(BorealisUtilTest, ProtonTitleUnknownBorealisAppId) { absl::optional<int> game_id; std::string output = "GameID: 123, Proton: Proton 1.2-3, SLR: SLR - Name, " "Timestamp: 2021-01-01 00:00:00"; - borealis::ProtonVersionInfo info = - borealis::ParseProtonVersionInfo(game_id, output); + borealis::CompatToolInfo info = + borealis::ParseCompatToolInfo(game_id, output); EXPECT_EQ(info.proton, "Proton 1.2-3"); EXPECT_EQ(info.slr, "SLR - Name"); } -TEST_F(BorealisUtilTest, ProtonVersionProtonTitleMultiLine) { +TEST_F(BorealisUtilTest, ProtonTitleKnownBorealisAppId) { + absl::optional<int> game_id = 123; + std::string output = + "GameID: 123, Proton: Proton 1.2-3, SLR: SLR - Name, " + "Timestamp: 2021-01-01 00:00:00"; + borealis::CompatToolInfo info = + borealis::ParseCompatToolInfo(game_id, output); + EXPECT_EQ(info.proton, "Proton 1.2-3"); + EXPECT_EQ(info.slr, "SLR - Name"); +} + +TEST_F(BorealisUtilTest, ProtonTitleMultiLineUnknownBorealisAppId) { absl::optional<int> game_id; std::string output = "GameID: 123, Proton: Proton 1.2-3, SLR: SLR - Name, " "Timestamp: 2021-01-01 00:00:00\n" "GameID: 456, Proton: Proton 4.5-6, SLR: SLR - Name2, " "Timestamp: 2021-01-01 00:00:00"; - borealis::ProtonVersionInfo info = - borealis::ParseProtonVersionInfo(game_id, output); + borealis::CompatToolInfo info = + borealis::ParseCompatToolInfo(game_id, output); EXPECT_EQ(info.proton, "Proton 1.2-3"); EXPECT_EQ(info.slr, "SLR - Name"); } -TEST_F(BorealisUtilTest, ProtonVersionProtonTitleWithGameId) { +TEST_F(BorealisUtilTest, ProtonTitleMultiLineKnownBorealisAppId) { absl::optional<int> game_id = 123; std::string output = "GameID: 123, Proton: Proton 1.2-3, SLR: SLR - Name, " + "Timestamp: 2021-01-01 00:00:00\n" + "GameID: 456, Proton: Proton 4.5-6, SLR: SLR - Name2, " "Timestamp: 2021-01-01 00:00:00"; - borealis::ProtonVersionInfo info = - borealis::ParseProtonVersionInfo(game_id, output); + borealis::CompatToolInfo info = + borealis::ParseCompatToolInfo(game_id, output); EXPECT_EQ(info.proton, "Proton 1.2-3"); EXPECT_EQ(info.slr, "SLR - Name"); } -TEST_F(BorealisUtilTest, ProtonVersionProtonTitleWithGameIdMismatch) { +TEST_F(BorealisUtilTest, ProtonTitleGameIdMismatch) { absl::optional<int> game_id = 123; std::string output = "GameID: 456, Proton: Proton 1.2-3, SLR: SLR - Name, " "Timestamp: 2021-01-01 00:00:00"; - borealis::ProtonVersionInfo info = - borealis::ParseProtonVersionInfo(game_id, output); + borealis::CompatToolInfo info = + borealis::ParseCompatToolInfo(game_id, output); EXPECT_EQ(info.proton, borealis::kProtonVersionGameMismatch); EXPECT_EQ(info.slr, borealis::kProtonVersionGameMismatch); } -TEST_F(BorealisUtilTest, ProtonVersionLinuxTitle) { +TEST_F(BorealisUtilTest, ProtonTitleGameIdNoneUnknownBorealisAppId) { absl::optional<int> game_id; std::string output = - "INFO: Found a session for a Linux game at timestamp 2021-01-01 00:00:00"; - borealis::ProtonVersionInfo info = - borealis::ParseProtonVersionInfo(game_id, output); - EXPECT_EQ(info.proton, "Not applicable"); - EXPECT_EQ(info.slr, "Not applicable"); + "GameID: None, Proton: Proton 1.2-3, SLR: SLR - Name, " + "Timestamp: 2021-01-01 00:00:00"; + borealis::CompatToolInfo info = + borealis::ParseCompatToolInfo(game_id, output); + EXPECT_EQ(info.proton, "Proton 1.2-3"); + EXPECT_EQ(info.slr, "SLR - Name"); } -TEST_F(BorealisUtilTest, ProtonVersionLinuxTitleWithGameId) { +TEST_F(BorealisUtilTest, ProtonTitleGameIdNoneKnownBorealisAppId) { absl::optional<int> game_id = 123; std::string output = - "INFO: Found a session for a Linux game at timestamp 2021-01-01 00:00:00"; - borealis::ProtonVersionInfo info = - borealis::ParseProtonVersionInfo(game_id, output); - EXPECT_EQ(info.proton, "Not applicable"); - EXPECT_EQ(info.slr, "Not applicable"); + "GameID: None, Proton: Proton 1.2-3, SLR: SLR - Name, " + "Timestamp: 2021-01-01 00:00:00"; + borealis::CompatToolInfo info = + borealis::ParseCompatToolInfo(game_id, output); + EXPECT_EQ(info.proton, "Proton 1.2-3"); + EXPECT_EQ(info.slr, "SLR - Name"); +} + +TEST_F(BorealisUtilTest, SLRTitleUnknownBorealisAppId) { + absl::optional<int> game_id; + std::string output = + "GameID: None, Proton: None, SLR: SLR - Name, " + "Timestamp: 2021-01-01 00:00:00"; + borealis::CompatToolInfo info = + borealis::ParseCompatToolInfo(game_id, output); + EXPECT_EQ(info.proton, "None"); + EXPECT_EQ(info.slr, "SLR - Name"); +} + +TEST_F(BorealisUtilTest, SLRTitleKnownBorealisAppId) { + absl::optional<int> game_id = 123; + std::string output = + "GameID: None, Proton: None, SLR: SLR - Name, " + "Timestamp: 2021-01-01 00:00:00"; + borealis::CompatToolInfo info = + borealis::ParseCompatToolInfo(game_id, output); + EXPECT_EQ(info.proton, "None"); + EXPECT_EQ(info.slr, "SLR - Name"); +} + +TEST_F(BorealisUtilTest, LinuxTitleUnknownBorealisAppId) { + absl::optional<int> game_id; + std::string output = ""; + borealis::CompatToolInfo info = + borealis::ParseCompatToolInfo(game_id, output); + EXPECT_EQ(info.proton, "None"); + EXPECT_EQ(info.slr, "None"); +} + +TEST_F(BorealisUtilTest, LinuxTitleKnownBorealisAppId) { + absl::optional<int> game_id = 123; + std::string output = ""; + borealis::CompatToolInfo info = + borealis::ParseCompatToolInfo(game_id, output); + EXPECT_EQ(info.proton, "None"); + EXPECT_EQ(info.slr, "None"); } } // namespace
diff --git a/chrome/browser/ash/camera_detector.cc b/chrome/browser/ash/camera_detector.cc index 131c361..bca2891 100644 --- a/chrome/browser/ash/camera_detector.cc +++ b/chrome/browser/ash/camera_detector.cc
@@ -11,7 +11,6 @@ #include "base/logging.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "components/storage_monitor/udev_util_linux.h"
diff --git a/chrome/browser/ash/child_accounts/usage_time_limit_processor_unittest.cc b/chrome/browser/ash/child_accounts/usage_time_limit_processor_unittest.cc index 26354ad..9b2bd0b 100644 --- a/chrome/browser/ash/child_accounts/usage_time_limit_processor_unittest.cc +++ b/chrome/browser/ash/child_accounts/usage_time_limit_processor_unittest.cc
@@ -11,6 +11,7 @@ #include "ash/components/settings/timezone_settings.h" #include "base/containers/contains.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/ash/child_accounts/time_limit_override.h" #include "chrome/browser/ash/child_accounts/time_limit_test_utils.h"
diff --git a/chrome/browser/ash/crosapi/browser_manager.h b/chrome/browser/ash/crosapi/browser_manager.h index 81f19905..db29bd3 100644 --- a/chrome/browser/ash/crosapi/browser_manager.h +++ b/chrome/browser/ash/crosapi/browser_manager.h
@@ -42,6 +42,10 @@ class StandaloneBrowserExtensionApps; } // namespace apps +namespace ash { +class ApkWebAppService; +} + namespace crosapi { namespace mojom { class Crosapi; @@ -316,6 +320,10 @@ // web apps in Lacros. Need to decouple the App Platform systems from // needing lacros-chrome running all the time. friend class apps::AppServiceProxyAsh; + // TODO(crbug.com/1311501): ApkWebAppService does not yet support app + // installation when lacros-chrome starts at arbitrary points of time, so it + // needs to be kept alive. + friend class ash::ApkWebAppService; // Holds the data for restoring a window from the desk template. // The request to restore a window may come when the browser service is not @@ -347,6 +355,7 @@ enum class Feature { kTestOnly, kAppService, + kApkWebAppService, kChromeApps, kExtensions, };
diff --git a/chrome/browser/ash/crosapi/copy_migrator.cc b/chrome/browser/ash/crosapi/copy_migrator.cc index bb030acd..4104ffc1 100644 --- a/chrome/browser/ash/crosapi/copy_migrator.cc +++ b/chrome/browser/ash/crosapi/copy_migrator.cc
@@ -11,7 +11,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/timer/elapsed_timer.h" #include "chrome/browser/ash/crosapi/browser_data_migrator.h"
diff --git a/chrome/browser/ash/crosapi/login_screen_storage_ash_unittest.cc b/chrome/browser/ash/crosapi/login_screen_storage_ash_unittest.cc index c3a103f1..fa3d1df 100644 --- a/chrome/browser/ash/crosapi/login_screen_storage_ash_unittest.cc +++ b/chrome/browser/ash/crosapi/login_screen_storage_ash_unittest.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/ash/crosapi/login_screen_storage_ash.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/ash/crosapi/move_migrator.cc b/chrome/browser/ash/crosapi/move_migrator.cc index 1b83e7d..1eef81e7 100644 --- a/chrome/browser/ash/crosapi/move_migrator.cc +++ b/chrome/browser/ash/crosapi/move_migrator.cc
@@ -14,7 +14,6 @@ #include "base/files/file_util.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/ash/crosapi/test_controller_ash.cc b/chrome/browser/ash/crosapi/test_controller_ash.cc index ba818a6a..bad3d4f 100644 --- a/chrome/browser/ash/crosapi/test_controller_ash.cc +++ b/chrome/browser/ash/crosapi/test_controller_ash.cc
@@ -14,7 +14,6 @@ #include "ash/wm/tablet_mode/tablet_mode_controller.h" #include "base/callback_helpers.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/ash/crosapi/browser_manager.h" #include "chrome/browser/ash/crosapi/window_util.h"
diff --git a/chrome/browser/ash/crostini/ansible/ansible_management_service.cc b/chrome/browser/ash/crostini/ansible/ansible_management_service.cc index a2762a30..4ddc2b1 100644 --- a/chrome/browser/ash/crostini/ansible/ansible_management_service.cc +++ b/chrome/browser/ash/crostini/ansible/ansible_management_service.cc
@@ -6,7 +6,6 @@ #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/crostini/ansible/ansible_management_service_factory.h"
diff --git a/chrome/browser/ash/crostini/crostini_disk.cc b/chrome/browser/ash/crostini/crostini_disk.cc index 73282af..3c7e56c 100644 --- a/chrome/browser/ash/crostini/crostini_disk.cc +++ b/chrome/browser/ash/crostini/crostini_disk.cc
@@ -12,7 +12,6 @@ #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/crostini/crostini_features.h" #include "chrome/browser/ash/crostini/crostini_manager.h"
diff --git a/chrome/browser/ash/crostini/crostini_export_import.cc b/chrome/browser/ash/crostini/crostini_export_import.cc index bdcd163..3cdd651 100644 --- a/chrome/browser/ash/crostini/crostini_export_import.cc +++ b/chrome/browser/ash/crostini/crostini_export_import.cc
@@ -13,7 +13,6 @@ #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "chrome/browser/ash/crostini/crostini_features.h"
diff --git a/chrome/browser/ash/crostini/crostini_installer.h b/chrome/browser/ash/crostini/crostini_installer.h index d347bbc..d5938cb 100644 --- a/chrome/browser/ash/crostini/crostini_installer.h +++ b/chrome/browser/ash/crostini/crostini_installer.h
@@ -7,6 +7,7 @@ #include "base/callback_forward.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "chrome/browser/ash/crostini/ansible/ansible_management_service.h" #include "chrome/browser/ash/crostini/crostini_installer_ui_delegate.h" #include "chrome/browser/ash/crostini/crostini_manager.h"
diff --git a/chrome/browser/ash/crostini/crostini_manager.h b/chrome/browser/ash/crostini/crostini_manager.h index bf97a04..28e8e7f 100644 --- a/chrome/browser/ash/crostini/crostini_manager.h +++ b/chrome/browser/ash/crostini/crostini_manager.h
@@ -14,6 +14,7 @@ #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "chrome/browser/ash/crostini/crostini_low_disk_notification.h" #include "chrome/browser/ash/crostini/crostini_simple_types.h"
diff --git a/chrome/browser/ash/crostini/crostini_package_service_unittest.cc b/chrome/browser/ash/crostini/crostini_package_service_unittest.cc index cfa1912..1136cc7 100644 --- a/chrome/browser/ash/crostini/crostini_package_service_unittest.cc +++ b/chrome/browser/ash/crostini/crostini_package_service_unittest.cc
@@ -11,7 +11,6 @@ #include "base/callback_helpers.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/platform_thread.h" #include "chrome/browser/ash/crostini/crostini_test_helper.h" #include "chrome/browser/ash/crostini/crostini_util.h"
diff --git a/chrome/browser/ash/crostini/crostini_sshfs.h b/chrome/browser/ash/crostini/crostini_sshfs.h index c51279ca0e..2a0aa42f 100644 --- a/chrome/browser/ash/crostini/crostini_sshfs.h +++ b/chrome/browser/ash/crostini/crostini_sshfs.h
@@ -13,6 +13,7 @@ #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "chrome/browser/ash/crostini/crostini_manager.h" #include "chrome/browser/ash/file_manager/volume_manager.h"
diff --git a/chrome/browser/ash/crostini/crostini_upgrader.cc b/chrome/browser/ash/crostini/crostini_upgrader.cc index 2db8a474..6098181 100644 --- a/chrome/browser/ash/crostini/crostini_upgrader.cc +++ b/chrome/browser/ash/crostini/crostini_upgrader.cc
@@ -10,7 +10,6 @@ #include "base/location.h" #include "base/no_destructor.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/crostini/crostini_export_import.h" #include "chrome/browser/ash/crostini/crostini_export_import_status_tracker.h"
diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/crostini/crostini_util.cc index 6f57c3e1..e924295 100644 --- a/chrome/browser/ash/crostini/crostini_util.cc +++ b/chrome/browser/ash/crostini/crostini_util.cc
@@ -16,7 +16,6 @@ #include "base/no_destructor.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/crostini/crostini_features.h"
diff --git a/chrome/browser/ash/customization/customization_wallpaper_downloader.cc b/chrome/browser/ash/customization/customization_wallpaper_downloader.cc index f63505b..43c089c4 100644 --- a/chrome/browser/ash/customization/customization_wallpaper_downloader.cc +++ b/chrome/browser/ash/customization/customization_wallpaper_downloader.cc
@@ -9,7 +9,6 @@ #include <utility> #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/system_network_context_manager.h"
diff --git a/chrome/browser/ash/customization/customization_wallpaper_util.cc b/chrome/browser/ash/customization/customization_wallpaper_util.cc index 84ffdcaa..59db742 100644 --- a/chrome/browser/ash/customization/customization_wallpaper_util.cc +++ b/chrome/browser/ash/customization/customization_wallpaper_util.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/customization/customization_document.h"
diff --git a/chrome/browser/ash/drive/drive_integration_service.cc b/chrome/browser/ash/drive/drive_integration_service.cc index 992585c..b268287 100644 --- a/chrome/browser/ash/drive/drive_integration_service.cc +++ b/chrome/browser/ash/drive/drive_integration_service.cc
@@ -22,7 +22,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/default_clock.h"
diff --git a/chrome/browser/ash/drive/drive_integration_service.h b/chrome/browser/ash/drive/drive_integration_service.h index aeb62c3..7ed7c74 100644 --- a/chrome/browser/ash/drive/drive_integration_service.h +++ b/chrome/browser/ash/drive/drive_integration_service.h
@@ -17,6 +17,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/observer_list_types.h" +#include "base/time/time.h" #include "components/drive/drive_notification_observer.h" #include "components/drive/file_errors.h" #include "components/drive/file_system_core_util.h"
diff --git a/chrome/browser/ash/eche_app/eche_app_manager_factory.cc b/chrome/browser/ash/eche_app/eche_app_manager_factory.cc index 253f909..a9426f2 100644 --- a/chrome/browser/ash/eche_app/eche_app_manager_factory.cc +++ b/chrome/browser/ash/eche_app/eche_app_manager_factory.cc
@@ -60,6 +60,12 @@ kMaxValue = kOpenAppStreaming, }; +void EnsureStreamClose(Profile* profile) { + EcheAppManager* eche_app_manager = + EcheAppManagerFactory::GetForProfile(profile); + eche_app_manager->CloseStream(); +} + void LaunchWebApp(const std::string& package_name, const absl::optional<int64_t>& notification_id, const std::u16string& visible_name, @@ -100,7 +106,8 @@ const auto gurl = GURL(url); if (features::IsEcheCustomWidgetEnabled()) { - return LaunchBubble(gurl, icon, visible_name); + return LaunchBubble(gurl, icon, visible_name, + base::BindOnce(&EnsureStreamClose, profile)); } web_app::SystemAppLaunchParams params; params.url = gurl;
diff --git a/chrome/browser/ash/eol_notification_unittest.cc b/chrome/browser/ash/eol_notification_unittest.cc index 43eaa4e..6417308 100644 --- a/chrome/browser/ash/eol_notification_unittest.cc +++ b/chrome/browser/ash/eol_notification_unittest.cc
@@ -6,6 +6,7 @@ #include "base/memory/ptr_util.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "chrome/browser/notifications/notification_display_service_tester.h" #include "chrome/browser/notifications/notification_handler.h" #include "chrome/browser/notifications/system_notification_helper.h"
diff --git a/chrome/browser/ash/file_manager/external_filesystem_apitest.cc b/chrome/browser/ash/file_manager/external_filesystem_apitest.cc index 4111f9a..daa29af 100644 --- a/chrome/browser/ash/file_manager/external_filesystem_apitest.cc +++ b/chrome/browser/ash/file_manager/external_filesystem_apitest.cc
@@ -12,6 +12,7 @@ #include "base/path_service.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "chrome/browser/ash/drive/drive_integration_service.h" #include "chrome/browser/ash/drive/drivefs_test_support.h" #include "chrome/browser/ash/file_manager/file_manager_test_util.h"
diff --git a/chrome/browser/ash/file_manager/file_browser_handlers.cc b/chrome/browser/ash/file_manager/file_browser_handlers.cc index a60f2de..e05546c 100644 --- a/chrome/browser/ash/file_manager/file_browser_handlers.cc +++ b/chrome/browser/ash/file_manager/file_browser_handlers.cc
@@ -16,7 +16,6 @@ #include "base/files/file_util.h" #include "base/i18n/case_conversion.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/file_manager/app_id.h" #include "chrome/browser/ash/file_manager/fileapi_util.h"
diff --git a/chrome/browser/ash/file_manager/file_manager_jstest_base.cc b/chrome/browser/ash/file_manager/file_manager_jstest_base.cc index c45c1a7..56d23d6 100644 --- a/chrome/browser/ash/file_manager/file_manager_jstest_base.cc +++ b/chrome/browser/ash/file_manager/file_manager_jstest_base.cc
@@ -8,7 +8,6 @@ #include "base/lazy_instance.h" #include "base/memory/ref_counted_memory.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/ash/file_manager/file_tasks_notifier.cc b/chrome/browser/ash/file_manager/file_tasks_notifier.cc index 0ac7f1e7..8da6d439 100644 --- a/chrome/browser/ash/file_manager/file_tasks_notifier.cc +++ b/chrome/browser/ash/file_manager/file_tasks_notifier.cc
@@ -10,7 +10,6 @@ #include "base/barrier_closure.h" #include "base/callback.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/browser/ash/drive/drive_integration_service.h"
diff --git a/chrome/browser/ash/file_manager/file_watcher.cc b/chrome/browser/ash/file_manager/file_watcher.cc index 6ae5507..c0ac0747 100644 --- a/chrome/browser/ash/file_manager/file_watcher.cc +++ b/chrome/browser/ash/file_manager/file_watcher.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/crostini/crostini_manager.h"
diff --git a/chrome/browser/ash/file_manager/open_with_browser.cc b/chrome/browser/ash/file_manager/open_with_browser.cc index 851b486c..009a74c 100644 --- a/chrome/browser/ash/file_manager/open_with_browser.cc +++ b/chrome/browser/ash/file_manager/open_with_browser.cc
@@ -13,7 +13,6 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/drive/drive_integration_service.h" #include "chrome/browser/ash/file_manager/file_tasks.h"
diff --git a/chrome/browser/ash/file_system_provider/fake_provided_file_system.cc b/chrome/browser/ash/file_system_provider/fake_provided_file_system.cc index 11390a0..def94ae3 100644 --- a/chrome/browser/ash/file_system_provider/fake_provided_file_system.cc +++ b/chrome/browser/ash/file_system_provider/fake_provided_file_system.cc
@@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/services/filesystem/public/mojom/types.mojom.h" #include "net/base/io_buffer.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.h b/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.h index f3c109f..1040352 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.h +++ b/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.h
@@ -11,6 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "net/base/completion_once_callback.h" #include "net/base/completion_repeating_callback.h" #include "storage/browser/file_system/file_stream_reader.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/get_metadata.cc b/chrome/browser/ash/file_system_provider/operations/get_metadata.cc index 9e4621c..fcbc5f1a 100644 --- a/chrome/browser/ash/file_system_provider/operations/get_metadata.cc +++ b/chrome/browser/ash/file_system_provider/operations/get_metadata.cc
@@ -12,6 +12,7 @@ #include <tuple> #include <utility> +#include "base/time/time.h" #include "chrome/common/extensions/api/file_system_provider.h" #include "chrome/common/extensions/api/file_system_provider_internal.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/get_metadata_unittest.cc b/chrome/browser/ash/file_system_provider/operations/get_metadata_unittest.cc index bba765c1..a94b3214 100644 --- a/chrome/browser/ash/file_system_provider/operations/get_metadata_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/get_metadata_unittest.cc
@@ -13,6 +13,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/json/json_reader.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h"
diff --git a/chrome/browser/ash/guest_os/guest_os_registry_service.cc b/chrome/browser/ash/guest_os/guest_os_registry_service.cc index ba11c9c..879c7b7 100644 --- a/chrome/browser/ash/guest_os/guest_os_registry_service.cc +++ b/chrome/browser/ash/guest_os/guest_os_registry_service.cc
@@ -15,7 +15,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/clock.h" #include "base/time/default_clock.h"
diff --git a/chrome/browser/ash/guest_os/guest_os_registry_service_icon_browsertest.cc b/chrome/browser/ash/guest_os/guest_os_registry_service_icon_browsertest.cc index 9be5827f..5cfcb73 100644 --- a/chrome/browser/ash/guest_os/guest_os_registry_service_icon_browsertest.cc +++ b/chrome/browser/ash/guest_os/guest_os_registry_service_icon_browsertest.cc
@@ -8,7 +8,6 @@ #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/ash/hats/hats_dialog.cc b/chrome/browser/ash/hats/hats_dialog.cc index dd9ef09..da7f247 100644 --- a/chrome/browser/ash/hats/hats_dialog.cc +++ b/chrome/browser/ash/hats/hats_dialog.cc
@@ -9,7 +9,6 @@ #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/hats/hats_config.h" #include "chrome/browser/ash/hats/hats_finch_helper.h"
diff --git a/chrome/browser/ash/hats/hats_notification_controller.cc b/chrome/browser/ash/hats/hats_notification_controller.cc index a7690a32..29e3f795 100644 --- a/chrome/browser/ash/hats/hats_notification_controller.cc +++ b/chrome/browser/ash/hats/hats_notification_controller.cc
@@ -11,7 +11,6 @@ #include "base/feature_list.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ash/hats/hats_config.h"
diff --git a/chrome/browser/ash/input_method/assistive_suggester.cc b/chrome/browser/ash/input_method/assistive_suggester.cc index 8d2cf83..69320d12 100644 --- a/chrome/browser/ash/input_method/assistive_suggester.cc +++ b/chrome/browser/ash/input_method/assistive_suggester.cc
@@ -181,8 +181,11 @@ AssistiveSuggester::~AssistiveSuggester() = default; bool AssistiveSuggester::IsAssistiveFeatureEnabled() { - return IsAssistPersonalInfoEnabled() || IsEmojiSuggestAdditionEnabled() || - IsMultiWordSuggestEnabled() || IsEnhancedEmojiSuggestEnabled(); + // TODO(b/222218270): Remove !IsLacrosEnabled() when assistive feature works + // on lacros. + return !IsLacrosEnabled() && + (IsAssistPersonalInfoEnabled() || IsEmojiSuggestAdditionEnabled() || + IsMultiWordSuggestEnabled() || IsEnhancedEmojiSuggestEnabled()); } bool AssistiveSuggester::IsAssistiveFeatureAllowed(
diff --git a/chrome/browser/ash/input_method/assistive_suggester_unittest.cc b/chrome/browser/ash/input_method/assistive_suggester_unittest.cc index 7befd13..4c1cbc3 100644 --- a/chrome/browser/ash/input_method/assistive_suggester_unittest.cc +++ b/chrome/browser/ash/input_method/assistive_suggester_unittest.cc
@@ -758,5 +758,15 @@ EXPECT_EQ(suggestion_handler_->GetSuggestionText(), u"←"); } +TEST_F(AssistiveSuggesterEmojiTest, ShouldNotSuggestWhenLacrosEnabled) { + feature_list_.Reset(); + feature_list_.InitAndEnableFeature(features::kLacrosSupport); + assistive_suggester_->OnActivate(kUsEnglishEngineId); + assistive_suggester_->OnFocus(5); + + assistive_suggester_->OnSurroundingTextChanged(u"arrow ", 6, 6); + + EXPECT_FALSE(suggestion_handler_->GetShowingSuggestion()); +} } // namespace input_method } // namespace ash
diff --git a/chrome/browser/ash/input_method/autocorrect_manager.h b/chrome/browser/ash/input_method/autocorrect_manager.h index 450d58e1..aee999b 100644 --- a/chrome/browser/ash/input_method/autocorrect_manager.h +++ b/chrome/browser/ash/input_method/autocorrect_manager.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/time/time.h" #include "chrome/browser/ash/input_method/assistive_window_controller.h" #include "chrome/browser/ash/input_method/diacritics_insensitive_string_comparator.h" #include "chrome/browser/ash/input_method/input_method_engine.h"
diff --git a/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.cc b/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.cc index 2a7bd10..0f7ced9b 100644 --- a/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.cc +++ b/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.cc
@@ -17,7 +17,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/ash/input_method/input_method_syncer.cc b/chrome/browser/ash/input_method/input_method_syncer.cc index 91a81d5c7..a77baee 100644 --- a/chrome/browser/ash/input_method/input_method_syncer.cc +++ b/chrome/browser/ash/input_method/input_method_syncer.cc
@@ -13,7 +13,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/logging.cc b/chrome/browser/ash/logging.cc index 95ec7fd..2663028 100644 --- a/chrome/browser/ash/logging.cc +++ b/chrome/browser/ash/logging.cc
@@ -11,7 +11,6 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h"
diff --git a/chrome/browser/ash/login/app_mode/kiosk_browsertest.cc b/chrome/browser/ash/login/app_mode/kiosk_browsertest.cc index 32a7b7f..916ceb23 100644 --- a/chrome/browser/ash/login/app_mode/kiosk_browsertest.cc +++ b/chrome/browser/ash/login/app_mode/kiosk_browsertest.cc
@@ -31,6 +31,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_chromeos_version_info.h" +#include "base/time/time.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h" #include "chrome/browser/ash/accessibility/speech_monitor.h" #include "chrome/browser/ash/app_mode/app_session_ash.h"
diff --git a/chrome/browser/ash/login/app_mode/kiosk_launch_controller.h b/chrome/browser/ash/login/app_mode/kiosk_launch_controller.h index b275522..9b2508c 100644 --- a/chrome/browser/ash/login/app_mode/kiosk_launch_controller.h +++ b/chrome/browser/ash/login/app_mode/kiosk_launch_controller.h
@@ -7,6 +7,7 @@ #include "base/observer_list.h" #include "base/observer_list_types.h" +#include "base/time/time.h" #include "chrome/browser/ash/app_mode/kiosk_app_launcher.h" #include "chrome/browser/ash/app_mode/kiosk_app_types.h" #include "chrome/browser/ash/app_mode/kiosk_profile_loader.h"
diff --git a/chrome/browser/ash/login/app_mode/web_kiosk_browsertest.cc b/chrome/browser/ash/login/app_mode/web_kiosk_browsertest.cc index b929b61..b8b79e3f 100644 --- a/chrome/browser/ash/login/app_mode/web_kiosk_browsertest.cc +++ b/chrome/browser/ash/login/app_mode/web_kiosk_browsertest.cc
@@ -7,6 +7,7 @@ #include "ash/public/cpp/shelf_config.h" #include "ash/public/cpp/shelf_test_api.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_manager.h" #include "chrome/browser/ash/login/app_mode/kiosk_launch_controller.h" #include "chrome/browser/ash/login/test/device_state_mixin.h"
diff --git a/chrome/browser/ash/login/challenge_response_auth_keys_loader.h b/chrome/browser/ash/login/challenge_response_auth_keys_loader.h index 6fa2d8d8..59bc1d0 100644 --- a/chrome/browser/ash/login/challenge_response_auth_keys_loader.h +++ b/chrome/browser/ash/login/challenge_response_auth_keys_loader.h
@@ -11,6 +11,7 @@ #include "ash/components/login/auth/challenge_response_key.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_observer.h" #include "net/ssl/client_cert_identity.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.cc b/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.cc index 4d562e2..06313bc0 100644 --- a/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.cc +++ b/chrome/browser/ash/login/demo_mode/demo_extensions_external_loader.cc
@@ -11,7 +11,6 @@ #include "base/json/json_reader.h" #include "base/location.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_mode_detector_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_mode_detector_unittest.cc index 126ef85..8b0fd8c 100644 --- a/chrome/browser/ash/login/demo_mode/demo_mode_detector_unittest.cc +++ b/chrome/browser/ash/login/demo_mode/demo_mode_detector_unittest.cc
@@ -13,6 +13,7 @@ #include "base/test/scoped_command_line.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/ash/login/ui/mock_login_display_host.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.cc b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.cc index 51715b7..e232c14 100644 --- a/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.cc +++ b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.cc
@@ -14,7 +14,6 @@ #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/default_tick_clock.h" #include "base/time/tick_clock.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_session.cc b/chrome/browser/ash/login/demo_mode/demo_session.cc index c88e4371..f3904ed 100644 --- a/chrome/browser/ash/login/demo_mode/demo_session.cc +++ b/chrome/browser/ash/login/demo_mode/demo_session.cc
@@ -21,7 +21,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/timer/timer.h" #include "chrome/browser/apps/app_service/app_launch_params.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc b/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc index abb5d1c7..b0da8d8 100644 --- a/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc +++ b/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc
@@ -18,7 +18,6 @@ #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_setup_controller.h b/chrome/browser/ash/login/demo_mode/demo_setup_controller.h index 92f6ca0..a9f0d03 100644 --- a/chrome/browser/ash/login/demo_mode/demo_setup_controller.h +++ b/chrome/browser/ash/login/demo_mode/demo_setup_controller.h
@@ -10,6 +10,7 @@ #include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/ash/login/demo_mode/demo_session.h" #include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h" #include "chrome/browser/component_updater/cros_component_installer_chromeos.h"
diff --git a/chrome/browser/ash/login/error_screen_browsertest.cc b/chrome/browser/ash/login/error_screen_browsertest.cc index 6628794..4dce2d6 100644 --- a/chrome/browser/ash/login/error_screen_browsertest.cc +++ b/chrome/browser/ash/login/error_screen_browsertest.cc
@@ -7,6 +7,7 @@ #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/test/bind.h" +#include "base/time/time.h" #include "chrome/browser/ash/login/app_mode/kiosk_launch_controller.h" #include "chrome/browser/ash/login/login_wizard.h" #include "chrome/browser/ash/login/screens/error_screen.h"
diff --git a/chrome/browser/ash/login/eula_browsertest.cc b/chrome/browser/ash/login/eula_browsertest.cc index 47cd16b..e5687f8 100644 --- a/chrome/browser/ash/login/eula_browsertest.cc +++ b/chrome/browser/ash/login/eula_browsertest.cc
@@ -13,7 +13,6 @@ #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/login/helper.cc b/chrome/browser/ash/login/helper.cc index 11dbdc3..7d4c5ed 100644 --- a/chrome/browser/ash/login/helper.cc +++ b/chrome/browser/ash/login/helper.cc
@@ -12,7 +12,6 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/time/default_clock.h" #include "chrome/browser/ash/login/signin_partition_manager.h" #include "chrome/browser/ash/login/ui/login_display_host.h"
diff --git a/chrome/browser/ash/login/login_utils_browsertest.cc b/chrome/browser/ash/login/login_utils_browsertest.cc index cdd7e65..e349abb 100644 --- a/chrome/browser/ash/login/login_utils_browsertest.cc +++ b/chrome/browser/ash/login/login_utils_browsertest.cc
@@ -19,7 +19,6 @@ #include "rlz/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_RLZ) -#include "base/task/post_task.h" #include "components/rlz/rlz_tracker.h" #endif
diff --git a/chrome/browser/ash/login/saml/in_session_password_sync_manager_unittest.cc b/chrome/browser/ash/login/saml/in_session_password_sync_manager_unittest.cc index a89f8dd9..8381288 100644 --- a/chrome/browser/ash/login/saml/in_session_password_sync_manager_unittest.cc +++ b/chrome/browser/ash/login/saml/in_session_password_sync_manager_unittest.cc
@@ -9,6 +9,7 @@ #include "ash/constants/ash_features.h" #include "base/test/scoped_feature_list.h" #include "base/time/default_clock.h" +#include "base/time/time.h" #include "chrome/browser/ash/login/login_pref_names.h" #include "chrome/browser/ash/login/saml/mock_lock_handler.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/ash/login/saml/password_expiry_notification.cc b/chrome/browser/ash/login/saml/password_expiry_notification.cc index a1b997ef..d80aaf94 100644 --- a/chrome/browser/ash/login/saml/password_expiry_notification.cc +++ b/chrome/browser/ash/login/saml/password_expiry_notification.cc
@@ -15,7 +15,6 @@ #include "base/bind.h" #include "base/no_destructor.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/time/time.h" #include "chrome/browser/ash/login/saml/in_session_password_change_manager.h"
diff --git a/chrome/browser/ash/login/saml/password_sync_token_login_checker.cc b/chrome/browser/ash/login/saml/password_sync_token_login_checker.cc index 85dda622..8cf4e9d 100644 --- a/chrome/browser/ash/login/saml/password_sync_token_login_checker.cc +++ b/chrome/browser/ash/login/saml/password_sync_token_login_checker.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/ash/login/saml/password_sync_token_login_checker.h" -#include "base/task/post_task.h" #include "chrome/browser/ash/login/existing_user_controller.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/system_network_context_manager.h"
diff --git a/chrome/browser/ash/login/saml/password_sync_token_verifier.cc b/chrome/browser/ash/login/saml/password_sync_token_verifier.cc index 8706a8c1f..33d7e6e 100644 --- a/chrome/browser/ash/login/saml/password_sync_token_verifier.cc +++ b/chrome/browser/ash/login/saml/password_sync_token_verifier.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/ash/login/saml/password_sync_token_verifier.h" -#include "base/task/post_task.h" #include "chrome/browser/ash/login/login_pref_names.h" #include "chrome/browser/ash/login/saml/in_session_password_sync_manager.h" #include "chrome/browser/ash/login/saml/in_session_password_sync_manager_factory.h"
diff --git a/chrome/browser/ash/login/saml/saml_browsertest.cc b/chrome/browser/ash/login/saml/saml_browsertest.cc index d1af97b..f0c9976c 100644 --- a/chrome/browser/ash/login/saml/saml_browsertest.cc +++ b/chrome/browser/ash/login/saml/saml_browsertest.cc
@@ -25,7 +25,6 @@ #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ash/login/saml/security_token_saml_test.cc b/chrome/browser/ash/login/saml/security_token_saml_test.cc index 0f0f70f..fd2fdff 100644 --- a/chrome/browser/ash/login/saml/security_token_saml_test.cc +++ b/chrome/browser/ash/login/saml/security_token_saml_test.cc
@@ -13,7 +13,6 @@ #include "base/command_line.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/values.h" #include "chrome/browser/ash/certificate_provider/test_certificate_provider_extension.h" #include "chrome/browser/ash/login/saml/test_client_cert_saml_idp_mixin.h"
diff --git a/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector_unittest.cc b/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector_unittest.cc index fa35a04..94999c6 100644 --- a/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector_unittest.cc +++ b/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector_unittest.cc
@@ -8,6 +8,7 @@ #include "base/test/scoped_command_line.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "chromeos/dbus/constants/dbus_switches.h" #include "testing/gmock/include/gmock/gmock.h" #include "ui/base/user_activity/user_activity_detector.h"
diff --git a/chrome/browser/ash/login/screens/encryption_migration_screen.cc b/chrome/browser/ash/login/screens/encryption_migration_screen.cc index d6cc90c..9d0874c 100644 --- a/chrome/browser/ash/login/screens/encryption_migration_screen.cc +++ b/chrome/browser/ash/login/screens/encryption_migration_screen.cc
@@ -19,7 +19,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc index 7a2a45dc..e16884b 100644 --- a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc +++ b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.cc
@@ -14,7 +14,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_delegate.h"
diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h index c95b996..d5ddc92 100644 --- a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h +++ b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h
@@ -13,6 +13,7 @@ #include "ash/public/mojom/cros_display_config.mojom.h" #include "base/callback.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/login/screens/recommend_apps/device_configuration.pb.h" #include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h"
diff --git a/chrome/browser/ash/login/screens/reset_screen.cc b/chrome/browser/ash/login/screens/reset_screen.cc index 4592704..4b97168 100644 --- a/chrome/browser/ash/login/screens/reset_screen.cc +++ b/chrome/browser/ash/login/screens/reset_screen.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/values.h" #include "build/branding_buildflags.h" #include "chrome/browser/ash/login/screens/error_screen.h"
diff --git a/chrome/browser/ash/login/screens/sync_consent_screen.h b/chrome/browser/ash/login/screens/sync_consent_screen.h index ce0ee1db..55c7cbd 100644 --- a/chrome/browser/ash/login/screens/sync_consent_screen.h +++ b/chrome/browser/ash/login/screens/sync_consent_screen.h
@@ -10,6 +10,7 @@ #include "base/auto_reset.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/login/screens/base_screen.h" // TODO(https://crbug.com/1164001): move to forward declaration.
diff --git a/chrome/browser/ash/login/screens/update_required_screen.h b/chrome/browser/ash/login/screens/update_required_screen.h index 8d92040..5bb1f54b 100644 --- a/chrome/browser/ash/login/screens/update_required_screen.h +++ b/chrome/browser/ash/login/screens/update_required_screen.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" // TODO(https://crbug.com/1164001): move to forward declaration. #include "chrome/browser/ash/login/error_screens_histogram_helper.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/update_screen.h b/chrome/browser/ash/login/screens/update_screen.h index c7b130c..72b502a 100644 --- a/chrome/browser/ash/login/screens/update_screen.h +++ b/chrome/browser/ash/login/screens/update_screen.h
@@ -12,6 +12,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h" // TODO(https://crbug.com/1164001): move to forward declaration.
diff --git a/chrome/browser/ash/login/security_token_login_browsertest.cc b/chrome/browser/ash/login/security_token_login_browsertest.cc index f794d84..9b950087 100644 --- a/chrome/browser/ash/login/security_token_login_browsertest.cc +++ b/chrome/browser/ash/login/security_token_login_browsertest.cc
@@ -20,7 +20,6 @@ #include "base/containers/span.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/security_token_session_controller.h b/chrome/browser/ash/login/security_token_session_controller.h index b4ca3a07..4d9b4197 100644 --- a/chrome/browser/ash/login/security_token_session_controller.h +++ b/chrome/browser/ash/login/security_token_session_controller.h
@@ -11,6 +11,7 @@ #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/certificate_provider/certificate_provider_service.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ash/login/session/user_session_initializer.cc b/chrome/browser/ash/login/session/user_session_initializer.cc index 459619a5..2badafea 100644 --- a/chrome/browser/ash/login/session/user_session_initializer.cc +++ b/chrome/browser/ash/login/session/user_session_initializer.cc
@@ -13,7 +13,6 @@ #include "base/path_service.h" #include "base/system/sys_info.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/ash/login/session/user_session_manager.cc b/chrome/browser/ash/login/session/user_session_manager.cc index 631945eb..122b661a 100644 --- a/chrome/browser/ash/login/session/user_session_manager.cc +++ b/chrome/browser/ash/login/session/user_session_manager.cc
@@ -38,7 +38,6 @@ #include "base/scoped_observation.h" #include "base/strings/string_number_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/login/startup_utils.cc b/chrome/browser/ash/login/startup_utils.cc index ebd4c3ba..52895f2 100644 --- a/chrome/browser/ash/login/startup_utils.cc +++ b/chrome/browser/ash/login/startup_utils.cc
@@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host_webui.h b/chrome/browser/ash/login/ui/login_display_host_webui.h index 6a39bb9..3869a9c5 100644 --- a/chrome/browser/ash/login/ui/login_display_host_webui.h +++ b/chrome/browser/ash/login/ui/login_display_host_webui.h
@@ -15,6 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "base/timer/timer.h" #include "chrome/browser/ash/login/existing_user_controller.h"
diff --git a/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc index e68c773..14635e7 100644 --- a/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc +++ b/chrome/browser/ash/login/users/avatar/user_image_manager_impl.cc
@@ -17,7 +17,6 @@ #include "base/metrics/histogram_functions.h" #include "base/path_service.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc index 725a4c1f4..bce294a 100644 --- a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc +++ b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
@@ -36,7 +36,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ash/login/version_info_updater.cc b/chrome/browser/ash/login/version_info_updater.cc index 7e5220c..e1177451 100644 --- a/chrome/browser/ash/login/version_info_updater.cc +++ b/chrome/browser/ash/login/version_info_updater.cc
@@ -14,7 +14,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h" #include "chrome/browser/ash/settings/cros_settings.h"
diff --git a/chrome/browser/ash/mobile/mobile_activator.h b/chrome/browser/ash/mobile/mobile_activator.h index 0650da8..174e49d 100644 --- a/chrome/browser/ash/mobile/mobile_activator.h +++ b/chrome/browser/ash/mobile/mobile_activator.h
@@ -12,6 +12,7 @@ #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromeos/network/network_handler_callbacks.h" // TODO(https://crbug.com/1164001): restore network_state.h as forward
diff --git a/chrome/browser/ash/net/client_cert_store_ash.cc b/chrome/browser/ash/net/client_cert_store_ash.cc index e87e04b..3d890291 100644 --- a/chrome/browser/ash/net/client_cert_store_ash.cc +++ b/chrome/browser/ash/net/client_cert_store_ash.cc
@@ -13,7 +13,6 @@ #include "base/callback.h" #include "base/callback_helpers.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "chrome/browser/ash/certificate_provider/certificate_provider.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h index 2c9f9264..c69e0cc 100644 --- a/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h
@@ -8,6 +8,7 @@ #include <vector> #include "base/callback.h" +#include "base/time/time.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/ash/net/traffic_counters_handler.cc b/chrome/browser/ash/net/traffic_counters_handler.cc index c811bf0..7450eb5 100644 --- a/chrome/browser/ash/net/traffic_counters_handler.cc +++ b/chrome/browser/ash/net/traffic_counters_handler.cc
@@ -8,6 +8,7 @@ #include <string> #include "ash/public/cpp/network_config_service.h" +#include "base/time/time.h" #include "base/values.h" #include "chromeos/network/network_event_log.h" #include "chromeos/network/network_handler.h"
diff --git a/chrome/browser/ash/net/traffic_counters_handler_unittest.cc b/chrome/browser/ash/net/traffic_counters_handler_unittest.cc index 4bbe879..30fca03 100644 --- a/chrome/browser/ash/net/traffic_counters_handler_unittest.cc +++ b/chrome/browser/ash/net/traffic_counters_handler_unittest.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/test/task_environment.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "chrome/browser/ash/net/traffic_counters_handler.h" #include "chromeos/login/login_state/login_state.h" #include "chromeos/network/managed_network_configuration_handler.h"
diff --git a/chrome/browser/ash/night_light/night_light_client_unittest.cc b/chrome/browser/ash/night_light/night_light_client_unittest.cc index 683447a..4a36b72 100644 --- a/chrome/browser/ash/night_light/night_light_client_unittest.cc +++ b/chrome/browser/ash/night_light/night_light_client_unittest.cc
@@ -10,6 +10,7 @@ #include "base/test/task_environment.h" #include "base/time/clock.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/notifications/gnubby_notification.cc b/chrome/browser/ash/notifications/gnubby_notification.cc index 07acdeda..85d96e7 100644 --- a/chrome/browser/ash/notifications/gnubby_notification.cc +++ b/chrome/browser/ash/notifications/gnubby_notification.cc
@@ -8,7 +8,6 @@ #include "ash/public/cpp/notification_utils.h" #include "base/location.h" -#include "base/task/post_task.h" #include "chrome/browser/notifications/notification_display_service.h" #include "chrome/browser/notifications/system_notification_helper.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ash/ownership/owner_settings_service_ash.cc b/chrome/browser/ash/ownership/owner_settings_service_ash.cc index 11765cf..1b2082c 100644 --- a/chrome/browser/ash/ownership/owner_settings_service_ash.cc +++ b/chrome/browser/ash/ownership/owner_settings_service_ash.cc
@@ -22,7 +22,6 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_checker.h" #include "chrome/browser/ash/login/session/user_session_manager.h"
diff --git a/chrome/browser/ash/phonehub/browser_tabs_metadata_fetcher_impl.cc b/chrome/browser/ash/phonehub/browser_tabs_metadata_fetcher_impl.cc index 963e8d00..5dbbd4b 100644 --- a/chrome/browser/ash/phonehub/browser_tabs_metadata_fetcher_impl.cc +++ b/chrome/browser/ash/phonehub/browser_tabs_metadata_fetcher_impl.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ash/phonehub/browser_tabs_metadata_fetcher_impl.h" #include "base/barrier_closure.h" +#include "base/time/time.h" #include "components/favicon/core/history_ui_favicon_request_handler.h" #include "components/favicon_base/favicon_types.h" #include "components/sync_sessions/synced_session.h"
diff --git a/chrome/browser/ash/platform_keys/platform_keys_service.cc b/chrome/browser/ash/platform_keys/platform_keys_service.cc index 64e8f82..6e2a0f1b 100644 --- a/chrome/browser/ash/platform_keys/platform_keys_service.cc +++ b/chrome/browser/ash/platform_keys/platform_keys_service.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_thread.h" #include "net/base/net_errors.h"
diff --git a/chrome/browser/ash/platform_keys/platform_keys_service_browsertest.cc b/chrome/browser/ash/platform_keys/platform_keys_service_browsertest.cc index b9527b37..9cf7be38 100644 --- a/chrome/browser/ash/platform_keys/platform_keys_service_browsertest.cc +++ b/chrome/browser/ash/platform_keys/platform_keys_service_browsertest.cc
@@ -22,7 +22,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/ash/login/test/device_state_mixin.h" #include "chrome/browser/ash/login/test/login_manager_mixin.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_drive_image_download_service.cc b/chrome/browser/ash/plugin_vm/plugin_vm_drive_image_download_service.cc index 7fc1ad6..c9d16c7 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_drive_image_download_service.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_drive_image_download_service.cc
@@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_installer.h b/chrome/browser/ash/plugin_vm/plugin_vm_installer.h index 08f4460..2bb3509 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_installer.h +++ b/chrome/browser/ash/plugin_vm/plugin_vm_installer.h
@@ -9,6 +9,7 @@ #include <string> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_license_checker.h" #include "chromeos/dbus/concierge/concierge_client.h" #include "chromeos/dbus/concierge/concierge_service.pb.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc index 61a0736..f6704de0 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc
@@ -13,7 +13,6 @@ #include "base/observer_list.h" #include "base/strings/pattern.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_drive_image_download_service.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_features.h"
diff --git a/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc b/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc index 276dcbe..67f6c16 100644 --- a/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc +++ b/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc
@@ -25,7 +25,6 @@ #include "base/notreached.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_service.cc b/chrome/browser/ash/policy/core/device_local_account_policy_service.cc index a0c08b4..9b19459 100644 --- a/chrome/browser/ash/policy/core/device_local_account_policy_service.cc +++ b/chrome/browser/ash/policy/core/device_local_account_policy_service.cc
@@ -19,7 +19,6 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/policy/core/dm_token_storage.cc b/chrome/browser/ash/policy/core/dm_token_storage.cc index a6fab383..09d050a6 100644 --- a/chrome/browser/ash/policy/core/dm_token_storage.cc +++ b/chrome/browser/ash/policy/core/dm_token_storage.cc
@@ -7,7 +7,6 @@ #include "ash/components/cryptohome/system_salt_getter.h" #include "base/bind.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/settings/token_encryptor.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ash/policy/core/user_policy_manager_builder_ash.cc b/chrome/browser/ash/policy/core/user_policy_manager_builder_ash.cc index 7928146..2a1c753 100644 --- a/chrome/browser/ash/policy/core/user_policy_manager_builder_ash.cc +++ b/chrome/browser/ash/policy/core/user_policy_manager_builder_ash.cc
@@ -16,7 +16,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ash/policy/enrollment/enrollment_handler.cc b/chrome/browser/ash/policy/enrollment/enrollment_handler.cc index 5647de1..f8b36d9 100644 --- a/chrome/browser/ash/policy/enrollment/enrollment_handler.cc +++ b/chrome/browser/ash/policy/enrollment/enrollment_handler.cc
@@ -16,7 +16,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl_unittest.cc b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl_unittest.cc index 8911629..1ea1739 100644 --- a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl_unittest.cc +++ b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl_unittest.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h" #include "chrome/browser/device_identity/device_oauth2_token_service_factory.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_run_routine_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_run_routine_job.cc index aa2e246..3e0ba886 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_run_routine_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_run_routine_job.cc
@@ -16,6 +16,7 @@ #include "base/numerics/safe_conversions.h" #include "base/syslog_logging.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/values.h" #include "chromeos/services/cros_healthd/public/cpp/service_connection.h" #include "components/policy/proto/device_management_backend.pb.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job_unittest.cc b/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job_unittest.cc index 595298e..0bd8ca6 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job_unittest.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job_unittest.cc
@@ -12,6 +12,7 @@ #include "base/json/json_writer.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/test/base/chrome_ash_test_base.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/policy/reporting/arc_app_install_event_log_manager.cc b/chrome/browser/ash/policy/reporting/arc_app_install_event_log_manager.cc index 6004b4bbf..f2cb5d4 100644 --- a/chrome/browser/ash/policy/reporting/arc_app_install_event_log_manager.cc +++ b/chrome/browser/ash/policy/reporting/arc_app_install_event_log_manager.cc
@@ -8,7 +8,6 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/policy/reporting/arc_app_install_event_logger.cc b/chrome/browser/ash/policy/reporting/arc_app_install_event_logger.cc index 8c8fecc..2bbdc023 100644 --- a/chrome/browser/ash/policy/reporting/arc_app_install_event_logger.cc +++ b/chrome/browser/ash/policy/reporting/arc_app_install_event_logger.cc
@@ -13,7 +13,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/policy/reporting/extension_install_event_log_manager.cc b/chrome/browser/ash/policy/reporting/extension_install_event_log_manager.cc index 35907a9..2dafb7686 100644 --- a/chrome/browser/ash/policy/reporting/extension_install_event_log_manager.cc +++ b/chrome/browser/ash/policy/reporting/extension_install_event_log_manager.cc
@@ -6,7 +6,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/policy/reporting/install_event_log_manager.cc b/chrome/browser/ash/policy/reporting/install_event_log_manager.cc index 9ef4f4e..0e4eb33 100644 --- a/chrome/browser/ash/policy/reporting/install_event_log_manager.cc +++ b/chrome/browser/ash/policy/reporting/install_event_log_manager.cc
@@ -10,7 +10,6 @@ #include "base/check_op.h" #include "base/command_line.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc b/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc index 3bc980b..e57c681 100644 --- a/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc +++ b/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc
@@ -7,7 +7,6 @@ #include "base/base64.h" #include "base/bind.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/time/default_clock.h" #include "chrome/browser/ash/policy/core/device_cloud_policy_store_ash.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h index 692b763c..b9315ec2 100644 --- a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h +++ b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h
@@ -8,6 +8,7 @@ #include <memory> #include "ash/components/settings/timezone_settings.h" +#include "base/time/time.h" #include "chrome/browser/ash/policy/scheduled_task_handler/reboot_notifications_scheduler.h" #include "chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor.h" #include "chrome/browser/ash/policy/scheduled_task_handler/scoped_wake_lock.h"
diff --git a/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader_unittest.cc b/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader_unittest.cc index a25429d..78a45a6 100644 --- a/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader_unittest.cc +++ b/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader_unittest.cc
@@ -10,9 +10,9 @@ #include "ash/components/attestation/mock_attestation_flow.h" #include "base/bind.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.h" #include "chrome/browser/ash/policy/core/dm_token_storage.h" #include "chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h"
diff --git a/chrome/browser/ash/policy/status_collector/activity_storage_unittest.cc b/chrome/browser/ash/policy/status_collector/activity_storage_unittest.cc index 17f2a45..8dc9767 100644 --- a/chrome/browser/ash/policy/status_collector/activity_storage_unittest.cc +++ b/chrome/browser/ash/policy/status_collector/activity_storage_unittest.cc
@@ -6,6 +6,7 @@ #include <memory> +#include "base/time/time.h" #include "components/policy/proto/device_management_backend.pb.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/testing_pref_service.h"
diff --git a/chrome/browser/ash/policy/status_collector/app_info_generator.h b/chrome/browser/ash/policy/status_collector/app_info_generator.h index 21641b3..1c5723f 100644 --- a/chrome/browser/ash/policy/status_collector/app_info_generator.h +++ b/chrome/browser/ash/policy/status_collector/app_info_generator.h
@@ -11,6 +11,7 @@ #include <vector> #include "base/time/default_clock.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "chrome/browser/apps/app_service/app_service_proxy_forward.h" #include "chrome/browser/ash/policy/status_collector/activity_storage.h"
diff --git a/chrome/browser/ash/policy/status_collector/app_info_generator_unittest.cc b/chrome/browser/ash/policy/status_collector/app_info_generator_unittest.cc index c716895c..7b409fd2 100644 --- a/chrome/browser/ash/policy/status_collector/app_info_generator_unittest.cc +++ b/chrome/browser/ash/policy/status_collector/app_info_generator_unittest.cc
@@ -8,6 +8,7 @@ #include "base/test/bind.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
diff --git a/chrome/browser/ash/policy/status_collector/child_status_collector.cc b/chrome/browser/ash/policy/status_collector/child_status_collector.cc index 01cad22f..f931cf1 100644 --- a/chrome/browser/ash/policy/status_collector/child_status_collector.cc +++ b/chrome/browser/ash/policy/status_collector/child_status_collector.cc
@@ -29,7 +29,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/values.h"
diff --git a/chrome/browser/ash/policy/status_collector/device_status_collector.cc b/chrome/browser/ash/policy/status_collector/device_status_collector.cc index c3fb330..f3c8ba88 100644 --- a/chrome/browser/ash/policy/status_collector/device_status_collector.cc +++ b/chrome/browser/ash/policy/status_collector/device_status_collector.cc
@@ -39,7 +39,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc b/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc index e86661e..40573bb 100644 --- a/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc +++ b/chrome/browser/ash/policy/status_collector/device_status_collector_browsertest.cc
@@ -38,6 +38,7 @@ #include "base/test/scoped_path_override.h" #include "base/test/simple_test_clock.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/apps/app_service/publisher_host.h"
diff --git a/chrome/browser/ash/policy/status_collector/enterprise_activity_storage_unittest.cc b/chrome/browser/ash/policy/status_collector/enterprise_activity_storage_unittest.cc index a084c37..a18c755 100644 --- a/chrome/browser/ash/policy/status_collector/enterprise_activity_storage_unittest.cc +++ b/chrome/browser/ash/policy/status_collector/enterprise_activity_storage_unittest.cc
@@ -6,6 +6,7 @@ #include <memory> +#include "base/time/time.h" #include "components/policy/proto/device_management_backend.pb.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/testing_pref_service.h"
diff --git a/chrome/browser/ash/policy/status_collector/legacy_device_status_collector.cc b/chrome/browser/ash/policy/status_collector/legacy_device_status_collector.cc index 932230e3..dcf4768c 100644 --- a/chrome/browser/ash/policy/status_collector/legacy_device_status_collector.cc +++ b/chrome/browser/ash/policy/status_collector/legacy_device_status_collector.cc
@@ -38,7 +38,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/policy/status_collector/legacy_device_status_collector_browsertest.cc b/chrome/browser/ash/policy/status_collector/legacy_device_status_collector_browsertest.cc index fcd599a..0930d493 100644 --- a/chrome/browser/ash/policy/status_collector/legacy_device_status_collector_browsertest.cc +++ b/chrome/browser/ash/policy/status_collector/legacy_device_status_collector_browsertest.cc
@@ -36,6 +36,7 @@ #include "base/test/scoped_path_override.h" #include "base/test/simple_test_clock.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/apps/app_service/publisher_host.h"
diff --git a/chrome/browser/ash/policy/status_collector/managed_session_service_unittest.cc b/chrome/browser/ash/policy/status_collector/managed_session_service_unittest.cc index e344dfa..62cb7b3 100644 --- a/chrome/browser/ash/policy/status_collector/managed_session_service_unittest.cc +++ b/chrome/browser/ash/policy/status_collector/managed_session_service_unittest.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ash/policy/status_collector/managed_session_service.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "chrome/browser/ash/login/users/chrome_user_manager.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/ash/login/users/mock_user_manager.h"
diff --git a/chrome/browser/ash/policy/status_collector/status_collector_state.cc b/chrome/browser/ash/policy/status_collector/status_collector_state.cc index 84aa9d6..3f66747 100644 --- a/chrome/browser/ash/policy/status_collector/status_collector_state.cc +++ b/chrome/browser/ash/policy/status_collector/status_collector_state.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" namespace policy {
diff --git a/chrome/browser/ash/policy/uploading/heartbeat_scheduler_unittest.cc b/chrome/browser/ash/policy/uploading/heartbeat_scheduler_unittest.cc index 888e2bb..bb8dde3 100644 --- a/chrome/browser/ash/policy/uploading/heartbeat_scheduler_unittest.cc +++ b/chrome/browser/ash/policy/uploading/heartbeat_scheduler_unittest.cc
@@ -12,6 +12,7 @@ #include "base/strings/string_number_conversions.h" #include "base/test/gmock_move_support.h" #include "base/test/test_simple_task_runner.h" +#include "base/time/time.h" #include "chrome/browser/ash/settings/scoped_testing_cros_settings.h" #include "chrome/browser/ash/settings/stub_cros_settings_provider.h" #include "components/gcm_driver/common/gcm_message.h"
diff --git a/chrome/browser/ash/policy/uploading/system_log_uploader.cc b/chrome/browser/ash/policy/uploading/system_log_uploader.cc index 1fe40db..91337f9 100644 --- a/chrome/browser/ash/policy/uploading/system_log_uploader.cc +++ b/chrome/browser/ash/policy/uploading/system_log_uploader.cc
@@ -19,7 +19,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/syslog_logging.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/ash/power/auto_screen_brightness/als_file_reader.cc b/chrome/browser/ash/power/auto_screen_brightness/als_file_reader.cc index 08f4365a..c180dd2 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/als_file_reader.cc +++ b/chrome/browser/ash/power/auto_screen_brightness/als_file_reader.cc
@@ -13,7 +13,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" +#include "base/time/time.h" #include "chrome/browser/ash/power/auto_screen_brightness/utils.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/power/auto_screen_brightness/als_reader.cc b/chrome/browser/ash/power/auto_screen_brightness/als_reader.cc index 2ebd7871..13b487f1 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/als_reader.cc +++ b/chrome/browser/ash/power/auto_screen_brightness/als_reader.cc
@@ -13,7 +13,6 @@ #include "base/process/launch.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chromeos/components/sensors/buildflags.h" #if BUILDFLAG(USE_IIOSERVICE)
diff --git a/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.cc b/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.cc index 8666e75..b6ad72d 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.cc +++ b/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.cc
@@ -14,7 +14,6 @@ #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "chrome/browser/ash/power/auto_screen_brightness/utils.h" #include "chromeos/dbus/power/power_manager_client.h" #include "chromeos/dbus/power_manager/backlight.pb.h"
diff --git a/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.h b/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.h index cefd542..dae0218 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.h +++ b/chrome/browser/ash/power/auto_screen_brightness/brightness_monitor_impl.h
@@ -11,6 +11,7 @@ #include "base/scoped_observation.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/power/auto_screen_brightness/brightness_monitor.h" #include "chromeos/dbus/power/power_manager_client.h"
diff --git a/chrome/browser/ash/power/auto_screen_brightness/controller.cc b/chrome/browser/ash/power/auto_screen_brightness/controller.cc index 70b095b..8a110764 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/controller.cc +++ b/chrome/browser/ash/power/auto_screen_brightness/controller.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/ash/power/auto_screen_brightness/controller.h" -#include "base/task/post_task.h" #include "base/time/default_tick_clock.h" #include "chrome/browser/ash/power/auto_screen_brightness/adapter.h" #include "chrome/browser/ash/power/auto_screen_brightness/als_reader.h"
diff --git a/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl.cc b/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl.cc index 1b7a4f01..2849e2a 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl.cc +++ b/chrome/browser/ash/power/auto_screen_brightness/model_config_loader_impl.cc
@@ -17,7 +17,6 @@ #include "base/metrics/field_trial_params.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/ash/power/auto_screen_brightness/modeller_impl.cc b/chrome/browser/ash/power/auto_screen_brightness/modeller_impl.cc index a72e3e2b..942cae9 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/modeller_impl.cc +++ b/chrome/browser/ash/power/auto_screen_brightness/modeller_impl.cc
@@ -19,7 +19,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/default_tick_clock.h"
diff --git a/chrome/browser/ash/power/cpu_data_collector.cc b/chrome/browser/ash/power/cpu_data_collector.cc index d6435c97..1f5263c8 100644 --- a/chrome/browser/ash/power/cpu_data_collector.cc +++ b/chrome/browser/ash/power/cpu_data_collector.cc
@@ -15,7 +15,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/power/power_data_collector.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/power/cpu_data_collector_unittest.cc b/chrome/browser/ash/power/cpu_data_collector_unittest.cc index c9d9a2c1..b45800e0 100644 --- a/chrome/browser/ash/power/cpu_data_collector_unittest.cc +++ b/chrome/browser/ash/power/cpu_data_collector_unittest.cc
@@ -8,10 +8,10 @@ #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/time/time.h" #include "chrome/browser/ash/power/cpu_data_collector.h" #include "testing/gtest/include/gtest/gtest.h" - namespace ash { namespace {
diff --git a/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.cc b/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.cc index 2bff03c..91e52d8a 100644 --- a/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.cc +++ b/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.cc
@@ -10,7 +10,6 @@ #include "ash/constants/ash_pref_names.h" #include "base/bind.h" #include "base/process/launch.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h"
diff --git a/chrome/browser/ash/power/ml/idle_event_notifier_unittest.cc b/chrome/browser/ash/power/ml/idle_event_notifier_unittest.cc index 58cf7b4..4a4659d 100644 --- a/chrome/browser/ash/power/ml/idle_event_notifier_unittest.cc +++ b/chrome/browser/ash/power/ml/idle_event_notifier_unittest.cc
@@ -8,6 +8,7 @@ #include "base/test/task_environment.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "chromeos/dbus/power/fake_power_manager_client.h" #include "chromeos/dbus/power_manager/idle.pb.h" #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
diff --git a/chrome/browser/ash/power/process_data_collector.cc b/chrome/browser/ash/power/process_data_collector.cc index 71ac2b5..4a12455 100644 --- a/chrome/browser/ash/power/process_data_collector.cc +++ b/chrome/browser/ash/power/process_data_collector.cc
@@ -31,7 +31,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/platform_thread.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/ash/power/process_data_collector.h b/chrome/browser/ash/power/process_data_collector.h index cf3363b..6f57bb2 100644 --- a/chrome/browser/ash/power/process_data_collector.h +++ b/chrome/browser/ash/power/process_data_collector.h
@@ -22,6 +22,7 @@ #include "base/sequence_checker.h" #include "base/synchronization/lock.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromeos/dbus/power/power_manager_client.h"
diff --git a/chrome/browser/ash/power/process_data_collector_unittest.cc b/chrome/browser/ash/power/process_data_collector_unittest.cc index c54443e7..49a3d08 100644 --- a/chrome/browser/ash/power/process_data_collector_unittest.cc +++ b/chrome/browser/ash/power/process_data_collector_unittest.cc
@@ -23,7 +23,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/task_environment.h" #include "base/threading/platform_thread.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/power/smart_charging/smart_charging_manager.cc b/chrome/browser/ash/power/smart_charging/smart_charging_manager.cc index 9b9b2c5..7753ad0 100644 --- a/chrome/browser/ash/power/smart_charging/smart_charging_manager.cc +++ b/chrome/browser/ash/power/smart_charging/smart_charging_manager.cc
@@ -12,7 +12,6 @@ #include "base/files/important_file_writer.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/printing/bulk_printers_calculator.cc b/chrome/browser/ash/printing/bulk_printers_calculator.cc index b482b38..702883b 100644 --- a/chrome/browser/ash/printing/bulk_printers_calculator.cc +++ b/chrome/browser/ash/printing/bulk_printers_calculator.cc
@@ -15,7 +15,6 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/printing/cups_print_job.h b/chrome/browser/ash/printing/cups_print_job.h index 74ff5ba1..bf70c63 100644 --- a/chrome/browser/ash/printing/cups_print_job.h +++ b/chrome/browser/ash/printing/cups_print_job.h
@@ -8,6 +8,7 @@ #include <string> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/ash/printing/history/print_job_info.pb.h" #include "chrome/browser/chromeos/printing/printer_error_codes.h" #include "chrome/browser/printing/print_job.h"
diff --git a/chrome/browser/ash/printing/history/print_job_database_impl.cc b/chrome/browser/ash/printing/history/print_job_database_impl.cc index 36de747..57bbe8e 100644 --- a/chrome/browser/ash/printing/history/print_job_database_impl.cc +++ b/chrome/browser/ash/printing/history/print_job_database_impl.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/ash/printing/print_servers_provider.cc b/chrome/browser/ash/printing/print_servers_provider.cc index b6d3f23..f54599ab 100644 --- a/chrome/browser/ash/printing/print_servers_provider.cc +++ b/chrome/browser/ash/printing/print_servers_provider.cc
@@ -13,7 +13,6 @@ #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/printing/printer_info_cups.cc b/chrome/browser/ash/printing/printer_info_cups.cc index 22dd4b0..100a0ac9 100644 --- a/chrome/browser/ash/printing/printer_info_cups.cc +++ b/chrome/browser/ash/printing/printer_info_cups.cc
@@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/printing/printer_info_stub.cc b/chrome/browser/ash/printing/printer_info_stub.cc index 309b4dec..f41f3c1 100644 --- a/chrome/browser/ash/printing/printer_info_stub.cc +++ b/chrome/browser/ash/printing/printer_info_stub.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/check.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "printing/printer_status.h"
diff --git a/chrome/browser/ash/printing/printers_sync_bridge.cc b/chrome/browser/ash/printing/printers_sync_bridge.cc index b44835f..901d336 100644 --- a/chrome/browser/ash/printing/printers_sync_bridge.cc +++ b/chrome/browser/ash/printing/printers_sync_bridge.cc
@@ -11,7 +11,6 @@ #include "base/containers/contains.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "chrome/browser/ash/printing/specifics_translation.h" #include "chromeos/printing/printer_configuration.h" #include "components/sync/base/report_unrecoverable_error.h"
diff --git a/chrome/browser/ash/printing/server_printers_fetcher.cc b/chrome/browser/ash/printing/server_printers_fetcher.cc index 0905fdd49..6162f14 100644 --- a/chrome/browser/ash/printing/server_printers_fetcher.cc +++ b/chrome/browser/ash/printing/server_printers_fetcher.cc
@@ -12,7 +12,6 @@ #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/printing/server_printers_provider.cc b/chrome/browser/ash/printing/server_printers_provider.cc index 64614f0..7cb6cf0e 100644 --- a/chrome/browser/ash/printing/server_printers_provider.cc +++ b/chrome/browser/ash/printing/server_printers_provider.cc
@@ -11,7 +11,6 @@ #include "base/containers/contains.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/printing/print_servers_provider.h" #include "chrome/browser/ash/printing/print_servers_provider_factory.h"
diff --git a/chrome/browser/ash/printing/usb_printer_detector.cc b/chrome/browser/ash/printing/usb_printer_detector.cc index bef6d47..87386fad 100644 --- a/chrome/browser/ash/printing/usb_printer_detector.cc +++ b/chrome/browser/ash/printing/usb_printer_detector.cc
@@ -14,7 +14,6 @@ #include "base/callback_helpers.h" #include "base/sequence_checker.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/browser/ash/printing/ppd_provider_factory.h" #include "chrome/browser/ash/printing/printer_configurer.h"
diff --git a/chrome/browser/ash/release_notes/release_notes_notification.h b/chrome/browser/ash/release_notes/release_notes_notification.h index f32f06a..f115568 100644 --- a/chrome/browser/ash/release_notes/release_notes_notification.h +++ b/chrome/browser/ash/release_notes/release_notes_notification.h
@@ -8,7 +8,6 @@ #include <memory> #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "chrome/browser/ash/release_notes/release_notes_storage.h" #include "chromeos/network/network_state_handler_observer.h" #include "components/session_manager/core/session_manager_observer.h"
diff --git a/chrome/browser/ash/session_length_limiter_unittest.cc b/chrome/browser/ash/session_length_limiter_unittest.cc index 521b70bc8..51c931d3 100644 --- a/chrome/browser/ash/session_length_limiter_unittest.cc +++ b/chrome/browser/ash/session_length_limiter_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/power_monitor_test.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/ash/settings/session_manager_operation.cc b/chrome/browser/ash/settings/session_manager_operation.cc index 3531a03..9c6fbd70 100644 --- a/chrome/browser/ash/settings/session_manager_operation.cc +++ b/chrome/browser/ash/settings/session_manager_operation.cc
@@ -10,7 +10,6 @@ #include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/smb_client/smb_service.cc b/chrome/browser/ash/smb_client/smb_service.cc index ce2501eb..c1d2559 100644 --- a/chrome/browser/ash/smb_client/smb_service.cc +++ b/chrome/browser/ash/smb_client/smb_service.cc
@@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" #include "base/unguessable_token.h"
diff --git a/chrome/browser/ash/system/automatic_reboot_manager.cc b/chrome/browser/ash/system/automatic_reboot_manager.cc index 6b76281..4cffc418 100644 --- a/chrome/browser/ash/system/automatic_reboot_manager.cc +++ b/chrome/browser/ash/system/automatic_reboot_manager.cc
@@ -27,7 +27,6 @@ #include "base/path_service.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/ash/system_logs/command_line_log_source.cc b/chrome/browser/ash/system_logs/command_line_log_source.cc index a1b98ef..e44cdb7 100644 --- a/chrome/browser/ash/system_logs/command_line_log_source.cc +++ b/chrome/browser/ash/system_logs/command_line_log_source.cc
@@ -16,7 +16,6 @@ #include "base/logging.h" #include "base/process/launch.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/system_logs/debug_daemon_log_source.cc b/chrome/browser/ash/system_logs/debug_daemon_log_source.cc index 571da5bc..4d856c7e 100644 --- a/chrome/browser/ash/system_logs/debug_daemon_log_source.cc +++ b/chrome/browser/ash/system_logs/debug_daemon_log_source.cc
@@ -17,7 +17,6 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/ash/system_logs/iwlwifi_dump_log_source.cc b/chrome/browser/ash/system_logs/iwlwifi_dump_log_source.cc index 222519b..ae22ebe6 100644 --- a/chrome/browser/ash/system_logs/iwlwifi_dump_log_source.cc +++ b/chrome/browser/ash/system_logs/iwlwifi_dump_log_source.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/system_logs/reven_log_source.cc b/chrome/browser/ash/system_logs/reven_log_source.cc index 0b00069..a573885 100644 --- a/chrome/browser/ash/system_logs/reven_log_source.cc +++ b/chrome/browser/ash/system_logs/reven_log_source.cc
@@ -10,7 +10,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chromeos/services/cros_healthd/public/cpp/service_connection.h" #include "chromeos/services/cros_healthd/public/mojom/cros_healthd_probe.mojom-shared.h"
diff --git a/chrome/browser/ash/system_logs/single_log_file_log_source.cc b/chrome/browser/ash/system_logs/single_log_file_log_source.cc index d64e23d..55d6fe3 100644 --- a/chrome/browser/ash/system_logs/single_log_file_log_source.cc +++ b/chrome/browser/ash/system_logs/single_log_file_log_source.cc
@@ -9,7 +9,6 @@ #include "base/files/file_util.h" #include "base/process/process_info.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/system_logs/touch_log_source.cc b/chrome/browser/ash/system_logs/touch_log_source.cc index 29a3714..4f89f4b 100644 --- a/chrome/browser/ash/system_logs/touch_log_source.cc +++ b/chrome/browser/ash/system_logs/touch_log_source.cc
@@ -15,7 +15,6 @@ #include "base/files/file_util.h" #include "base/process/launch.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chromeos/login/login_state/login_state.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/tpm_firmware_update.cc b/chrome/browser/ash/tpm_firmware_update.cc index 47e7844f..466993c 100644 --- a/chrome/browser/ash/tpm_firmware_update.cc +++ b/chrome/browser/ash/tpm_firmware_update.cc
@@ -15,7 +15,6 @@ #include "base/files/file_util.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/u2f_notification.cc b/chrome/browser/ash/u2f_notification.cc index 7e785996..c5e3f6d 100644 --- a/chrome/browser/ash/u2f_notification.cc +++ b/chrome/browser/ash/u2f_notification.cc
@@ -12,7 +12,6 @@ #include "base/containers/contains.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" -#include "base/task/post_task.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "chrome/browser/notifications/notification_display_service.h" #include "chrome/browser/notifications/notification_display_service_factory.h"
diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc index da34f573..01548ed8 100644 --- a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc +++ b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc
@@ -21,6 +21,7 @@ #include "base/numerics/safe_conversions.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/ash/wallpaper_handlers/wallpaper_handlers_metric_utils.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/web_applications/terminal_source.cc b/chrome/browser/ash/web_applications/terminal_source.cc index d93c270..1fc3042 100644 --- a/chrome/browser/ash/web_applications/terminal_source.cc +++ b/chrome/browser/ash/web_applications/terminal_source.cc
@@ -13,7 +13,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/no_destructor.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/crostini/crostini_terminal.h"
diff --git a/chrome/browser/background/background_mode_manager_win.cc b/chrome/browser/background/background_mode_manager_win.cc index f2679611..3a33cea 100644 --- a/chrome/browser/background/background_mode_manager_win.cc +++ b/chrome/browser/background/background_mode_manager_win.cc
@@ -7,7 +7,6 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/win/registry.h"
diff --git a/chrome/browser/background_fetch/background_fetch_delegate_impl.cc b/chrome/browser/background_fetch/background_fetch_delegate_impl.cc index 4782d51..719fc16 100644 --- a/chrome/browser/background_fetch/background_fetch_delegate_impl.cc +++ b/chrome/browser/background_fetch/background_fetch_delegate_impl.cc
@@ -12,7 +12,6 @@ #include "base/feature_list.h" #include "base/notreached.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "chrome/browser/download/background_download_service_factory.h"
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index 2cb28e6..002d552 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -23,7 +23,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/supports_user_data.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/browser_switcher/alternative_browser_driver_posix.cc b/chrome/browser/browser_switcher/alternative_browser_driver_posix.cc index 4527d87..144907b 100644 --- a/chrome/browser/browser_switcher/alternative_browser_driver_posix.cc +++ b/chrome/browser/browser_switcher/alternative_browser_driver_posix.cc
@@ -12,7 +12,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "build/build_config.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_navigation_throttle.cc b/chrome/browser/browser_switcher/browser_switcher_navigation_throttle.cc index dbf9e95..4edaecb 100644 --- a/chrome/browser/browser_switcher/browser_switcher_navigation_throttle.cc +++ b/chrome/browser/browser_switcher/browser_switcher_navigation_throttle.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/browser_switcher/alternative_browser_driver.h" #include "chrome/browser/browser_switcher/browser_switcher_service.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_service_win.cc b/chrome/browser/browser_switcher/browser_switcher_service_win.cc index 1225fb97..a21340e 100644 --- a/chrome/browser/browser_switcher/browser_switcher_service_win.cc +++ b/chrome/browser/browser_switcher/browser_switcher_service_win.cc
@@ -19,7 +19,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/syslog_logging.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/win/registry.h"
diff --git a/chrome/browser/browsing_data/access_context_audit_database.h b/chrome/browser/browsing_data/access_context_audit_database.h index 1d62f93..e6d1f77 100644 --- a/chrome/browser/browsing_data/access_context_audit_database.h +++ b/chrome/browser/browsing_data/access_context_audit_database.h
@@ -7,6 +7,7 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "components/content_settings/core/browser/cookie_settings.h" #include "net/cookies/canonical_cookie.h" #include "sql/database.h"
diff --git a/chrome/browser/browsing_data/access_context_audit_service.cc b/chrome/browser/browsing_data/access_context_audit_service.cc index 4aaad8d5..0baa966 100644 --- a/chrome/browser/browsing_data/access_context_audit_service.cc +++ b/chrome/browser/browsing_data/access_context_audit_service.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/browsing_data/access_context_audit_service.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/updateable_sequenced_task_runner.h" #include "base/time/default_clock.h"
diff --git a/chrome/browser/browsing_data/browsing_data_media_license_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_media_license_helper_unittest.cc index b3a37bb..1fd40c5 100644 --- a/chrome/browser/browsing_data/browsing_data_media_license_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_media_license_helper_unittest.cc
@@ -16,6 +16,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/test_future.h" +#include "base/time/time.h" #include "chrome/browser/browsing_data/browsing_data_media_license_helper.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/storage_partition.h"
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h index c321a0c1..901d47e 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
@@ -14,6 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/synchronization/waitable_event_watcher.h" #include "base/task/cancelable_task_tracker.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/common/buildflags.h"
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 index 7da2e5c..99b727d7 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc
@@ -21,7 +21,6 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/bind.h"
diff --git a/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc b/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc index b53988bf..c485549c 100644 --- a/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc +++ b/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc
@@ -13,6 +13,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/web_data_service_factory.h"
diff --git a/chrome/browser/browsing_data/counters/downloads_counter_browsertest.cc b/chrome/browser/browsing_data/counters/downloads_counter_browsertest.cc index b06a802..9c270bfb 100644 --- a/chrome/browser/browsing_data/counters/downloads_counter_browsertest.cc +++ b/chrome/browser/browsing_data/counters/downloads_counter_browsertest.cc
@@ -13,6 +13,7 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/download/download_core_service.h" #include "chrome/browser/download/download_core_service_factory.h"
diff --git a/chrome/browser/browsing_data/counters/history_counter_browsertest.cc b/chrome/browser/browsing_data/counters/history_counter_browsertest.cc index 683852a..9711462 100644 --- a/chrome/browser/browsing_data/counters/history_counter_browsertest.cc +++ b/chrome/browser/browsing_data/counters/history_counter_browsertest.cc
@@ -10,6 +10,7 @@ #include "base/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/web_history_service_factory.h" #include "chrome/browser/sync/sync_service_factory.h"
diff --git a/chrome/browser/browsing_data/counters/passwords_counter_browsertest.cc b/chrome/browser/browsing_data/counters/passwords_counter_browsertest.cc index 01e56de..55f2b8e 100644 --- a/chrome/browser/browsing_data/counters/passwords_counter_browsertest.cc +++ b/chrome/browser/browsing_data/counters/passwords_counter_browsertest.cc
@@ -8,6 +8,7 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/password_manager/account_password_store_factory.h" #include "chrome/browser/password_manager/password_store_factory.h" #include "chrome/browser/sync/sync_service_factory.h"
diff --git a/chrome/browser/browsing_data/counters/site_data_counting_helper.h b/chrome/browser/browsing_data/counters/site_data_counting_helper.h index 4770622..292b48f 100644 --- a/chrome/browser/browsing_data/counters/site_data_counting_helper.h +++ b/chrome/browser/browsing_data/counters/site_data_counting_helper.h
@@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/browsing_data/browsing_data_media_license_helper.h" #include "components/content_settings/core/common/content_settings_types.h" #include "net/cookies/canonical_cookie.h"
diff --git a/chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc b/chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc index 2143a104..acac716 100644 --- a/chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc +++ b/chrome/browser/browsing_data/counters/site_data_counting_helper_unittest.cc
@@ -10,7 +10,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_mock_clock_override.h" #include "chrome/browser/browsing_data/counters/site_data_counting_helper.h"
diff --git a/chrome/browser/browsing_data/site_data_size_collector.cc b/chrome/browser/browsing_data/site_data_size_collector.cc index baf587b..a257b8e 100644 --- a/chrome/browser/browsing_data/site_data_size_collector.cc +++ b/chrome/browser/browsing_data/site_data_size_collector.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc index db28133..92935a7 100644 --- a/chrome/browser/chrome_browser_main_android.cc +++ b/chrome/browser/chrome_browser_main_android.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/path_service.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h" #include "chrome/browser/android/mojo/chrome_interface_registrar_android.h"
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc index 8afa7e1..86897349 100644 --- a/chrome/browser/chrome_browser_main_win.cc +++ b/chrome/browser/chrome_browser_main_win.cc
@@ -33,7 +33,6 @@ #include "base/scoped_native_library.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/trace_event/base_tracing.h"
diff --git a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc index c5769b37..a1ec26a 100644 --- a/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc +++ b/chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
@@ -56,7 +56,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/extensions/default_app_order.cc b/chrome/browser/chromeos/extensions/default_app_order.cc index 1bd8bf7..d4440a30 100644 --- a/chrome/browser/chromeos/extensions/default_app_order.cc +++ b/chrome/browser/chromeos/extensions/default_app_order.cc
@@ -14,7 +14,6 @@ #include "base/files/file_util.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "chrome/browser/ash/file_manager/app_id.h"
diff --git a/chrome/browser/chromeos/extensions/echo_private_api.cc b/chrome/browser/chromeos/extensions/echo_private_api.cc index d2c2894..5d0b466 100644 --- a/chrome/browser/chromeos/extensions/echo_private_api.cc +++ b/chrome/browser/chromeos/extensions/echo_private_api.cc
@@ -13,7 +13,6 @@ #include "base/location.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/ash/notifications/echo_dialog_view.h"
diff --git a/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc b/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc index d7fc7b4b..ee24830 100644 --- a/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc +++ b/chrome/browser/chromeos/extensions/external_cache_impl_unittest.cc
@@ -14,7 +14,6 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router.h b/chrome/browser/chromeos/extensions/file_manager/device_event_router.h index 29fb9c920..270899f7 100644 --- a/chrome/browser/chromeos/extensions/file_manager/device_event_router.h +++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router.h
@@ -10,6 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "chrome/browser/ash/file_manager/volume_manager_observer.h" #include "chrome/browser/chromeos/extensions/file_manager/system_notification_manager.h" #include "chrome/common/extensions/api/file_manager_private.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h index 12b1bc1..fbfa4c6 100644 --- a/chrome/browser/chromeos/extensions/file_manager/event_router.h +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.h
@@ -17,6 +17,7 @@ #include "ash/components/settings/timezone_settings.h" #include "ash/public/cpp/tablet_mode_observer.h" #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "chrome/browser/ash/drive/drive_integration_service.h" #include "chrome/browser/ash/file_manager/file_watcher.h" #include "chrome/browser/ash/file_manager/fileapi_util.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc index f93af93..f61083e 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
@@ -22,7 +22,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h" #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h index acdd72f..b58e4bef 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h
@@ -15,6 +15,7 @@ #include "ash/components/drivefs/mojom/drivefs.mojom-forward.h" #include "base/files/file.h" +#include "base/time/time.h" #include "chrome/browser/ash/file_manager/fileapi_util.h" #include "chrome/browser/chromeos/extensions/file_manager/logged_extension_function.h" #include "components/drive/file_errors.h"
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc index a9555ff..1d71d06 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
@@ -15,7 +15,6 @@ #include "base/format_macros.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "chrome/browser/ash/drive/file_system_util.h" #include "chrome/browser/ash/file_manager/file_tasks_notifier.h" #include "chrome/browser/ash/file_manager/fileapi_util.h"
diff --git a/chrome/browser/chromeos/extensions/install_limiter.cc b/chrome/browser/chromeos/extensions/install_limiter.cc index f617b9c1..92969bc6 100644 --- a/chrome/browser/chromeos/extensions/install_limiter.cc +++ b/chrome/browser/chromeos/extensions/install_limiter.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/chromeos/extensions/install_limiter_factory.h" #include "content/public/browser/notification_details.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login_screen_storage/login_screen_storage_api_ash_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login_screen_storage/login_screen_storage_api_ash_unittest.cc index 165aa0f..bc7faad 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login_screen_storage/login_screen_storage_api_ash_unittest.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login_screen_storage/login_screen_storage_api_ash_unittest.cc
@@ -8,7 +8,6 @@ #include "base/memory/scoped_refptr.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/extensions/extension_api_unittest.h" #include "chromeos/dbus/session_manager/fake_session_manager_client.h"
diff --git a/chrome/browser/chromeos/extensions/signin_screen_extensions_external_loader.cc b/chrome/browser/chromeos/extensions/signin_screen_extensions_external_loader.cc index dd349c2..cb96bd6e 100644 --- a/chrome/browser/chromeos/extensions/signin_screen_extensions_external_loader.cc +++ b/chrome/browser/chromeos/extensions/signin_screen_extensions_external_loader.cc
@@ -13,7 +13,6 @@ #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc index 7f0ac4d..6679a1d 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -21,7 +21,6 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/fileapi/file_system_backend.cc b/chrome/browser/chromeos/fileapi/file_system_backend.cc index 58438f6..21fbd0b 100644 --- a/chrome/browser/chromeos/fileapi/file_system_backend.cc +++ b/chrome/browser/chromeos/fileapi/file_system_backend.cc
@@ -13,7 +13,6 @@ #include "base/check_op.h" #include "base/command_line.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_util.h"
diff --git a/chrome/browser/chromeos/fileapi/recent_drive_source.cc b/chrome/browser/chromeos/fileapi/recent_drive_source.cc index 0c332af4..ccd7df2 100644 --- a/chrome/browser/chromeos/fileapi/recent_drive_source.cc +++ b/chrome/browser/chromeos/fileapi/recent_drive_source.cc
@@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "chrome/browser/ash/drive/drive_integration_service.h" #include "chrome/browser/ash/drive/file_system_util.h" #include "chrome/browser/ash/file_manager/fileapi_util.h"
diff --git a/chrome/browser/chromeos/printing/cups_wrapper_impl.cc b/chrome/browser/chromeos/printing/cups_wrapper_impl.cc index f1a239df..c62d8f48 100644 --- a/chrome/browser/chromeos/printing/cups_wrapper_impl.cc +++ b/chrome/browser/chromeos/printing/cups_wrapper_impl.cc
@@ -10,7 +10,6 @@ #include "base/callback.h" #include "base/logging.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/commerce/coupons/coupon_service.h b/chrome/browser/commerce/coupons/coupon_service.h index a3c30f9..d493496 100644 --- a/chrome/browser/commerce/coupons/coupon_service.h +++ b/chrome/browser/commerce/coupons/coupon_service.h
@@ -8,6 +8,7 @@ #include "base/containers/flat_map.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "chrome/browser/commerce/coupons/coupon_db.h" #include "chrome/browser/commerce/coupons/coupon_service_factory.h" #include "chrome/browser/commerce/coupons/coupon_service_observer.h"
diff --git a/chrome/browser/component_updater/app_provisioning_component_installer.cc b/chrome/browser/component_updater/app_provisioning_component_installer.cc index 3b608be..32ca40e7 100644 --- a/chrome/browser/component_updater/app_provisioning_component_installer.cc +++ b/chrome/browser/component_updater/app_provisioning_component_installer.cc
@@ -21,7 +21,6 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/stl_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "base/version.h"
diff --git a/chrome/browser/component_updater/autofill_regex_component_installer.cc b/chrome/browser/component_updater/autofill_regex_component_installer.cc index 9924088..bce43a418 100644 --- a/chrome/browser/component_updater/autofill_regex_component_installer.cc +++ b/chrome/browser/component_updater/autofill_regex_component_installer.cc
@@ -15,7 +15,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/version.h" #include "components/autofill/core/browser/pattern_provider/pattern_configuration_parser.h"
diff --git a/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc b/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc index d893109f..d705efc1 100644 --- a/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc +++ b/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc
@@ -14,7 +14,6 @@ #include "base/files/file_util.h" #include "base/location.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "components/component_updater/component_installer.h"
diff --git a/chrome/browser/component_updater/crl_set_component_installer.cc b/chrome/browser/component_updater/crl_set_component_installer.cc index 54a46940..9326e08 100644 --- a/chrome/browser/component_updater/crl_set_component_installer.cc +++ b/chrome/browser/component_updater/crl_set_component_installer.cc
@@ -15,7 +15,6 @@ #include "base/files/file_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "components/component_updater/component_installer.h"
diff --git a/chrome/browser/component_updater/cros_component_installer_chromeos_unittest.cc b/chrome/browser/component_updater/cros_component_installer_chromeos_unittest.cc index 524fa49..33415e2 100644 --- a/chrome/browser/component_updater/cros_component_installer_chromeos_unittest.cc +++ b/chrome/browser/component_updater/cros_component_installer_chromeos_unittest.cc
@@ -15,7 +15,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/scoped_path_override.h" #include "base/test/test_simple_task_runner.h"
diff --git a/chrome/browser/component_updater/desktop_screenshot_editor_component_installer.cc b/chrome/browser/component_updater/desktop_screenshot_editor_component_installer.cc index de45b640..6503f8b 100644 --- a/chrome/browser/component_updater/desktop_screenshot_editor_component_installer.cc +++ b/chrome/browser/component_updater/desktop_screenshot_editor_component_installer.cc
@@ -16,7 +16,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/version.h" #include "chrome/browser/share/share_features.h"
diff --git a/chrome/browser/component_updater/desktop_sharing_hub_component_installer.cc b/chrome/browser/component_updater/desktop_sharing_hub_component_installer.cc index ce52566..448bfd6 100644 --- a/chrome/browser/component_updater/desktop_sharing_hub_component_installer.cc +++ b/chrome/browser/component_updater/desktop_sharing_hub_component_installer.cc
@@ -16,7 +16,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/version.h" #include "chrome/browser/share/core/share_targets.h"
diff --git a/chrome/browser/component_updater/desktop_sharing_hub_component_remover.cc b/chrome/browser/component_updater/desktop_sharing_hub_component_remover.cc index 07d34460..d6f2985 100644 --- a/chrome/browser/component_updater/desktop_sharing_hub_component_remover.cc +++ b/chrome/browser/component_updater/desktop_sharing_hub_component_remover.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/files/file_path.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/component_updater/component_updater_utils.h"
diff --git a/chrome/browser/component_updater/file_type_policies_component_installer.cc b/chrome/browser/component_updater/file_type_policies_component_installer.cc index 0a1d8b3..5299c42 100644 --- a/chrome/browser/component_updater/file_type_policies_component_installer.cc +++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
@@ -16,7 +16,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/version.h" #include "components/component_updater/component_updater_paths.h"
diff --git a/chrome/browser/component_updater/first_party_sets_component_installer.cc b/chrome/browser/component_updater/first_party_sets_component_installer.cc index f9bec0d..43a9965 100644 --- a/chrome/browser/component_updater/first_party_sets_component_installer.cc +++ b/chrome/browser/component_updater/first_party_sets_component_installer.cc
@@ -16,7 +16,6 @@ #include "base/memory/ref_counted.h" #include "base/no_destructor.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/version.h" #include "chrome/browser/first_party_sets/first_party_sets_settings.h"
diff --git a/chrome/browser/component_updater/pki_metadata_component_installer.cc b/chrome/browser/component_updater/pki_metadata_component_installer.cc index 90a2c1ba..52ce2db2 100644 --- a/chrome/browser/component_updater/pki_metadata_component_installer.cc +++ b/chrome/browser/component_updater/pki_metadata_component_installer.cc
@@ -18,7 +18,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/time/time.h"
diff --git a/chrome/browser/component_updater/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl_component_installer.cc index 43e8484..6c46d185 100644 --- a/chrome/browser/component_updater/pnacl_component_installer.cc +++ b/chrome/browser/component_updater/pnacl_component_installer.cc
@@ -21,7 +21,6 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc index 1d41c57..9698456 100644 --- a/chrome/browser/component_updater/recovery_component_installer.cc +++ b/chrome/browser/component_updater/recovery_component_installer.cc
@@ -26,7 +26,6 @@ #include "base/process/launch.h" #include "base/process/process.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/component_updater/smart_dim_component_installer.cc b/chrome/browser/component_updater/smart_dim_component_installer.cc index 2203aed6..8296c9e 100644 --- a/chrome/browser/component_updater/smart_dim_component_installer.cc +++ b/chrome/browser/component_updater/smart_dim_component_installer.cc
@@ -16,7 +16,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/metrics/field_trial_params.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/version.h" #include "chrome/browser/ash/power/ml/smart_dim/metrics.h"
diff --git a/chrome/browser/component_updater/vr_assets_component_installer.cc b/chrome/browser/component_updater/vr_assets_component_installer.cc index f7d96d5..6c1cdbd 100644 --- a/chrome/browser/component_updater/vr_assets_component_installer.cc +++ b/chrome/browser/component_updater/vr_assets_component_installer.cc
@@ -14,7 +14,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/version.h" #include "build/build_config.h" #include "chrome/browser/vr/assets_loader.h"
diff --git a/chrome/browser/component_updater/zxcvbn_data_component_installer.cc b/chrome/browser/component_updater/zxcvbn_data_component_installer.cc index 774edc0..73d0333 100644 --- a/chrome/browser/component_updater/zxcvbn_data_component_installer.cc +++ b/chrome/browser/component_updater/zxcvbn_data_component_installer.cc
@@ -22,7 +22,6 @@ #include "base/ranges/algorithm.h" #include "base/strings/string_piece.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "base/version.h"
diff --git a/chrome/browser/content_index/content_index_provider_impl.cc b/chrome/browser/content_index/content_index_provider_impl.cc index aeb0b89..a222d82f 100644 --- a/chrome/browser/content_index/content_index_provider_impl.cc +++ b/chrome/browser/content_index/content_index_provider_impl.cc
@@ -9,7 +9,6 @@ #include "base/barrier_closure.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "chrome/browser/engagement/site_engagement_service_factory.h"
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index 648ae9a7..9c4baf5 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -7,7 +7,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/dbus_memory_pressure_evaluator_linux_unittest.cc b/chrome/browser/dbus_memory_pressure_evaluator_linux_unittest.cc index 8590181..1782157a 100644 --- a/chrome/browser/dbus_memory_pressure_evaluator_linux_unittest.cc +++ b/chrome/browser/dbus_memory_pressure_evaluator_linux_unittest.cc
@@ -13,6 +13,7 @@ #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "dbus/mock_bus.h" #include "dbus/mock_object_proxy.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/device_api/managed_configuration_api.cc b/chrome/browser/device_api/managed_configuration_api.cc index b56983cf..0272ac0d 100644 --- a/chrome/browser/device_api/managed_configuration_api.cc +++ b/chrome/browser/device_api/managed_configuration_api.cc
@@ -8,7 +8,6 @@ #include "base/callback.h" #include "base/containers/contains.h" #include "base/json/json_string_value_serializer.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/device_api/managed_configuration_store.h"
diff --git a/chrome/browser/devtools/device/android_device_manager.cc b/chrome/browser/devtools/device/android_device_manager.cc index d4d81f0..20f9353 100644 --- a/chrome/browser/devtools/device/android_device_manager.cc +++ b/chrome/browser/devtools/device/android_device_manager.cc
@@ -20,6 +20,7 @@ #include "base/task/thread_pool.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "chrome/browser/devtools/device/usb/usb_device_manager_helper.h" #include "chrome/browser/devtools/device/usb/usb_device_provider.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/devtools/devtools_file_helper.cc b/chrome/browser/devtools/devtools_file_helper.cc index c87399d..dd3be59 100644 --- a/chrome/browser/devtools/devtools_file_helper.cc +++ b/chrome/browser/devtools/devtools_file_helper.cc
@@ -14,7 +14,6 @@ #include "base/json/values_util.h" #include "base/lazy_instance.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/devtools/devtools_file_system_indexer.h b/chrome/browser/devtools/devtools_file_system_indexer.h index fd7da366..05f6b24 100644 --- a/chrome/browser/devtools/devtools_file_system_indexer.h +++ b/chrome/browser/devtools/devtools_file_system_indexer.h
@@ -15,6 +15,7 @@ #include "base/callback.h" #include "base/files/file.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" namespace base { class FilePath;
diff --git a/chrome/browser/devtools/devtools_file_watcher.cc b/chrome/browser/devtools/devtools_file_watcher.cc index 7a9653a..773103bd 100644 --- a/chrome/browser/devtools/devtools_file_watcher.cc +++ b/chrome/browser/devtools/devtools_file_watcher.cc
@@ -20,6 +20,7 @@ #include "base/task/lazy_thread_pool_task_runner.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/memory_dump_provider.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/devtools/devtools_interactive_browsertest.cc b/chrome/browser/devtools/devtools_interactive_browsertest.cc index 408190e7..b45cf0b 100644 --- a/chrome/browser/devtools/devtools_interactive_browsertest.cc +++ b/chrome/browser/devtools/devtools_interactive_browsertest.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h" #include "chrome/browser/devtools/protocol/browser_handler.h"
diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc index 1dbcea4c..1f7cd5f 100644 --- a/chrome/browser/devtools/devtools_ui_bindings.cc +++ b/chrome/browser/devtools/devtools_ui_bindings.cc
@@ -25,7 +25,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h index b6acaf1..82f0d80 100644 --- a/chrome/browser/devtools/devtools_window.h +++ b/chrome/browser/devtools/devtools_window.h
@@ -9,6 +9,7 @@ #include <string> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h" #include "chrome/browser/devtools/devtools_toggle_action.h" #include "chrome/browser/devtools/devtools_ui_bindings.h"
diff --git a/chrome/browser/diagnostics/diagnostics_test.h b/chrome/browser/diagnostics/diagnostics_test.h index f15adfb..d482840 100644 --- a/chrome/browser/diagnostics/diagnostics_test.h +++ b/chrome/browser/diagnostics/diagnostics_test.h
@@ -7,6 +7,7 @@ #include <stddef.h> +#include "base/time/time.h" #include "chrome/browser/diagnostics/diagnostics_metrics.h" #include "chrome/browser/diagnostics/diagnostics_model.h"
diff --git a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc index 9955c3b..d59fe50 100644 --- a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc +++ b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
@@ -6,7 +6,6 @@ #include <utility> -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/chrome/browser/downgrade/downgrade_manager.cc b/chrome/browser/downgrade/downgrade_manager.cc index a64ec00f..a15396a 100644 --- a/chrome/browser/downgrade/downgrade_manager.cc +++ b/chrome/browser/downgrade/downgrade_manager.cc
@@ -20,7 +20,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/syslog_logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/version.h" #include "build/build_config.h"
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index 6f68ad2e..3f11357 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -20,7 +20,6 @@ #include "base/path_service.h" #include "base/rand_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 11365e8..9da906d 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc
@@ -33,7 +33,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/download/download_commands.cc b/chrome/browser/download/download_commands.cc index f6c7fb8c..0ee4129 100644 --- a/chrome/browser/download/download_commands.cc +++ b/chrome/browser/download/download_commands.cc
@@ -11,7 +11,6 @@ #include "base/files/file_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "build/build_config.h"
diff --git a/chrome/browser/download/download_status_updater_mac.mm b/chrome/browser/download/download_status_updater_mac.mm index a079191..fae4c84f 100644 --- a/chrome/browser/download/download_status_updater_mac.mm +++ b/chrome/browser/download/download_status_updater_mac.mm
@@ -10,6 +10,7 @@ #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_policy.h" #include "base/supports_user_data.h" +#include "base/time/time.h" #import "chrome/browser/ui/cocoa/dock_icon.h" #include "components/download/public/common/download_item.h" #import "net/base/mac/url_conversions.h"
diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc index 0d144ef2..c23a07d 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc
@@ -11,7 +11,6 @@ #include "base/location.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/download/notification/download_item_notification.cc b/chrome/browser/download/notification/download_item_notification.cc index d4c6671..7a58230b0 100644 --- a/chrome/browser/download/notification/download_item_notification.cc +++ b/chrome/browser/download/notification/download_item_notification.cc
@@ -16,8 +16,8 @@ #include "base/i18n/rtl.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/download/offline_item_utils.cc b/chrome/browser/download/offline_item_utils.cc index b54c51f..cdba4dc 100644 --- a/chrome/browser/download/offline_item_utils.cc +++ b/chrome/browser/download/offline_item_utils.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/download/offline_item_utils.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/engagement/site_engagement_service_unittest.cc b/chrome/browser/engagement/site_engagement_service_unittest.cc index aae239f..0780fd8 100644 --- a/chrome/browser/engagement/site_engagement_service_unittest.cc +++ b/chrome/browser/engagement/site_engagement_service_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_clock.h" #include "base/time/default_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/engagement/history_aware_site_engagement_service.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc b/chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc index 505f6f7..f99fd5a 100644 --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_dialog_browsertest.cc
@@ -6,6 +6,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/analysis/content_analysis_dialog.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.cc b/chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.cc index c3e28065..c4cf5114 100644 --- a/chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.cc
@@ -6,7 +6,6 @@ #include "base/callback.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h" #include "components/enterprise/common/proto/connectors.pb.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc index fa7641d..d578c6b 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.cc
@@ -9,7 +9,6 @@ #include "base/containers/span.h" #include "base/notreached.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/enterprise/connectors/file_system/box_api_call_flow.cc b/chrome/browser/enterprise/connectors/file_system/box_api_call_flow.cc index f523384..87184e6 100644 --- a/chrome/browser/enterprise/connectors/file_system/box_api_call_flow.cc +++ b/chrome/browser/enterprise/connectors/file_system/box_api_call_flow.cc
@@ -12,7 +12,6 @@ #include "base/hash/sha1.h" #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "chrome/browser/enterprise/connectors/file_system/box_api_call_endpoints.h"
diff --git a/chrome/browser/enterprise/connectors/file_system/box_api_call_flow.h b/chrome/browser/enterprise/connectors/file_system/box_api_call_flow.h index 896eb46..9cf16eac 100644 --- a/chrome/browser/enterprise/connectors/file_system/box_api_call_flow.h +++ b/chrome/browser/enterprise/connectors/file_system/box_api_call_flow.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/files/file_path.h" +#include "base/time/time.h" #include "google_apis/gaia/oauth2_api_call_flow.h" #include "services/data_decoder/public/cpp/data_decoder.h"
diff --git a/chrome/browser/enterprise/connectors/file_system/box_api_call_flow_unittest.cc b/chrome/browser/enterprise/connectors/file_system/box_api_call_flow_unittest.cc index 5c6bd6d..eb80031 100644 --- a/chrome/browser/enterprise/connectors/file_system/box_api_call_flow_unittest.cc +++ b/chrome/browser/enterprise/connectors/file_system/box_api_call_flow_unittest.cc
@@ -18,6 +18,7 @@ #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "chrome/browser/enterprise/connectors/file_system/box_api_call_test_helper.h" #include "net/base/net_errors.h" #include "net/http/http_status_code.h"
diff --git a/chrome/browser/enterprise/connectors/file_system/box_uploader.cc b/chrome/browser/enterprise/connectors/file_system/box_uploader.cc index c8e624a8..13021f7 100644 --- a/chrome/browser/enterprise/connectors/file_system/box_uploader.cc +++ b/chrome/browser/enterprise/connectors/file_system/box_uploader.cc
@@ -10,7 +10,6 @@ #include "base/metrics/histogram_functions.h" #include "base/observer_list.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/enterprise/connectors/connectors_prefs.h" #include "chrome/browser/enterprise/connectors/file_system/account_info_utils.h"
diff --git a/chrome/browser/enterprise/connectors/file_system/box_uploader.h b/chrome/browser/enterprise/connectors/file_system/box_uploader.h index 2834bd34..41ca71f 100644 --- a/chrome/browser/enterprise/connectors/file_system/box_uploader.h +++ b/chrome/browser/enterprise/connectors/file_system/box_uploader.h
@@ -8,6 +8,7 @@ #include "base/files/file_path.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "chrome/browser/enterprise/connectors/file_system/box_api_call_response.h" #include "components/download/public/common/download_item_impl.h" #include "components/download/public/common/download_item_rename_progress_update.h"
diff --git a/chrome/browser/enterprise/connectors/file_system/test_helper.h b/chrome/browser/enterprise/connectors/file_system/test_helper.h index ef74b13..fe1205e 100644 --- a/chrome/browser/enterprise/connectors/file_system/test_helper.h +++ b/chrome/browser/enterprise/connectors/file_system/test_helper.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_ENTERPRISE_CONNECTORS_FILE_SYSTEM_TEST_HELPER_H_ #include "base/files/scoped_temp_dir.h" +#include "base/time/time.h" #include "components/download/public/common/download_item_rename_progress_update.h" #include "content/public/test/fake_download_item.h" #include "google_apis/gaia/oauth2_api_call_flow.h"
diff --git a/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc b/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc index 7512c5c..35f09c1 100644 --- a/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc +++ b/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc
@@ -10,6 +10,7 @@ #include "base/memory/raw_ptr.h" #include "base/test/gmock_callback_support.h" #include "base/test/metrics/histogram_tester.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor_chromeos.cc b/chrome/browser/error_reporting/chrome_js_error_report_processor_chromeos.cc index f3649fdcc..a9b6479 100644 --- a/chrome/browser/error_reporting/chrome_js_error_report_processor_chromeos.cc +++ b/chrome/browser/error_reporting/chrome_js_error_report_processor_chromeos.cc
@@ -20,7 +20,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/error_reporting/constants.h"
diff --git a/chrome/browser/extensions/activity_log/activity_database.h b/chrome/browser/extensions/activity_log/activity_database.h index 87e1380..7c2db404 100644 --- a/chrome/browser/extensions/activity_log/activity_database.h +++ b/chrome/browser/extensions/activity_log/activity_database.h
@@ -11,6 +11,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/sequence_checker.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/extensions/activity_log/activity_actions.h" #include "extensions/common/extension.h"
diff --git a/chrome/browser/extensions/activity_log/counting_policy.h b/chrome/browser/extensions/activity_log/counting_policy.h index d531fb60..c87339e8c 100644 --- a/chrome/browser/extensions/activity_log/counting_policy.h +++ b/chrome/browser/extensions/activity_log/counting_policy.h
@@ -10,6 +10,7 @@ #include <string> #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "chrome/browser/extensions/activity_log/activity_database.h" #include "chrome/browser/extensions/activity_log/activity_log_policy.h" #include "chrome/browser/extensions/activity_log/database_string_table.h"
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index 4649df14..27ca935d 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -20,7 +20,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.h b/chrome/browser/extensions/api/browsing_data/browsing_data_api.h index 241d641..aa309af 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.h +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.h
@@ -14,6 +14,7 @@ #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "components/browsing_data/core/browsing_data_utils.h" #include "components/signin/core/browser/account_reconcilor.h" #include "content/public/browser/browsing_data_filter_builder.h"
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc index c5a6b1a..56c0864 100644 --- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc +++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -11,7 +11,6 @@ #include "base/files/file_path.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/extensions/api/automation_internal/chrome_automation_internal_api_delegate.h"
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc index 2f77dbe..b9bcc6e 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
@@ -13,7 +13,6 @@ #include "base/command_line.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/values.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/extensions/api/crash_report_private/crash_report_private_api.cc b/chrome/browser/extensions/api/crash_report_private/crash_report_private_api.cc index db6864af..d9dc35e 100644 --- a/chrome/browser/extensions/api/crash_report_private/crash_report_private_api.cc +++ b/chrome/browser/extensions/api/crash_report_private/crash_report_private_api.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/extensions/api/crash_report_private/crash_report_private_api.h" +#include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index ed8e242..bee4712c 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -23,7 +23,6 @@ #include "base/metrics/histogram_functions.h" #include "base/scoped_observation.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
diff --git a/chrome/browser/extensions/api/debugger/extension_dev_tools_infobar_delegate.cc b/chrome/browser/extensions/api/debugger/extension_dev_tools_infobar_delegate.cc index 12b8f77..8eb4d4f 100644 --- a/chrome/browser/extensions/api/debugger/extension_dev_tools_infobar_delegate.cc +++ b/chrome/browser/extensions/api/debugger/extension_dev_tools_infobar_delegate.cc
@@ -13,6 +13,7 @@ #include "base/lazy_instance.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/devtools/global_confirm_info_bar.h" #include "chrome/grit/generated_resources.h" #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc b/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc index 5c8ebc50..785f92f 100644 --- a/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc +++ b/chrome/browser/extensions/api/declarative_net_request/declarative_net_request_browsertest.cc
@@ -26,7 +26,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc index 3bfe6b47..c5997e75 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
@@ -26,6 +26,7 @@ #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/download/download_core_service.h" #include "chrome/browser/download/download_core_service_factory.h"
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc index f75352d..80442799 100644 --- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
@@ -14,7 +14,6 @@ #include "base/json/json_writer.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/values.h" #include "chrome/browser/ash/login/test/device_state_mixin.h" #include "chrome/browser/ash/platform_keys/platform_keys_service_factory.h"
diff --git a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc index 9041329..bec564f7 100644 --- a/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc +++ b/chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/file_manager/file_browser_handler_api_ash_test.cc b/chrome/browser/extensions/api/file_manager/file_browser_handler_api_ash_test.cc index c863276..0be94ae0 100644 --- a/chrome/browser/extensions/api/file_manager/file_browser_handler_api_ash_test.cc +++ b/chrome/browser/extensions/api/file_manager/file_browser_handler_api_ash_test.cc
@@ -14,7 +14,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc index 91150d2..ca042a4 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/image_writer_private/error_messages.h" #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc index 2b7c60d4..d01a217 100644 --- a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc +++ b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc
@@ -6,7 +6,6 @@ #include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h" #include "base/bind.h" #include "base/lazy_instance.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.cc b/chrome/browser/extensions/api/image_writer_private/test_utils.cc index 9c6ff0f0..f22a7bd 100644 --- a/chrome/browser/extensions/api/image_writer_private/test_utils.cc +++ b/chrome/browser/extensions/api/image_writer_private/test_utils.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/location.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/zip_extractor.cc b/chrome/browser/extensions/api/image_writer_private/zip_extractor.cc index ed148fa..9de7ad6 100644 --- a/chrome/browser/extensions/api/image_writer_private/zip_extractor.cc +++ b/chrome/browser/extensions/api/image_writer_private/zip_extractor.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/extensions/api/image_writer_private/error_messages.h"
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc index 6167c8b..85912f7 100644 --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -11,7 +11,6 @@ #include "base/memory/raw_ptr.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/apps/app_service/app_launch_params.h"
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc index d75173ff..176d4cf 100644 --- a/chrome/browser/extensions/api/management/management_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -13,7 +13,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_management.h"
diff --git a/chrome/browser/extensions/api/messaging/messaging_apitest.cc b/chrome/browser/extensions/api/messaging/messaging_apitest.cc index 0c59753..558a349 100644 --- a/chrome/browser/extensions/api/messaging/messaging_apitest.cc +++ b/chrome/browser/extensions/api/messaging/messaging_apitest.cc
@@ -21,7 +21,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/messaging/incognito_connectability.h"
diff --git a/chrome/browser/extensions/api/printing/printing_api_handler.cc b/chrome/browser/extensions/api/printing/printing_api_handler.cc index 4d6e8118..41ef5f1 100644 --- a/chrome/browser/extensions/api/printing/printing_api_handler.cc +++ b/chrome/browser/extensions/api/printing/printing_api_handler.cc
@@ -16,7 +16,6 @@ #include "base/no_destructor.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api_unittest.cc b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api_unittest.cc index 54b4f8cc..3b9b72c 100644 --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api_unittest.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api_unittest.cc
@@ -10,7 +10,6 @@ #include <vector> #include "base/feature_list.h" -#include "base/task/post_task.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_service_test_base.h"
diff --git a/chrome/browser/extensions/api/storage/settings_apitest.cc b/chrome/browser/extensions/api/storage/settings_apitest.cc index 524cf53..1108ccc0 100644 --- a/chrome/browser/extensions/api/storage/settings_apitest.cc +++ b/chrome/browser/extensions/api/storage/settings_apitest.cc
@@ -8,7 +8,6 @@ #include "base/json/json_writer.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/storage/settings_sync_util.h"
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performance_test_base.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_performance_test_base.cc index 7378adb..140386af 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_performance_test_base.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_performance_test_base.cc
@@ -16,6 +16,7 @@ #include "base/path_service.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/terminal/crostini_startup_status.cc b/chrome/browser/extensions/api/terminal/crostini_startup_status.cc index dccf12ef..c6b684ee 100644 --- a/chrome/browser/extensions/api/terminal/crostini_startup_status.cc +++ b/chrome/browser/extensions/api/terminal/crostini_startup_status.cc
@@ -14,7 +14,6 @@ #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "chrome/browser/ash/crostini/crostini_util.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc index c2f43385..0aa7880 100644 --- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -19,7 +19,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc index 1785bac..c2f89b0 100644 --- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc +++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
@@ -14,7 +14,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/supports_user_data.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/extension_tab_util.h"
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_unittest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_unittest.cc index 235ae45..59c4dd4 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_unittest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_unittest.cc
@@ -12,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/extensions/extension_api_unittest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h"
diff --git a/chrome/browser/extensions/chrome_url_request_util.cc b/chrome/browser/extensions/chrome_url_request_util.cc index 4d127ec..cf6acb9 100644 --- a/chrome/browser/extensions/chrome_url_request_util.cc +++ b/chrome/browser/extensions/chrome_url_request_util.cc
@@ -14,7 +14,6 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/chrome_manifest_url_handlers.h"
diff --git a/chrome/browser/extensions/content_verifier_test_utils.h b/chrome/browser/extensions/content_verifier_test_utils.h index c18644941..7c52e059 100644 --- a/chrome/browser/extensions/content_verifier_test_utils.h +++ b/chrome/browser/extensions/content_verifier_test_utils.h
@@ -13,6 +13,7 @@ #include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/time/time.h" #include "chrome/browser/extensions/corrupted_extension_reinstaller.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/content_verifier.h"
diff --git a/chrome/browser/extensions/data_deleter.cc b/chrome/browser/extensions/data_deleter.cc index af002cb..a11f0c4 100644 --- a/chrome/browser/extensions/data_deleter.cc +++ b/chrome/browser/extensions/data_deleter.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "chrome/browser/extensions/chrome_extension_cookies.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index cf94030..be7408e 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -22,7 +22,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc index 5b9be14..a2a66a0 100644 --- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
@@ -7,7 +7,6 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_browsertest.h"
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc index 03abe70..b8e689b9 100644 --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -14,6 +14,7 @@ #include "base/files/file_util.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_tokenizer.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/forced_extensions/install_stage_tracker.h b/chrome/browser/extensions/forced_extensions/install_stage_tracker.h index da33770f..f3b0177 100644 --- a/chrome/browser/extensions/forced_extensions/install_stage_tracker.h +++ b/chrome/browser/extensions/forced_extensions/install_stage_tracker.h
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "base/observer_list_types.h" +#include "base/time/time.h" #include "build/chromeos_buildflags.h" #include "components/keyed_service/core/keyed_service.h" #include "extensions/browser/install/crx_install_error.h"
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index b39a2fc..4c6bb51 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -13,7 +13,6 @@ #include "base/scoped_observation.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h"
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index f0d97e0..30d9064 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -15,6 +15,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/extensions/chrome_app_sorting.h" #include "chrome/browser/extensions/test_extension_system.h"
diff --git a/chrome/browser/extensions/updater/extension_cache_impl.cc b/chrome/browser/extensions/updater/extension_cache_impl.cc index 8c52204..9e1e7a9d 100644 --- a/chrome/browser/extensions/updater/extension_cache_impl.cc +++ b/chrome/browser/extensions/updater/extension_cache_impl.cc
@@ -11,7 +11,6 @@ #include "base/containers/contains.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/extensions/updater/extension_update_client_base_browsertest.cc b/chrome/browser/extensions/updater/extension_update_client_base_browsertest.cc index 526fe91..c97771c0 100644 --- a/chrome/browser/extensions/updater/extension_update_client_base_browsertest.cc +++ b/chrome/browser/extensions/updater/extension_update_client_base_browsertest.cc
@@ -10,7 +10,6 @@ #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "chrome/browser/chrome_browser_main.h" #include "chrome/browser/chrome_browser_main_extra_parts.h" #include "chrome/browser/extensions/browsertest_util.h"
diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h index 299b0bd3..710dfa9 100644 --- a/chrome/browser/extensions/updater/extension_updater.h +++ b/chrome/browser/extensions/updater/extension_updater.h
@@ -17,6 +17,7 @@ #include "base/files/file_path.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "extensions/browser/extension_registry_observer.h"
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index 7534761..37c492d 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -31,6 +31,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/version.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/updater/local_extension_cache_unittest.cc b/chrome/browser/extensions/updater/local_extension_cache_unittest.cc index aa6662a..0f5b9d8 100644 --- a/chrome/browser/extensions/updater/local_extension_cache_unittest.cc +++ b/chrome/browser/extensions/updater/local_extension_cache_unittest.cc
@@ -14,7 +14,6 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index ead3742..52f5a5c 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc
@@ -26,7 +26,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc b/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc index de625df0..1d27fcb 100644 --- a/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc +++ b/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/favicon/history_ui_favicon_request_handler_factory.h" #include "base/memory/singleton.h" -#include "base/task/post_task.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/favicon/large_icon_service_factory.h" #include "chrome/browser/profiles/incognito_helpers.h"
diff --git a/chrome/browser/favicon/large_icon_service_factory.cc b/chrome/browser/favicon/large_icon_service_factory.cc index 6d053dd..16a8d4fac 100644 --- a/chrome/browser/favicon/large_icon_service_factory.cc +++ b/chrome/browser/favicon/large_icon_service_factory.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/favicon/large_icon_service_factory.h" #include "base/memory/singleton.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "chrome/browser/browser_features.h" #include "chrome/browser/favicon/favicon_service_factory.h"
diff --git a/chrome/browser/feature_engagement/tracker_factory.cc b/chrome/browser/feature_engagement/tracker_factory.cc index 45c2c7b..9936a96a 100644 --- a/chrome/browser/feature_engagement/tracker_factory.cc +++ b/chrome/browser/feature_engagement/tracker_factory.cc
@@ -7,7 +7,6 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/profiles/incognito_helpers.h"
diff --git a/chrome/browser/feature_guide/notifications/internal/feature_notification_guide_service_impl.h b/chrome/browser/feature_guide/notifications/internal/feature_notification_guide_service_impl.h index 061458a7..6b5094cfd 100644 --- a/chrome/browser/feature_guide/notifications/internal/feature_notification_guide_service_impl.h +++ b/chrome/browser/feature_guide/notifications/internal/feature_notification_guide_service_impl.h
@@ -10,6 +10,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "chrome/browser/feature_guide/notifications/config.h" #include "chrome/browser/feature_guide/notifications/feature_notification_guide_service.h" #include "chrome/browser/feature_guide/notifications/feature_type.h"
diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc index e1e151f5..42eba916 100644 --- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc +++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -17,8 +17,8 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "build/branding_buildflags.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/feedback/system_logs/log_sources/lacros_log_files_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/lacros_log_files_log_source.cc index 02c7304..087c11f 100644 --- a/chrome/browser/feedback/system_logs/log_sources/lacros_log_files_log_source.cc +++ b/chrome/browser/feedback/system_logs/log_sources/lacros_log_files_log_source.cc
@@ -7,7 +7,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/feedback/feedback_util.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/first_run/first_run_internal_win.cc b/chrome/browser/first_run/first_run_internal_win.cc index eb61490..28bfd4d 100644 --- a/chrome/browser/first_run/first_run_internal_win.cc +++ b/chrome/browser/first_run/first_run_internal_win.cc
@@ -19,7 +19,6 @@ #include "base/process/kill.h" #include "base/process/launch.h" #include "base/process/process.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json index 65a7a34..9c107ca5 100644 --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json
@@ -161,11 +161,6 @@ "expiry_milestone": 93 }, { - "name": "app-discovery-remote-url-search", - "owners": [ "tby" ], - "expiry_milestone": 102 - }, - { "name": "app-management-app-details", "owners": [ "ajlinker" ], "expiry_milestone": 104 @@ -3832,6 +3827,11 @@ "expiry_milestone": 105 }, { + "name": "launcher-game-search", + "owners": ["wrong", "napper", "tby"], + "expiry_milestone": 110 + }, + { "name": "launcher-lacros-integration", "owners": ["wrong", "thanhdng", "tby"], "expiry_milestone": 115
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index cb2272cf..8853da1 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -4091,11 +4091,6 @@ const char kAppDiscoveryForOobeDescription[] = "Use the App Discovery Service to request recommended apps for OOBE."; -const char kAppDiscoveryRemoteUrlSearchName[] = - "Remote URL app discovery results"; -const char kAppDiscoveryRemoteUrlSearchDescription[] = - "Surface results from a URL in the app discovery service."; - const char kAppProvisioningStaticName[] = "App Provisioning with static server setup."; const char kAppProvisioningStaticDescription[] = @@ -5397,6 +5392,15 @@ "Enables the option to sync Wi-Fi network configurations between Chrome OS " "devices and a connected Android phone"; +const char kWindowControlMenu[] = "Float current active window"; +const char kWindowControlMenuDescription[] = + "Enables the accelerator (Command + Alt + F) to float current active " + "window."; + +const char kLauncherGameSearchName[] = "Enable launcher game search"; +const char kLauncherGameSearchDescription[] = + "Enables cloud game search results in the launcher."; + const char kLauncherNudgeName[] = "Enable launcher nudge"; const char kLauncherNudgeDescription[] = "Enables nudges that bring new users' attention to the launcher button.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index b4701ff..98991e7 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -2346,9 +2346,6 @@ extern const char kAppDiscoveryForOobeName[]; extern const char kAppDiscoveryForOobeDescription[]; -extern const char kAppDiscoveryRemoteUrlSearchName[]; -extern const char kAppDiscoveryRemoteUrlSearchDescription[]; - extern const char kAppProvisioningStaticName[]; extern const char kAppProvisioningStaticDescription[]; @@ -3104,6 +3101,12 @@ extern const char kWifiSyncAndroidName[]; extern const char kWifiSyncAndroidDescription[]; +extern const char kWindowControlMenu[]; +extern const char kWindowControlMenuDescription[]; + +extern const char kLauncherGameSearchName[]; +extern const char kLauncherGameSearchDescription[]; + extern const char kLauncherNudgeName[]; extern const char kLauncherNudgeDescription[];
diff --git a/chrome/browser/google/google_brand_chromeos.cc b/chrome/browser/google/google_brand_chromeos.cc index 0e3644a..79665db 100644 --- a/chrome/browser/google/google_brand_chromeos.cc +++ b/chrome/browser/google/google_brand_chromeos.cc
@@ -7,7 +7,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/google/google_search_domain_mixing_metrics_emitter.cc b/chrome/browser/google/google_search_domain_mixing_metrics_emitter.cc index 74ff143..5640c3d 100644 --- a/chrome/browser/google/google_search_domain_mixing_metrics_emitter.cc +++ b/chrome/browser/google/google_search_domain_mixing_metrics_emitter.cc
@@ -8,6 +8,7 @@ #include "base/check.h" #include "base/memory/raw_ptr.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/history/core/browser/domain_mixing_metrics.h" #include "components/history/core/browser/history_backend.h" #include "components/history/core/browser/history_database.h"
diff --git a/chrome/browser/google/google_search_domain_mixing_metrics_emitter_unittest.cc b/chrome/browser/google/google_search_domain_mixing_metrics_emitter_unittest.cc index e3dbda7..cda0ead 100644 --- a/chrome/browser/google/google_search_domain_mixing_metrics_emitter_unittest.cc +++ b/chrome/browser/google/google_search_domain_mixing_metrics_emitter_unittest.cc
@@ -8,6 +8,7 @@ #include "base/memory/raw_ptr.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "base/timer/mock_timer.h" #include "components/history/core/browser/domain_mixing_metrics.h" #include "components/history/core/browser/history_service.h"
diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc index 3c45a49..76ba8bf 100644 --- a/chrome/browser/google/google_update_win.cc +++ b/chrome/browser/google/google_update_win.cc
@@ -24,7 +24,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/sequenced_task_runner_helpers.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index 2b715654..4fbe1f4 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc
@@ -12,6 +12,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/history/history_service_factory.h"
diff --git a/chrome/browser/history_clusters/history_clusters_tab_helper.cc b/chrome/browser/history_clusters/history_clusters_tab_helper.cc index 97b47f9..4e10482 100644 --- a/chrome/browser/history_clusters/history_clusters_tab_helper.cc +++ b/chrome/browser/history_clusters/history_clusters_tab_helper.cc
@@ -8,6 +8,7 @@ #include <memory> #include <utility> +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/history/history_service_factory.h"
diff --git a/chrome/browser/icon_transcoder/svg_icon_transcoder.cc b/chrome/browser/icon_transcoder/svg_icon_transcoder.cc index 2d46741..567fc45 100644 --- a/chrome/browser/icon_transcoder/svg_icon_transcoder.cc +++ b/chrome/browser/icon_transcoder/svg_icon_transcoder.cc
@@ -6,7 +6,6 @@ #include "base/base64.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/icon_transcoder/svg_icon_transcoder_browsertest.cc b/chrome/browser/icon_transcoder/svg_icon_transcoder_browsertest.cc index d849379..e8d89b3 100644 --- a/chrome/browser/icon_transcoder/svg_icon_transcoder_browsertest.cc +++ b/chrome/browser/icon_transcoder/svg_icon_transcoder_browsertest.cc
@@ -6,7 +6,6 @@ #include <string> #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/icon_transcoder/svg_icon_transcoder.h"
diff --git a/chrome/browser/image_fetcher/image_fetcher_service_factory.cc b/chrome/browser/image_fetcher/image_fetcher_service_factory.cc index 34ee5c9..4b34074a 100644 --- a/chrome/browser/image_fetcher/image_fetcher_service_factory.cc +++ b/chrome/browser/image_fetcher/image_fetcher_service_factory.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/time/default_clock.h"
diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc index 0b28f7f..f087c20f 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc
@@ -7,7 +7,6 @@ #include <stdint.h> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/importer/profile_writer_unittest.cc b/chrome/browser/importer/profile_writer_unittest.cc index 30a5c8a49..dfbda49f3 100644 --- a/chrome/browser/importer/profile_writer_unittest.cc +++ b/chrome/browser/importer/profile_writer_unittest.cc
@@ -13,6 +13,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" +#include "base/time/time.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/password_manager/password_manager_test_util.h"
diff --git a/chrome/browser/lacros/lacros_memory_pressure_evaluator.h b/chrome/browser/lacros/lacros_memory_pressure_evaluator.h index 1fdda2b..0474280 100644 --- a/chrome/browser/lacros/lacros_memory_pressure_evaluator.h +++ b/chrome/browser/lacros/lacros_memory_pressure_evaluator.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_LACROS_LACROS_MEMORY_PRESSURE_EVALUATOR_H_ #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chromeos/crosapi/mojom/resource_manager.mojom.h" #include "components/memory_pressure/memory_pressure_voter.h" #include "components/memory_pressure/system_memory_pressure_evaluator.h"
diff --git a/chrome/browser/language/language_model_manager_factory.cc b/chrome/browser/language/language_model_manager_factory.cc index 8d9b736..809cc70 100644 --- a/chrome/browser/language/language_model_manager_factory.cc +++ b/chrome/browser/language/language_model_manager_factory.cc
@@ -7,7 +7,6 @@ #include <memory> #include "base/feature_list.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/lifetime/browser_shutdown.cc b/chrome/browser/lifetime/browser_shutdown.cc index 63bf682..4627bb3 100644 --- a/chrome/browser/lifetime/browser_shutdown.cc +++ b/chrome/browser/lifetime/browser_shutdown.cc
@@ -18,7 +18,6 @@ #include "base/metrics/histogram_functions.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/threading/thread.h"
diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.h b/chrome/browser/local_discovery/service_discovery_client_mac.h index 49fd3a3..2058d07 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mac.h +++ b/chrome/browser/local_discovery/service_discovery_client_mac.h
@@ -13,6 +13,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "chrome/browser/local_discovery/service_discovery_shared_client.h" namespace base {
diff --git a/chrome/browser/login_detection/login_detection_prefs.cc b/chrome/browser/login_detection/login_detection_prefs.cc index 034ca68..0dee0b67 100644 --- a/chrome/browser/login_detection/login_detection_prefs.cc +++ b/chrome/browser/login_detection/login_detection_prefs.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/login_detection/login_detection_prefs.h" #include "base/json/values_util.h" +#include "base/time/time.h" #include "chrome/browser/login_detection/login_detection_util.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h"
diff --git a/chrome/browser/lookalikes/lookalike_url_service.cc b/chrome/browser/lookalikes/lookalike_url_service.cc index 73ee11fe..d2a29efbb 100644 --- a/chrome/browser/lookalikes/lookalike_url_service.cc +++ b/chrome/browser/lookalikes/lookalike_url_service.cc
@@ -11,7 +11,6 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/singleton.h" #include "base/metrics/field_trial_params.h" -#include "base/task/post_task.h" #include "base/time/default_clock.h" #include "base/trace_event/trace_event.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/mac/install_updater.mm b/chrome/browser/mac/install_updater.mm index ef842b5..bc5ad16 100644 --- a/chrome/browser/mac/install_updater.mm +++ b/chrome/browser/mac/install_updater.mm
@@ -16,7 +16,6 @@ #include "base/process/launch.h" #include "base/process/process.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/mac/keystone_glue.mm b/chrome/browser/mac/keystone_glue.mm index 88d3879..cc39a1c8 100644 --- a/chrome/browser/mac/keystone_glue.mm +++ b/chrome/browser/mac/keystone_glue.mm
@@ -22,7 +22,6 @@ #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/version.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/media/android/cdm/media_drm_origin_id_manager.cc b/chrome/browser/media/android/cdm/media_drm_origin_id_manager.cc index 69074e2..fe4d872 100644 --- a/chrome/browser/media/android/cdm/media_drm_origin_id_manager.cc +++ b/chrome/browser/media/android/cdm/media_drm_origin_id_manager.cc
@@ -13,7 +13,6 @@ #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/media/autoplay_metrics_browsertest.cc b/chrome/browser/media/autoplay_metrics_browsertest.cc index c06256f..086b416 100644 --- a/chrome/browser/media/autoplay_metrics_browsertest.cc +++ b/chrome/browser/media/autoplay_metrics_browsertest.cc
@@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/task/post_task.h" #include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/media/cast_mirroring_performance_browsertest.cc b/chrome/browser/media/cast_mirroring_performance_browsertest.cc index c2a8263..bc1d431 100644 --- a/chrome/browser/media/cast_mirroring_performance_browsertest.cc +++ b/chrome/browser/media/cast_mirroring_performance_browsertest.cc
@@ -25,6 +25,7 @@ #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/trace_event_analyzer.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/media/cdm_document_service_impl_test.cc b/chrome/browser/media/cdm_document_service_impl_test.cc index 973cd072..07f25f9 100644 --- a/chrome/browser/media/cdm_document_service_impl_test.cc +++ b/chrome/browser/media/cdm_document_service_impl_test.cc
@@ -14,6 +14,7 @@ #include "base/run_loop.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "base/values.h" #include "chrome/browser/media/cdm_pref_service_helper.h"
diff --git a/chrome/browser/media/history/media_history_browsertest.cc b/chrome/browser/media/history/media_history_browsertest.cc index 26e958b..7102302 100644 --- a/chrome/browser/media/history/media_history_browsertest.cc +++ b/chrome/browser/media/history/media_history_browsertest.cc
@@ -10,9 +10,9 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/media/history/media_history_contents_observer.h"
diff --git a/chrome/browser/media/history/media_history_keyed_service.cc b/chrome/browser/media/history/media_history_keyed_service.cc index 81c24b5..f057dd11 100644 --- a/chrome/browser/media/history/media_history_keyed_service.cc +++ b/chrome/browser/media/history/media_history_keyed_service.cc
@@ -7,7 +7,6 @@ #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/memory/raw_ptr.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "chrome/browser/history/history_service_factory.h"
diff --git a/chrome/browser/media/history/media_history_playback_table.h b/chrome/browser/media/history/media_history_playback_table.h index 4000b44..8ea06f9 100644 --- a/chrome/browser/media/history/media_history_playback_table.h +++ b/chrome/browser/media/history/media_history_playback_table.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/time/time.h" #include "chrome/browser/media/history/media_history_store.mojom.h" #include "chrome/browser/media/history/media_history_table_base.h" #include "sql/init_status.h"
diff --git a/chrome/browser/media/history/media_history_store_unittest.cc b/chrome/browser/media/history/media_history_store_unittest.cc index 003da0d..d8a5db22 100644 --- a/chrome/browser/media/history/media_history_store_unittest.cc +++ b/chrome/browser/media/history/media_history_store_unittest.cc
@@ -10,7 +10,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/pooled_sequenced_task_runner.h" #include "base/test/bind.h"
diff --git a/chrome/browser/media/media_engagement_contents_observer.h b/chrome/browser/media/media_engagement_contents_observer.h index 512ee67..5badf1a 100644 --- a/chrome/browser/media/media_engagement_contents_observer.h +++ b/chrome/browser/media/media_engagement_contents_observer.h
@@ -7,6 +7,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "content/public/browser/media_player_id.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/media/media_engagement_score.h b/chrome/browser/media/media_engagement_score.h index 4c23c9e..efc98143 100644 --- a/chrome/browser/media/media_engagement_score.h +++ b/chrome/browser/media/media_engagement_score.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/media/media_engagement_score_details.mojom.h" #include "components/content_settings/core/browser/host_content_settings_map.h"
diff --git a/chrome/browser/media/media_engagement_score_unittest.cc b/chrome/browser/media/media_engagement_score_unittest.cc index f44cf09..57b2744d 100644 --- a/chrome/browser/media/media_engagement_score_unittest.cc +++ b/chrome/browser/media/media_engagement_score_unittest.cc
@@ -11,6 +11,7 @@ #include "base/metrics/field_trial_params.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/media/media_engagement_service_unittest.cc b/chrome/browser/media/media_engagement_service_unittest.cc index d5cbd2a6..768b674 100644 --- a/chrome/browser/media/media_engagement_service_unittest.cc +++ b/chrome/browser/media/media_engagement_service_unittest.cc
@@ -17,6 +17,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" #include "base/test/test_mock_time_task_runner.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/media/router/discovery/dial/device_description_service.h b/chrome/browser/media/router/discovery/dial/device_description_service.h index 3c35694..c1634ef 100644 --- a/chrome/browser/media/router/discovery/dial/device_description_service.h +++ b/chrome/browser/media/router/discovery/dial/device_description_service.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/gtest_prod_util.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/media/router/discovery/dial/dial_device_data.h" #include "chrome/browser/media/router/discovery/dial/parsed_dial_device_description.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_registry.h b/chrome/browser/media/router/discovery/dial/dial_registry.h index 323d847..07fb2f1 100644 --- a/chrome/browser/media/router/discovery/dial/dial_registry.h +++ b/chrome/browser/media/router/discovery/dial/dial_registry.h
@@ -17,6 +17,7 @@ #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/media/router/discovery/dial/dial_service.h" #include "services/network/public/cpp/network_connection_tracker.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_registry_unittest.cc b/chrome/browser/media/router/discovery/dial/dial_registry_unittest.cc index 3953d3e..608fa56 100644 --- a/chrome/browser/media/router/discovery/dial/dial_registry_unittest.cc +++ b/chrome/browser/media/router/discovery/dial/dial_registry_unittest.cc
@@ -7,6 +7,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "chrome/browser/media/router/discovery/dial/dial_device_data.h" #include "chrome/browser/media/router/discovery/dial/dial_registry.h" #include "chrome/browser/media/router/discovery/dial/dial_service.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_service_impl.h b/chrome/browser/media/router/discovery/dial/dial_service_impl.h index 6de9720..14facc3 100644 --- a/chrome/browser/media/router/discovery/dial/dial_service_impl.h +++ b/chrome/browser/media/router/discovery/dial/dial_service_impl.h
@@ -14,6 +14,7 @@ #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/media/router/discovery/dial/dial_service.h" #include "net/base/ip_address.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_service_impl_unittest.cc b/chrome/browser/media/router/discovery/dial/dial_service_impl_unittest.cc index bf4aa81..de16704 100644 --- a/chrome/browser/media/router/discovery/dial/dial_service_impl_unittest.cc +++ b/chrome/browser/media/router/discovery/dial/dial_service_impl_unittest.cc
@@ -10,6 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "chrome/browser/media/router/discovery/dial/dial_device_data.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/media/router/discovery/discovery_network_monitor.h b/chrome/browser/media/router/discovery/discovery_network_monitor.h index e466684..47c30ff 100644 --- a/chrome/browser/media/router/discovery/discovery_network_monitor.h +++ b/chrome/browser/media/router/discovery/discovery_network_monitor.h
@@ -12,7 +12,6 @@ #include "base/lazy_instance.h" #include "base/observer_list_threadsafe.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "chrome/browser/media/router/discovery/discovery_network_info.h" #include "net/base/ip_address.h" #include "services/network/public/cpp/network_connection_tracker.h"
diff --git a/chrome/browser/media/router/mojo/media_route_provider_util_win.cc b/chrome/browser/media/router/mojo/media_route_provider_util_win.cc index 04dfbb5..612f1e1 100644 --- a/chrome/browser/media/router/mojo/media_route_provider_util_win.cc +++ b/chrome/browser/media/router/mojo/media_route_provider_util_win.cc
@@ -9,7 +9,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc index 341c1cd..40d2fad 100644 --- a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc +++ b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/containers/contains.h" -#include "base/task/post_task.h" #include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/media/router/providers/cast/cast_activity_manager.h" #include "chrome/browser/media/router/providers/cast/cast_internal_message_util.h"
diff --git a/chrome/browser/media/webrtc/current_tab_desktop_media_list.cc b/chrome/browser/media/webrtc/current_tab_desktop_media_list.cc index 559b255..e876f1e 100644 --- a/chrome/browser/media/webrtc/current_tab_desktop_media_list.cc +++ b/chrome/browser/media/webrtc/current_tab_desktop_media_list.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/hash/hash.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h index 9c77a2d5..1150cf5 100644 --- a/chrome/browser/media/webrtc/desktop_media_list_base.h +++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/media/webrtc/desktop_media_list.h" #include "chrome/browser/media/webrtc/desktop_media_list_observer.h" #include "content/public/browser/desktop_media_id.h"
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.h b/chrome/browser/media/webrtc/native_desktop_media_list.h index 9078b12..4d5e5f0 100644 --- a/chrome/browser/media/webrtc/native_desktop_media_list.h +++ b/chrome/browser/media/webrtc/native_desktop_media_list.h
@@ -10,6 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chrome/browser/media/webrtc/desktop_media_list_base.h" #include "content/public/browser/desktop_media_id.h" #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/media/webrtc/tab_desktop_media_list.cc b/chrome/browser/media/webrtc/tab_desktop_media_list.cc index b0343728..f02d85bf 100644 --- a/chrome/browser/media/webrtc/tab_desktop_media_list.cc +++ b/chrome/browser/media/webrtc/tab_desktop_media_list.cc
@@ -10,8 +10,8 @@ #include "base/containers/adapters.h" #include "base/hash/hash.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "chrome/browser/media/webrtc/desktop_media_list_layout_config.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager_local.cc b/chrome/browser/media/webrtc/webrtc_event_log_manager_local.cc index d7fee010..cdb546e 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_manager_local.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_manager_local.cc
@@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader_impl_unittest.cc b/chrome/browser/media/webrtc/webrtc_event_log_uploader_impl_unittest.cc index d0a8bf5a..78794b9 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_uploader_impl_unittest.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader_impl_unittest.cc
@@ -14,6 +14,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/media/webrtc/webrtc_event_log_manager_common.h" #include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc index 843c632..96bc7f3e 100644 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -17,7 +17,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader_unittest.cc b/chrome/browser/media/webrtc/webrtc_log_uploader_unittest.cc index 91d30739..f7fc391 100644 --- a/chrome/browser/media/webrtc/webrtc_log_uploader_unittest.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader_unittest.cc
@@ -17,7 +17,6 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/webrtc/webrtc_log_util.cc b/chrome/browser/media/webrtc/webrtc_log_util.cc index 35a0a07..0db281f 100644 --- a/chrome/browser/media/webrtc/webrtc_log_util.cc +++ b/chrome/browser/media/webrtc/webrtc_log_util.cc
@@ -7,7 +7,6 @@ #include <vector> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/media/webrtc/webrtc_logging_controller.cc b/chrome/browser/media/webrtc/webrtc_logging_controller.cc index 9021cf7..2ed9e7df 100644 --- a/chrome/browser/media/webrtc/webrtc_logging_controller.cc +++ b/chrome/browser/media/webrtc/webrtc_logging_controller.cc
@@ -14,7 +14,6 @@ #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/supports_user_data.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/threading/sequenced_task_runner_handle.h" #include "build/build_config.h"
diff --git a/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.cc b/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.cc index 17050b6..1162c29 100644 --- a/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.cc +++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.cc
@@ -11,7 +11,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc index 38ed8f1..469ba45 100644 --- a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc +++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_thread.h" #include "third_party/zlib/zlib.h"
diff --git a/chrome/browser/media/webrtc/webrtc_text_log_handler.h b/chrome/browser/media/webrtc/webrtc_text_log_handler.h index f3b43f1..330cf78a 100644 --- a/chrome/browser/media/webrtc/webrtc_text_log_handler.h +++ b/chrome/browser/media/webrtc/webrtc_text_log_handler.h
@@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "chrome/browser/media/webrtc/webrtc_log_uploader.h" #include "net/base/network_interfaces.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h index a1fbbc539..e61e520 100644 --- a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h +++ b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h
@@ -11,6 +11,7 @@ #include "base/files/file.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h" #include "net/base/completion_once_callback.h" #include "storage/browser/file_system/file_stream_reader.h"
diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util.cc index 53bfadfa..c86a2c4 100644 --- a/chrome/browser/media_galleries/fileapi/native_media_file_util.cc +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util.cc
@@ -14,7 +14,6 @@ #include "base/files/file_util.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
diff --git a/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.cc b/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.cc index f60faa3..41ebefd 100644 --- a/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.cc +++ b/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.cc
@@ -15,7 +15,6 @@ #include "base/containers/contains.h" #include "base/lazy_instance.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc index adcb34d..9122a34 100644 --- a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc +++ b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc
@@ -13,7 +13,6 @@ #include "base/files/file.h" #include "base/location.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index d42b5b5..c26b595 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc
@@ -19,7 +19,6 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/threading/thread_restrictions.h" #include "base/values.h"
diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc index c5dae91..de48e51c 100644 --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.cc
@@ -21,7 +21,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc index 64f7002..e4fa21ef 100644 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -35,6 +35,7 @@ #include "base/threading/platform_thread.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc index a60a8007..4ce9128 100644 --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
@@ -15,7 +15,6 @@ #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/metrics/chromeos_metrics_provider.cc b/chrome/browser/metrics/chromeos_metrics_provider.cc index 53528e6a..e084f28 100644 --- a/chrome/browser/metrics/chromeos_metrics_provider.cc +++ b/chrome/browser/metrics/chromeos_metrics_provider.cc
@@ -24,7 +24,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/sys_byteorder.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h"
diff --git a/chrome/browser/metrics/extensions_metrics_provider_unittest.cc b/chrome/browser/metrics/extensions_metrics_provider_unittest.cc index d12d86a..cc67736a 100644 --- a/chrome/browser/metrics/extensions_metrics_provider_unittest.cc +++ b/chrome/browser/metrics/extensions_metrics_provider_unittest.cc
@@ -14,6 +14,7 @@ #include "base/files/file_path.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service_test_base.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/metrics/google_update_metrics_provider_win.cc b/chrome/browser/metrics/google_update_metrics_provider_win.cc index faf1b96..3821cac 100644 --- a/chrome/browser/metrics/google_update_metrics_provider_win.cc +++ b/chrome/browser/metrics/google_update_metrics_provider_win.cc
@@ -8,7 +8,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/metrics_hashes.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/metrics/google_update_metrics_provider_win.h b/chrome/browser/metrics/google_update_metrics_provider_win.h index f4438da..440a343 100644 --- a/chrome/browser/metrics/google_update_metrics_provider_win.h +++ b/chrome/browser/metrics/google_update_metrics_provider_win.h
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/installer/util/google_update_settings.h" #include "components/metrics/metrics_provider.h"
diff --git a/chrome/browser/metrics/network_quality_estimator_provider_impl.cc b/chrome/browser/metrics/network_quality_estimator_provider_impl.cc index a522c3e..4a65715 100644 --- a/chrome/browser/metrics/network_quality_estimator_provider_impl.cc +++ b/chrome/browser/metrics/network_quality_estimator_provider_impl.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/metrics/network_quality_estimator_provider_impl.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h"
diff --git a/chrome/browser/metrics/oom/out_of_memory_reporter_unittest.cc b/chrome/browser/metrics/oom/out_of_memory_reporter_unittest.cc index 8eff477b..2e738b2 100644 --- a/chrome/browser/metrics/oom/out_of_memory_reporter_unittest.cc +++ b/chrome/browser/metrics/oom/out_of_memory_reporter_unittest.cc
@@ -18,7 +18,6 @@ #include "base/path_service.h" #include "base/process/kill.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/simple_test_tick_clock.h" #include "build/build_config.h" #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/metrics/perf/metric_collector_unittest.cc b/chrome/browser/metrics/perf/metric_collector_unittest.cc index 9ec29d0e..3caaed8 100644 --- a/chrome/browser/metrics/perf/metric_collector_unittest.cc +++ b/chrome/browser/metrics/perf/metric_collector_unittest.cc
@@ -12,7 +12,6 @@ #include <vector> #include "base/memory/scoped_refptr.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/metrics/perf/perf_events_collector.cc b/chrome/browser/metrics/perf/perf_events_collector.cc index d1de763d..e947fa9 100644 --- a/chrome/browser/metrics/perf/perf_events_collector.cc +++ b/chrome/browser/metrics/perf/perf_events_collector.cc
@@ -16,7 +16,6 @@ #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/metrics/perf/perf_events_collector_unittest.cc b/chrome/browser/metrics/perf/perf_events_collector_unittest.cc index 143c392..ec7c462 100644 --- a/chrome/browser/metrics/perf/perf_events_collector_unittest.cc +++ b/chrome/browser/metrics/perf/perf_events_collector_unittest.cc
@@ -16,7 +16,6 @@ #include "base/memory/ptr_util.h" #include "base/metrics/field_trial.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/metrics/perf/perf_output.cc b/chrome/browser/metrics/perf/perf_output.cc index b878a4e..2e812d943 100644 --- a/chrome/browser/metrics/perf/perf_output.cc +++ b/chrome/browser/metrics/perf/perf_output.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chromeos/dbus/debug_daemon/debug_daemon_client.h" #include "dbus/bus.h"
diff --git a/chrome/browser/metrics/perf/perf_output_unittest.cc b/chrome/browser/metrics/perf/perf_output_unittest.cc index 17b8289..fd49f44 100644 --- a/chrome/browser/metrics/perf/perf_output_unittest.cc +++ b/chrome/browser/metrics/perf/perf_output_unittest.cc
@@ -11,7 +11,6 @@ #include "base/files/file.h" #include "base/posix/eintr_wrapper.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_restrictions.h" #include "chromeos/dbus/debug_daemon/fake_debug_daemon_client.h"
diff --git a/chrome/browser/metrics/power/coalition_resource_usage_provider_mac.h b/chrome/browser/metrics/power/coalition_resource_usage_provider_mac.h index d15a20cb..65ea114 100644 --- a/chrome/browser/metrics/power/coalition_resource_usage_provider_mac.h +++ b/chrome/browser/metrics/power/coalition_resource_usage_provider_mac.h
@@ -11,6 +11,7 @@ #include "base/dcheck_is_on.h" #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "components/power_metrics/energy_impact_mac.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/navigation_predictor/navigation_predictor.h b/chrome/browser/navigation_predictor/navigation_predictor.h index 21fb739..dab9f48 100644 --- a/chrome/browser/navigation_predictor/navigation_predictor.h +++ b/chrome/browser/navigation_predictor/navigation_predictor.h
@@ -12,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "content/public/browser/document_service.h" #include "content/public/browser/visibility.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chrome/browser/navigation_predictor/navigation_predictor_keyed_service.h b/chrome/browser/navigation_predictor/navigation_predictor_keyed_service.h index f0efe13c..1d6cfa3 100644 --- a/chrome/browser/navigation_predictor/navigation_predictor_keyed_service.h +++ b/chrome/browser/navigation_predictor/navigation_predictor_keyed_service.h
@@ -12,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "chrome/browser/navigation_predictor/search_engine_preconnector.h" #include "components/keyed_service/core/keyed_service.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl.cc b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl.cc index 4107142..bf517ce 100644 --- a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl.cc +++ b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl.cc
@@ -12,7 +12,6 @@ #include "base/json/values_util.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl.h b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl.h index 8ad6389..f65594f 100644 --- a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl.h +++ b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl.h
@@ -9,6 +9,7 @@ #include "base/containers/queue.h" #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage.h" #include "components/leveldb_proto/public/proto_database.h"
diff --git a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl_unittest.cc b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl_unittest.cc index 6b6045f..0f11a09 100644 --- a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl_unittest.cc +++ b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl_unittest.cc
@@ -10,6 +10,7 @@ #include "base/json/values_util.h" #include "base/run_loop.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "chrome/browser/nearby_sharing/certificates/constants.h" #include "chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage_impl.h" #include "chrome/browser/nearby_sharing/certificates/test_util.h"
diff --git a/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.h b/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.h index a745bf04..e76bdf6 100644 --- a/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.h +++ b/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.h
@@ -12,6 +12,7 @@ #include "base/containers/flat_set.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_low_energy_scan_session.h"
diff --git a/chrome/browser/nearby_sharing/nearby_connections_manager_impl.cc b/chrome/browser/nearby_sharing/nearby_connections_manager_impl.cc index 8325908..f6f73ea53 100644 --- a/chrome/browser/nearby_sharing/nearby_connections_manager_impl.cc +++ b/chrome/browser/nearby_sharing/nearby_connections_manager_impl.cc
@@ -10,7 +10,6 @@ #include "base/files/file_util.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/unguessable_token.h" #include "chrome/browser/nearby_sharing/common/nearby_share_features.h" #include "chrome/browser/nearby_sharing/constants.h"
diff --git a/chrome/browser/nearby_sharing/nearby_sharing_service_impl.cc b/chrome/browser/nearby_sharing/nearby_sharing_service_impl.cc index 18a59e0c..cbe0315 100644 --- a/chrome/browser/nearby_sharing/nearby_sharing_service_impl.cc +++ b/chrome/browser/nearby_sharing/nearby_sharing_service_impl.cc
@@ -22,7 +22,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.h b/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.h index de6f64e6..14a3efb8 100644 --- a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.h +++ b/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.h
@@ -9,6 +9,7 @@ #include "base/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "google_apis/gaia/google_service_auth_error.h"
diff --git a/chrome/browser/net/external_protocol_browsertest.cc b/chrome/browser/net/external_protocol_browsertest.cc index 599446c..ef62b6c 100644 --- a/chrome/browser/net/external_protocol_browsertest.cc +++ b/chrome/browser/net/external_protocol_browsertest.cc
@@ -12,7 +12,6 @@ #include "base/run_loop.h" #include "base/sequence_checker.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/net/file_downloader.cc b/chrome/browser/net/file_downloader.cc index 5acc728b..03f1b58 100644 --- a/chrome/browser/net/file_downloader.cc +++ b/chrome/browser/net/file_downloader.cc
@@ -8,7 +8,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/net/load_timing_browsertest.cc b/chrome/browser/net/load_timing_browsertest.cc index a28b5f52..349bd40 100644 --- a/chrome/browser/net/load_timing_browsertest.cc +++ b/chrome/browser/net/load_timing_browsertest.cc
@@ -9,7 +9,6 @@ #include "base/compiler_specific.h" #include "base/location.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/net/netinfo_network_quality_estimator_holdback_browsertest.cc b/chrome/browser/net/netinfo_network_quality_estimator_holdback_browsertest.cc index 0244415..7ef99fa 100644 --- a/chrome/browser/net/netinfo_network_quality_estimator_holdback_browsertest.cc +++ b/chrome/browser/net/netinfo_network_quality_estimator_holdback_browsertest.cc
@@ -10,7 +10,6 @@ #include "base/check.h" #include "base/notreached.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_impl.h"
diff --git a/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc b/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc index 4dea50e..7ab33fdf 100644 --- a/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc +++ b/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc
@@ -15,7 +15,6 @@ #include "base/process/memory.h" #include "base/run_loop.h" #include "base/task/deferred_sequenced_task_runner.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc index 70508fd0..29db45d 100644 --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc
@@ -18,7 +18,6 @@ #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc index e340c32e..5659b53f 100644 --- a/chrome/browser/net/proxy_service_factory.cc +++ b/chrome/browser/net/proxy_service_factory.cc
@@ -6,7 +6,6 @@ #include <utility> -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc index b7c4568..87e84e5 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc
@@ -18,7 +18,6 @@ #include "base/process/process_handle.h" #include "base/sequence_checker.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc index 1702d22..969788e 100644 --- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc +++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
@@ -11,7 +11,6 @@ #include "base/location.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "build/branding_buildflags.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc index d3546c3..046a0e7 100644 --- a/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc +++ b/chrome/browser/net/trial_comparison_cert_verifier_controller_unittest.cc
@@ -10,7 +10,6 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/scoped_feature_list.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/new_tab_page/modules/photos/photos_service.h b/chrome/browser/new_tab_page/modules/photos/photos_service.h index 59cfc4a5..70be93c 100644 --- a/chrome/browser/new_tab_page/modules/photos/photos_service.h +++ b/chrome/browser/new_tab_page/modules/photos/photos_service.h
@@ -10,6 +10,7 @@ #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "chrome/browser/new_tab_page/modules/photos/photos.mojom.h" #include "chrome/browser/profiles/profile.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/notifications/notification_channels_provider_android.h b/chrome/browser/notifications/notification_channels_provider_android.h index 86fdf99c..075ce29 100644 --- a/chrome/browser/notifications/notification_channels_provider_android.h +++ b/chrome/browser/notifications/notification_channels_provider_android.h
@@ -14,6 +14,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "components/content_settings/core/browser/content_settings_observer.h" #include "components/content_settings/core/browser/content_settings_rule.h" #include "components/content_settings/core/browser/user_modifiable_provider.h"
diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc index 225609e..83b33e3 100644 --- a/chrome/browser/notifications/platform_notification_service_impl.cc +++ b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -13,7 +13,6 @@ #include "base/feature_list.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/notifications/scheduler/internal/background_task_coordinator.cc b/chrome/browser/notifications/scheduler/internal/background_task_coordinator.cc index 35582e2..5fa20040 100644 --- a/chrome/browser/notifications/scheduler/internal/background_task_coordinator.cc +++ b/chrome/browser/notifications/scheduler/internal/background_task_coordinator.cc
@@ -11,6 +11,7 @@ #include "base/cxx17_backports.h" #include "base/memory/raw_ptr.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "chrome/browser/notifications/scheduler/internal/impression_types.h" #include "chrome/browser/notifications/scheduler/internal/notification_entry.h" #include "chrome/browser/notifications/scheduler/internal/scheduler_config.h"
diff --git a/chrome/browser/notifications/scheduler/internal/display_decider_unittest.cc b/chrome/browser/notifications/scheduler/internal/display_decider_unittest.cc index f3195aef..43c7894 100644 --- a/chrome/browser/notifications/scheduler/internal/display_decider_unittest.cc +++ b/chrome/browser/notifications/scheduler/internal/display_decider_unittest.cc
@@ -11,6 +11,7 @@ #include "base/strings/stringprintf.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "chrome/browser/notifications/scheduler/internal/notification_entry.h" #include "chrome/browser/notifications/scheduler/internal/scheduler_config.h" #include "chrome/browser/notifications/scheduler/public/notification_scheduler_types.h"
diff --git a/chrome/browser/notifications/scheduler/internal/png_icon_converter_impl.cc b/chrome/browser/notifications/scheduler/internal/png_icon_converter_impl.cc index 9bc1307f..925a00f 100644 --- a/chrome/browser/notifications/scheduler/internal/png_icon_converter_impl.cc +++ b/chrome/browser/notifications/scheduler/internal/png_icon_converter_impl.cc
@@ -8,7 +8,6 @@ #include <utility> #include "base/base64.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/notifications/scheduler/internal/icon_entry.h"
diff --git a/chrome/browser/notifications/scheduler/internal/proto_conversion_unittest.cc b/chrome/browser/notifications/scheduler/internal/proto_conversion_unittest.cc index 959b2555..b1be1f7 100644 --- a/chrome/browser/notifications/scheduler/internal/proto_conversion_unittest.cc +++ b/chrome/browser/notifications/scheduler/internal/proto_conversion_unittest.cc
@@ -10,6 +10,7 @@ #include "base/check.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/notifications/scheduler/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.cc b/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.cc index b0504f7..d76545a 100644 --- a/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.cc +++ b/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.cc
@@ -15,7 +15,6 @@ #include "base/containers/contains.h" #include "base/guid.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/notifications/scheduler/internal/icon_store.h" #include "chrome/browser/notifications/scheduler/internal/notification_entry.h"
diff --git a/chrome/browser/notifications/scheduler/internal/scheduler_utils.cc b/chrome/browser/notifications/scheduler/internal/scheduler_utils.cc index 765298b..83638509 100644 --- a/chrome/browser/notifications/scheduler/internal/scheduler_utils.cc +++ b/chrome/browser/notifications/scheduler/internal/scheduler_utils.cc
@@ -7,8 +7,8 @@ #include <utility> #include "base/containers/circular_deque.h" -#include "base/task/post_task.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "chrome/browser/notifications/scheduler/internal/impression_types.h" #include "chrome/browser/notifications/scheduler/internal/scheduler_config.h" #include "ui/gfx/codec/png_codec.h"
diff --git a/chrome/browser/notifications/scheduler/internal/scheduler_utils_unittest.cc b/chrome/browser/notifications/scheduler/internal/scheduler_utils_unittest.cc index 2ddfe07..e16e804 100644 --- a/chrome/browser/notifications/scheduler/internal/scheduler_utils_unittest.cc +++ b/chrome/browser/notifications/scheduler/internal/scheduler_utils_unittest.cc
@@ -10,6 +10,7 @@ #include "base/containers/circular_deque.h" #include "base/guid.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "chrome/browser/notifications/scheduler/internal/impression_types.h" #include "chrome/browser/notifications/scheduler/test/fake_clock.h" #include "chrome/browser/notifications/scheduler/test/test_utils.h"
diff --git a/chrome/browser/notifications/scheduler/internal/stats.cc b/chrome/browser/notifications/scheduler/internal/stats.cc index c81c9dd0..0707a142 100644 --- a/chrome/browser/notifications/scheduler/internal/stats.cc +++ b/chrome/browser/notifications/scheduler/internal/stats.cc
@@ -8,6 +8,7 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" +#include "base/time/time.h" #include "chrome/browser/notifications/scheduler/public/notification_data.h" namespace notifications {
diff --git a/chrome/browser/notifications/scheduler/schedule_service_factory_helper.cc b/chrome/browser/notifications/scheduler/schedule_service_factory_helper.cc index 6ab99dac..80d8dc3 100644 --- a/chrome/browser/notifications/scheduler/schedule_service_factory_helper.cc +++ b/chrome/browser/notifications/scheduler/schedule_service_factory_helper.cc
@@ -7,7 +7,6 @@ #include <utility> #include <vector> -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/time/default_clock.h"
diff --git a/chrome/browser/notifications/scheduler/test/test_utils.h b/chrome/browser/notifications/scheduler/test/test_utils.h index aeceb033..0bfe0a9 100644 --- a/chrome/browser/notifications/scheduler/test/test_utils.h +++ b/chrome/browser/notifications/scheduler/test/test_utils.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/time/time.h" #include "chrome/browser/notifications/scheduler/internal/impression_history_tracker.h" #include "chrome/browser/notifications/scheduler/internal/impression_types.h" #include "chrome/browser/notifications/scheduler/public/notification_scheduler_types.h"
diff --git a/chrome/browser/notifications/win/notification_template_builder_unittest.cc b/chrome/browser/notifications/win/notification_template_builder_unittest.cc index 9bcb423..698a0ad 100644 --- a/chrome/browser/notifications/win/notification_template_builder_unittest.cc +++ b/chrome/browser/notifications/win/notification_template_builder_unittest.cc
@@ -12,6 +12,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "chrome/browser/notifications/win/fake_notification_image_retainer.h" #include "chrome/browser/notifications/win/notification_launch_id.h" #include "chrome/common/chrome_features.h"
diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrome/browser/offline_pages/android/offline_page_bridge.cc index ae77d20..4505fde6 100644 --- a/chrome/browser/offline_pages/android/offline_page_bridge.cc +++ b/chrome/browser/offline_pages/android/offline_page_bridge.cc
@@ -21,7 +21,6 @@ #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "chrome/android/chrome_jni_headers/OfflinePageBridge_jni.h"
diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc b/chrome/browser/offline_pages/android/offline_page_model_factory.cc index c71de710..7b3e3b9 100644 --- a/chrome/browser/offline_pages/android/offline_page_model_factory.cc +++ b/chrome/browser/offline_pages/android/offline_page_model_factory.cc
@@ -12,7 +12,6 @@ #include "base/files/file_path.h" #include "base/memory/singleton.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/time/default_clock.h"
diff --git a/chrome/browser/offline_pages/android/request_coordinator_factory.cc b/chrome/browser/offline_pages/android/request_coordinator_factory.cc index 02145a3..9158a73 100644 --- a/chrome/browser/offline_pages/android/request_coordinator_factory.cc +++ b/chrome/browser/offline_pages/android/request_coordinator_factory.cc
@@ -8,7 +8,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/singleton.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/offline_pages/background_loader_offliner.h b/chrome/browser/offline_pages/background_loader_offliner.h index ace3384..51df4d6 100644 --- a/chrome/browser/offline_pages/background_loader_offliner.h +++ b/chrome/browser/offline_pages/background_loader_offliner.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/offline_pages/resource_loading_observer.h" #include "components/offline_pages/content/background_loader/background_loader_contents.h"
diff --git a/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc b/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc index 1714ea8..c1e6875 100644 --- a/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc +++ b/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc
@@ -15,7 +15,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/offline_pages/offline_page_utils.h"
diff --git a/chrome/browser/offline_pages/offline_page_request_handler.cc b/chrome/browser/offline_pages/offline_page_request_handler.cc index 9e2f8dbf..a0d702a4 100644 --- a/chrome/browser/offline_pages/offline_page_request_handler.cc +++ b/chrome/browser/offline_pages/offline_page_request_handler.cc
@@ -15,7 +15,6 @@ #include "base/notreached.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/offline_pages/offline_page_utils.cc b/chrome/browser/offline_pages/offline_page_utils.cc index 66dfd7e..288ffbe 100644 --- a/chrome/browser/offline_pages/offline_page_utils.cc +++ b/chrome/browser/offline_pages/offline_page_utils.cc
@@ -14,7 +14,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl.h b/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl.h index 6d760a4..096a66b 100644 --- a/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl.h +++ b/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl.h
@@ -7,6 +7,7 @@ #include "base/memory/raw_ptr.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "components/offline_pages/core/prefetch/offline_metrics_collector.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h"
diff --git a/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc b/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc index f022a0b..ce0175d 100644 --- a/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc +++ b/chrome/browser/offline_pages/prefetch/offline_metrics_collector_impl_unittest.cc
@@ -9,6 +9,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "chrome/common/pref_names.h" #include "components/offline_pages/core/offline_store_utils.h" #include "components/offline_pages/core/test_scoped_offline_clock.h"
diff --git a/chrome/browser/optimization_guide/android/optimization_guide_tab_url_provider_android.h b/chrome/browser/optimization_guide/android/optimization_guide_tab_url_provider_android.h index de17f3d..452a4863 100644 --- a/chrome/browser/optimization_guide/android/optimization_guide_tab_url_provider_android.h +++ b/chrome/browser/optimization_guide/android/optimization_guide_tab_url_provider_android.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_OPTIMIZATION_GUIDE_ANDROID_OPTIMIZATION_GUIDE_TAB_URL_PROVIDER_ANDROID_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "components/optimization_guide/core/tab_url_provider.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/optimization_guide/android/optimization_guide_tab_url_provider_android_unittest.cc b/chrome/browser/optimization_guide/android/optimization_guide_tab_url_provider_android_unittest.cc index 823fe00..9c5b995 100644 --- a/chrome/browser/optimization_guide/android/optimization_guide_tab_url_provider_android_unittest.cc +++ b/chrome/browser/optimization_guide/android/optimization_guide_tab_url_provider_android_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/optimization_guide/android/optimization_guide_tab_url_provider_android.h" +#include "base/time/time.h" #include "chrome/browser/android/tab_android.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/android/tab_model/tab_model.h"
diff --git a/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc b/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc index 5d5c10d..9f3b088 100644 --- a/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc +++ b/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc
@@ -14,7 +14,6 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/optimization_guide/optimization_guide_tab_url_provider.cc b/chrome/browser/optimization_guide/optimization_guide_tab_url_provider.cc index b291e38..79d9d66 100644 --- a/chrome/browser/optimization_guide/optimization_guide_tab_url_provider.cc +++ b/chrome/browser/optimization_guide/optimization_guide_tab_url_provider.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/optimization_guide/optimization_guide_tab_url_provider.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer_unittest.cc index 5f22cb8..be04ff2 100644 --- a/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer_unittest.cc +++ b/chrome/browser/page_load_metrics/observers/android_page_load_metrics_observer_unittest.cc
@@ -6,6 +6,7 @@ #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h" #include "chrome/browser/profiles/profile.h" #include "components/page_load_metrics/browser/page_load_tracker.h"
diff --git a/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h index 4e97f598..62b03ce 100644 --- a/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h +++ b/chrome/browser/page_load_metrics/observers/core/amp_page_load_metrics_observer.h
@@ -9,6 +9,7 @@ #include <memory> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "components/page_load_metrics/browser/layout_shift_normalization.h" #include "components/page_load_metrics/browser/page_load_metrics_observer.h" #include "components/page_load_metrics/browser/responsiveness_metrics_normalization.h"
diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h index d8f5ed56..d4a22bb 100644 --- a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h +++ b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_FROM_GWS_PAGE_LOAD_METRICS_OBSERVER_H_ #define CHROME_BROWSER_PAGE_LOAD_METRICS_OBSERVERS_FROM_GWS_PAGE_LOAD_METRICS_OBSERVER_H_ +#include "base/time/time.h" #include "components/google/core/common/google_util.h" #include "components/page_load_metrics/browser/page_load_metrics_observer.h" #include "services/metrics/public/cpp/ukm_source.h"
diff --git a/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc index 0a43f65..3ea52fb 100644 --- a/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc +++ b/chrome/browser/page_load_metrics/observers/security_state_page_load_metrics_observer_browsertest.cc
@@ -8,7 +8,6 @@ #include "base/feature_list.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/page_load_metrics/observers/signed_exchange_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/signed_exchange_page_load_metrics_observer.cc index 7fe190a..3f6f5b6 100644 --- a/chrome/browser/page_load_metrics/observers/signed_exchange_page_load_metrics_observer.cc +++ b/chrome/browser/page_load_metrics/observers/signed_exchange_page_load_metrics_observer.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/page_load_metrics/observers/signed_exchange_page_load_metrics_observer.h" +#include "base/time/time.h" #include "components/page_load_metrics/browser/page_load_metrics_util.h" #include "content/public/browser/navigation_handle.h" #include "services/metrics/public/cpp/ukm_builders.h"
diff --git a/chrome/browser/paint_preview/services/paint_preview_tab_service.cc b/chrome/browser/paint_preview/services/paint_preview_tab_service.cc index 6f63ccae..808bf5a 100644 --- a/chrome/browser/paint_preview/services/paint_preview_tab_service.cc +++ b/chrome/browser/paint_preview/services/paint_preview_tab_service.cc
@@ -12,7 +12,6 @@ #include "base/memory/memory_pressure_monitor.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "build/build_config.h" #include "chrome/browser/paint_preview/services/paint_preview_tab_service_file_mixin.h"
diff --git a/chrome/browser/password_manager/android/password_ui_view_android.cc b/chrome/browser/password_manager/android/password_ui_view_android.cc index cbb1cb3f..6ebc331 100644 --- a/chrome/browser/password_manager/android/password_ui_view_android.cc +++ b/chrome/browser/password_manager/android/password_ui_view_android.cc
@@ -21,7 +21,6 @@ #include "base/metrics/field_trial.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "chrome/android/chrome_jni_headers/PasswordUIView_jni.h"
diff --git a/chrome/browser/password_manager/password_manager_util_win.cc b/chrome/browser/password_manager/password_manager_util_win.cc index 785266b..2ea00f0 100644 --- a/chrome/browser/password_manager/password_manager_util_win.cc +++ b/chrome/browser/password_manager/password_manager_util_win.cc
@@ -16,12 +16,13 @@ #include <security.h> #undef SECURITY_WIN32 -#include "chrome/browser/password_manager/password_manager_util_win.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/hang_watcher.h" #include "base/threading/scoped_thread_priority.h" +#include "base/time/time.h" #include "base/win/win_util.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/password_manager/password_manager_util_win.h" #include "chrome/grit/chromium_strings.h" #include "components/password_manager/core/browser/password_manager.h" #include "components/password_manager/core/common/password_manager_pref_names.h"
diff --git a/chrome/browser/performance_manager/observers/isolation_context_metrics.h b/chrome/browser/performance_manager/observers/isolation_context_metrics.h index 246c75b..45ddbdc 100644 --- a/chrome/browser/performance_manager/observers/isolation_context_metrics.h +++ b/chrome/browser/performance_manager/observers/isolation_context_metrics.h
@@ -9,6 +9,7 @@ #include "base/containers/small_map.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/performance_manager/public/graph/frame_node.h" #include "components/performance_manager/public/graph/graph.h"
diff --git a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc index 95224df..21db467 100644 --- a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc +++ b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_unittest.cc
@@ -15,7 +15,6 @@ #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h" #include "chrome/browser/performance_manager/persistence/site_data/unittest_utils.h"
diff --git a/chrome/browser/performance_manager/policies/background_tab_loading_policy.cc b/chrome/browser/performance_manager/policies/background_tab_loading_policy.cc index f70d761..2356fd66 100644 --- a/chrome/browser/performance_manager/policies/background_tab_loading_policy.cc +++ b/chrome/browser/performance_manager/policies/background_tab_loading_policy.cc
@@ -94,20 +94,9 @@ BackgroundTabLoadingPolicy::PageNodeAndNotificationPermission> page_node_and_notification_permission_vector, performance_manager::Graph* graph) { - std::vector<PageNode*> page_nodes; - page_nodes.reserve( - page_node_and_notification_permission_vector.size()); - for (auto page_node_and_notification_permission : - page_node_and_notification_permission_vector) { - // If the PageNode has been deleted before - // BackgroundTabLoading starts restoring it, then there - // is no need to restore it. - if (PageNode* raw_page = - page_node_and_notification_permission.page_node.get()) - page_nodes.push_back(raw_page); - } BackgroundTabLoadingPolicy::GetInstance() - ->ScheduleLoadForRestoredTabs(std::move(page_nodes)); + ->ScheduleLoadForRestoredTabs( + std::move(page_node_and_notification_permission_vector)); }, std::move(page_node_and_notification_permission_vector))); } @@ -208,15 +197,22 @@ } void BackgroundTabLoadingPolicy::ScheduleLoadForRestoredTabs( - std::vector<PageNode*> page_nodes) { - for (auto* page_node : page_nodes) { + std::vector<BackgroundTabLoadingPolicy::PageNodeAndNotificationPermission> + page_node_and_permission_vector) { + for (auto page_node_and_permission : page_node_and_permission_vector) { // Put the |page_node| in the queue for loading. - DCHECK(!FindPageNodeToLoadData(page_node)); - DCHECK( - TabPropertiesDecorator::Data::FromPageNode(page_node)->IsInTabStrip()); + PageNode* page_node = page_node_and_permission.page_node.get(); + if (page_node) { + DCHECK(!FindPageNodeToLoadData(page_node)); + DCHECK(TabPropertiesDecorator::Data::FromPageNode(page_node) + ->IsInTabStrip()); - page_nodes_to_load_.push_back( - std::make_unique<PageNodeToLoadData>(page_node)); + page_nodes_to_load_.push_back( + std::make_unique<PageNodeToLoadData>(page_node)); + + if (page_node_and_permission.has_notification_permission) + page_nodes_to_load_.back()->used_in_bg = true; + } } for (auto& page_node_to_load_data : page_nodes_to_load_) { @@ -326,13 +322,13 @@ // A tab can't play audio until it has been visible at least once so // UsesAudioInBackground() is ignored. - DCHECK(!page_node_to_load_data->used_in_bg.has_value()); - page_node_to_load_data->used_in_bg = - reader ? (reader->UpdatesFaviconInBackground() != - SiteFeatureUsage::kSiteFeatureNotInUse || - reader->UpdatesTitleInBackground() != - SiteFeatureUsage::kSiteFeatureNotInUse) - : false; + if (!page_node_to_load_data->used_in_bg && reader) { + page_node_to_load_data->used_in_bg = + (reader->UpdatesFaviconInBackground() != + SiteFeatureUsage::kSiteFeatureNotInUse || + reader->UpdatesTitleInBackground() != + SiteFeatureUsage::kSiteFeatureNotInUse); + } // TODO(crbug.com/1071100): Set `used_in_bg` if the tab has the notification // permission.
diff --git a/chrome/browser/performance_manager/policies/background_tab_loading_policy.h b/chrome/browser/performance_manager/policies/background_tab_loading_policy.h index 7aff921..3311948 100644 --- a/chrome/browser/performance_manager/policies/background_tab_loading_policy.h +++ b/chrome/browser/performance_manager/policies/background_tab_loading_policy.h
@@ -65,8 +65,11 @@ bool has_notification_permission; }; - // Schedules the PageNodes in |page_nodes| to be loaded when appropriate. - void ScheduleLoadForRestoredTabs(std::vector<PageNode*> page_nodes); + // Schedules the PageNodes in |page_node_and_permission_vector| to be loaded + // when appropriate. + void ScheduleLoadForRestoredTabs( + std::vector<PageNodeAndNotificationPermission> + page_node_and_permission_vector); void SetMockLoaderForTesting(std::unique_ptr<mechanism::PageLoader> loader); void SetMaxSimultaneousLoadsForTesting(size_t loading_slots);
diff --git a/chrome/browser/performance_manager/policies/background_tab_loading_policy_unittest.cc b/chrome/browser/performance_manager/policies/background_tab_loading_policy_unittest.cc index d4a0e25..3fb0429 100644 --- a/chrome/browser/performance_manager/policies/background_tab_loading_policy_unittest.cc +++ b/chrome/browser/performance_manager/policies/background_tab_loading_policy_unittest.cc
@@ -24,6 +24,9 @@ namespace policies { +using PageNodeAndNotificationPermission = + BackgroundTabLoadingPolicy::PageNodeAndNotificationPermission; + namespace { // Mock version of a performance_manager::mechanism::PageLoader. @@ -146,24 +149,53 @@ raw_ptr<MockPageLoader> mock_loader_; }; -TEST_F(BackgroundTabLoadingPolicyTest, ScheduleLoadForRestoredTabs) { +TEST_F(BackgroundTabLoadingPolicyTest, + ScheduleLoadForRestoredTabsWithoutNotificationPermission) { std::vector< performance_manager::TestNodeWrapper<performance_manager::PageNodeImpl>> page_nodes; - std::vector<PageNode*> raw_page_nodes; + std::vector<PageNodeAndNotificationPermission> to_load; // Create vector of PageNode to restore. for (int i = 0; i < 4; i++) { page_nodes.push_back(CreateNode<performance_manager::PageNodeImpl>()); - raw_page_nodes.push_back(page_nodes.back().get()); - EXPECT_CALL(*loader(), LoadPageNode(raw_page_nodes.back())); + PageNodeAndNotificationPermission page_node_and_notification_permission( + page_nodes.back().get()->GetWeakPtr(), false); + to_load.push_back(page_node_and_notification_permission); + EXPECT_CALL(*loader(), LoadPageNode(to_load.back().page_node.get())); // Set |is_tab| property as this is a requirement to pass the PageNode to // ScheduleLoadForRestoredTabs(). - TabPropertiesDecorator::SetIsTabForTesting(raw_page_nodes.back(), true); + TabPropertiesDecorator::SetIsTabForTesting(to_load.back().page_node.get(), + true); } - policy()->ScheduleLoadForRestoredTabs(raw_page_nodes); + policy()->ScheduleLoadForRestoredTabs(to_load); + task_env().RunUntilIdle(); +} + +TEST_F(BackgroundTabLoadingPolicyTest, + ScheduleLoadForRestoredTabsWithNotificationPermission) { + std::vector< + performance_manager::TestNodeWrapper<performance_manager::PageNodeImpl>> + page_nodes; + std::vector<PageNodeAndNotificationPermission> to_load; + + // Create vector of PageNode to restore. + for (int i = 0; i < 4; i++) { + page_nodes.push_back(CreateNode<performance_manager::PageNodeImpl>()); + PageNodeAndNotificationPermission page_node_and_notification_permission( + page_nodes.back().get()->GetWeakPtr(), true); + to_load.push_back(page_node_and_notification_permission); + EXPECT_CALL(*loader(), LoadPageNode(to_load.back().page_node.get())); + + // Set |is_tab| property as this is a requirement to pass the PageNode to + // ScheduleLoadForRestoredTabs(). + TabPropertiesDecorator::SetIsTabForTesting(to_load.back().page_node.get(), + true); + } + + policy()->ScheduleLoadForRestoredTabs(to_load); task_env().RunUntilIdle(); } @@ -172,27 +204,30 @@ std::vector< performance_manager::TestNodeWrapper<performance_manager::PageNodeImpl>> page_nodes; - std::vector<PageNode*> raw_page_nodes; + std::vector<PageNodeAndNotificationPermission> to_load; // Create vector of PageNode to restore. for (int i = 0; i < 4; i++) { page_nodes.push_back(CreateNode<performance_manager::PageNodeImpl>()); - raw_page_nodes.push_back(page_nodes.back().get()); + PageNodeAndNotificationPermission page_node_and_notification_permission( + page_nodes.back().get()->GetWeakPtr(), false); + to_load.push_back(page_node_and_notification_permission); // Set |is_tab| property as this is a requirement to pass the PageNode to // ScheduleLoadForRestoredTabs(). - TabPropertiesDecorator::SetIsTabForTesting(raw_page_nodes.back(), true); + TabPropertiesDecorator::SetIsTabForTesting(to_load.back().page_node.get(), + true); } PageNodeImpl* page_node_impl = page_nodes[0].get(); - EXPECT_CALL(*loader(), LoadPageNode(raw_page_nodes[0])); - EXPECT_CALL(*loader(), LoadPageNode(raw_page_nodes[1])); + EXPECT_CALL(*loader(), LoadPageNode(to_load[0].page_node.get())); + EXPECT_CALL(*loader(), LoadPageNode(to_load[1].page_node.get())); // Use 2 loading slots, which means only 2 of the PageNodes should immediately // be scheduled to load. policy()->SetMaxSimultaneousLoadsForTesting(2); - policy()->ScheduleLoadForRestoredTabs(raw_page_nodes); + policy()->ScheduleLoadForRestoredTabs(to_load); task_env().RunUntilIdle(); testing::Mock::VerifyAndClear(loader()); @@ -201,7 +236,7 @@ // The policy should allow one more PageNode to load after a PageNode finishes // loading. - EXPECT_CALL(*loader(), LoadPageNode(raw_page_nodes[2])); + EXPECT_CALL(*loader(), LoadPageNode(to_load[2].page_node.get())); // Simulate load finish of a PageNode. page_node_impl->SetLoadingState(PageNode::LoadingState::kLoadedIdle); @@ -212,14 +247,20 @@ // Create 1 PageNode to load. performance_manager::TestNodeWrapper<performance_manager::PageNodeImpl> page_node(CreateNode<performance_manager::PageNodeImpl>()); - std::vector<PageNode*> page_nodes_to_load{page_node.get()}; + + PageNodeAndNotificationPermission page_node_and_notification_permission( + page_node.get()->GetWeakPtr(), false); + std::vector<PageNodeAndNotificationPermission> + page_node_and_notification_permission_to_load_vector{ + page_node_and_notification_permission}; // Set |is_tab| property as this is a requirement to pass the PageNode to // ScheduleLoadForRestoredTabs(). TabPropertiesDecorator::SetIsTabForTesting(page_node.get(), true); EXPECT_CALL(*loader(), LoadPageNode(page_node.get())); - policy()->ScheduleLoadForRestoredTabs(page_nodes_to_load); + policy()->ScheduleLoadForRestoredTabs( + page_node_and_notification_permission_to_load_vector); task_env().RunUntilIdle(); testing::Mock::VerifyAndClear(loader()); @@ -346,7 +387,7 @@ std::vector< performance_manager::TestNodeWrapper<performance_manager::PageNodeImpl>> page_nodes; - std::vector<PageNode*> raw_page_nodes; + std::vector<PageNodeAndNotificationPermission> to_load; // Add tabs to restore: @@ -356,8 +397,9 @@ base::TimeTicks::Now() - base::Days(30))); policy()->SetSiteDataReaderForPageNode(page_nodes.back().get(), &site_data_reader_default); - PageNode* old = page_nodes.back().get(); - raw_page_nodes.push_back(old); + PageNodeAndNotificationPermission old(page_nodes.back().get()->GetWeakPtr(), + false); + to_load.push_back(old); // Recent page_nodes.push_back(CreateNode<performance_manager::PageNodeImpl>( @@ -365,8 +407,9 @@ base::TimeTicks::Now() - base::Seconds(1))); policy()->SetSiteDataReaderForPageNode(page_nodes.back().get(), &site_data_reader_default); - PageNode* recent = page_nodes.back().get(); - raw_page_nodes.push_back(recent); + PageNodeAndNotificationPermission recent( + page_nodes.back().get()->GetWeakPtr(), false); + to_load.push_back(recent); // Slightly older tabs which were observed updating their title or favicon or // playing audio in the background @@ -375,24 +418,27 @@ base::TimeTicks::Now() - base::Seconds(2))); policy()->SetSiteDataReaderForPageNode(page_nodes.back().get(), &site_data_reader_title); - PageNode* title = page_nodes.back().get(); - raw_page_nodes.push_back(title); + PageNodeAndNotificationPermission title(page_nodes.back().get()->GetWeakPtr(), + false); + to_load.push_back(title); page_nodes.push_back(CreateNode<performance_manager::PageNodeImpl>( WebContentsProxy(), std::string(), GURL(), false, false, base::TimeTicks::Now() - base::Seconds(3))); policy()->SetSiteDataReaderForPageNode(page_nodes.back().get(), &site_data_reader_favicon); - PageNode* favicon = page_nodes.back().get(); - raw_page_nodes.push_back(favicon); + PageNodeAndNotificationPermission favicon( + page_nodes.back().get()->GetWeakPtr(), false); + to_load.push_back(favicon); page_nodes.push_back(CreateNode<performance_manager::PageNodeImpl>( WebContentsProxy(), std::string(), GURL(), false, false, base::TimeTicks::Now() - base::Seconds(4))); policy()->SetSiteDataReaderForPageNode(page_nodes.back().get(), &site_data_reader_audio); - PageNode* audio = page_nodes.back().get(); - raw_page_nodes.push_back(audio); + PageNodeAndNotificationPermission audio(page_nodes.back().get()->GetWeakPtr(), + false); + to_load.push_back(audio); // Internal page page_nodes.push_back(CreateNode<performance_manager::PageNodeImpl>( @@ -400,32 +446,46 @@ base::TimeTicks::Now() - base::Seconds(1))); policy()->SetSiteDataReaderForPageNode(page_nodes.back().get(), &site_data_reader_default); - PageNode* internal = page_nodes.back().get(); - raw_page_nodes.push_back(internal); + PageNodeAndNotificationPermission internal( + page_nodes.back().get()->GetWeakPtr(), false); + to_load.push_back(internal); - for (auto* page_node : raw_page_nodes) { + // Page with notification permission + page_nodes.push_back(CreateNode<performance_manager::PageNodeImpl>( + WebContentsProxy(), std::string(), GURL("chrome://newtab"), false, false, + base::TimeTicks::Now() - base::Seconds(1))); + policy()->SetSiteDataReaderForPageNode(page_nodes.back().get(), + &site_data_reader_default); + PageNodeAndNotificationPermission notification( + page_nodes.back().get()->GetWeakPtr(), true); + + to_load.push_back(notification); + + for (auto page_node_and_permission : to_load) { // Set |is_tab| property as this is a requirement to pass the PageNode // to ScheduleLoadForRestoredTabs(). - TabPropertiesDecorator::SetIsTabForTesting(page_node, true); + TabPropertiesDecorator::SetIsTabForTesting( + page_node_and_permission.page_node.get(), true); } // Test that tabs are loaded in the expected order: - const std::vector<PageNode*> expected_load_order{title, favicon, recent, - audio, old, internal}; + const std::vector<PageNodeAndNotificationPermission> expected_load_order{ + notification, title, favicon, recent, audio, old, internal}; // 1st tab starts loading when ScheduleLoadForRestoredTabs is invoked. - EXPECT_CALL(*loader(), LoadPageNode(expected_load_order[0])); - policy()->ScheduleLoadForRestoredTabs(raw_page_nodes); + EXPECT_CALL(*loader(), LoadPageNode(expected_load_order[0].page_node.get())); + policy()->ScheduleLoadForRestoredTabs(to_load); task_env().RunUntilIdle(); testing::Mock::VerifyAndClear(loader()); // Other tabs start loading when the previous tab finishes loading. for (size_t i = 1; i < expected_load_order.size(); ++i) { - PageNodeImpl::FromNode(expected_load_order[i - 1]) + PageNodeImpl::FromNode(expected_load_order[i - 1].page_node.get()) ->SetLoadingState(PageNode::LoadingState::kLoading); - EXPECT_CALL(*loader(), LoadPageNode(expected_load_order[i])); - PageNodeImpl::FromNode(expected_load_order[i - 1]) + EXPECT_CALL(*loader(), + LoadPageNode(expected_load_order[i].page_node.get())); + PageNodeImpl::FromNode(expected_load_order[i - 1].page_node.get()) ->SetLoadingState(PageNode::LoadingState::kLoadedIdle); testing::Mock::VerifyAndClear(loader()); } @@ -437,24 +497,26 @@ std::vector< performance_manager::TestNodeWrapper<performance_manager::PageNodeImpl>> page_nodes; - std::vector<PageNode*> raw_page_nodes; + std::vector<PageNodeAndNotificationPermission> to_load; for (uint32_t i = 0; i < 2; i++) { page_nodes.push_back(CreateNode<performance_manager::PageNodeImpl>()); - raw_page_nodes.push_back(page_nodes.back().get()); + PageNodeAndNotificationPermission page_node_and_permisssion( + page_nodes.back().get()->GetWeakPtr(), false); + to_load.push_back(page_node_and_permisssion); // Set |is_tab| property as this is a requirement to pass the PageNode to // ScheduleLoadForRestoredTabs(). - TabPropertiesDecorator::SetIsTabForTesting(raw_page_nodes.back(), true); + TabPropertiesDecorator::SetIsTabForTesting(to_load.back().page_node.get(), + true); } - // Use 1 loading slot so only one PageNode loads at a time. policy()->SetMaxSimultaneousLoadsForTesting(1); // Test that the score produces the expected loading order - EXPECT_CALL(*loader(), LoadPageNode(raw_page_nodes[0])); + EXPECT_CALL(*loader(), LoadPageNode(to_load[0].page_node.get())); - policy()->ScheduleLoadForRestoredTabs(raw_page_nodes); + policy()->ScheduleLoadForRestoredTabs(to_load); task_env().RunUntilIdle(); testing::Mock::VerifyAndClear(loader());
diff --git a/chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc b/chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc index 9b6da05..5d8c2cf 100644 --- a/chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc +++ b/chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc
@@ -8,7 +8,6 @@ #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/process/process_metrics.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/performance_manager/policies/page_discarding_helper.h"
diff --git a/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos_unittest.cc b/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos_unittest.cc index 748d711..ae58a0e0 100644 --- a/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos_unittest.cc +++ b/chrome/browser/performance_manager/policies/userspace_swap_policy_chromeos_unittest.cc
@@ -6,7 +6,6 @@ #include "base/allocator/buildflags.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "chrome/browser/performance_manager/policies/policy_features.h" #include "chromeos/memory/userspace_swap/userspace_swap.h" #include "components/performance_manager/graph/graph_impl.h"
diff --git a/chrome/browser/performance_monitor/system_monitor.cc b/chrome/browser/performance_monitor/system_monitor.cc index 1486edd..518a5d5 100644 --- a/chrome/browser/performance_monitor/system_monitor.cc +++ b/chrome/browser/performance_monitor/system_monitor.cc
@@ -11,7 +11,6 @@ #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/observer_list.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/chrome/browser/performance_monitor/system_monitor.h b/chrome/browser/performance_monitor/system_monitor.h index 59a4152..6a99856 100644 --- a/chrome/browser/performance_monitor/system_monitor.h +++ b/chrome/browser/performance_monitor/system_monitor.h
@@ -14,7 +14,6 @@ #include "base/observer_list.h" #include "base/process/process_metrics.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/timer/timer.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/permissions/abusive_origin_permission_revocation_request.h b/chrome/browser/permissions/abusive_origin_permission_revocation_request.h index b9fa782..b6239da 100644 --- a/chrome/browser/permissions/abusive_origin_permission_revocation_request.h +++ b/chrome/browser/permissions/abusive_origin_permission_revocation_request.h
@@ -8,6 +8,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/permissions/crowd_deny_preload_data.h" #include "chrome/browser/permissions/crowd_deny_safe_browsing_request.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc index bca4633..c9a32338 100644 --- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc +++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
@@ -12,7 +12,6 @@ #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "base/rand_util.h" -#include "base/task/post_task.h" #include "base/time/default_clock.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/permissions/quiet_notification_permission_ui_config.h"
diff --git a/chrome/browser/permissions/crowd_deny_preload_data.cc b/chrome/browser/permissions/crowd_deny_preload_data.cc index 67cb10a..c26c77a 100644 --- a/chrome/browser/permissions/crowd_deny_preload_data.cc +++ b/chrome/browser/permissions/crowd_deny_preload_data.cc
@@ -12,7 +12,6 @@ #include "base/files/file_util.h" #include "base/location.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/permissions/crowd_deny_safe_browsing_request_unittest.cc b/chrome/browser/permissions/crowd_deny_safe_browsing_request_unittest.cc index 997ce644..f7ac82c1 100644 --- a/chrome/browser/permissions/crowd_deny_safe_browsing_request_unittest.cc +++ b/chrome/browser/permissions/crowd_deny_safe_browsing_request_unittest.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/permissions/crowd_deny_safe_browsing_request.h" #include "base/memory/scoped_refptr.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "chrome/browser/permissions/crowd_deny_fake_safe_browsing_database_manager.h"
diff --git a/chrome/browser/persisted_state_db/profile_proto_db.h b/chrome/browser/persisted_state_db/profile_proto_db.h index c72aa1e..39569a4 100644 --- a/chrome/browser/persisted_state_db/profile_proto_db.h +++ b/chrome/browser/persisted_state_db/profile_proto_db.h
@@ -15,7 +15,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc index 9ce3b47..6ef72da 100644 --- a/chrome/browser/platform_util_win.cc +++ b/chrome/browser/platform_util_win.cc
@@ -21,7 +21,6 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/win/registry.h"
diff --git a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc index 23670761..a3948f2 100644 --- a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc +++ b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/plugins/plugin_info_host_impl.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc b/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc index 117bf61..d318ad2 100644 --- a/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc +++ b/chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
@@ -8,7 +8,6 @@ #include "base/feature_list.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/common/chrome_features.h" #include "chrome/common/pdf_util.h"
diff --git a/chrome/browser/plugins/plugin_info_host_impl.cc b/chrome/browser/plugins/plugin_info_host_impl.cc index f2d3d1a..9c88965 100644 --- a/chrome/browser/plugins/plugin_info_host_impl.cc +++ b/chrome/browser/plugins/plugin_info_host_impl.cc
@@ -14,7 +14,6 @@ #include "base/containers/cxx20_erase.h" #include "base/memory/singleton.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/policy/browser_dm_token_storage_linux.cc b/chrome/browser/policy/browser_dm_token_storage_linux.cc index a67b2b3..4f475e8 100644 --- a/chrome/browser/policy/browser_dm_token_storage_linux.cc +++ b/chrome/browser/policy/browser_dm_token_storage_linux.cc
@@ -19,7 +19,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/syslog_logging.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/policy/browser_dm_token_storage_mac.mm b/chrome/browser/policy/browser_dm_token_storage_mac.mm index 927cf30..56e02fc 100644 --- a/chrome/browser/policy/browser_dm_token_storage_mac.mm +++ b/chrome/browser/policy/browser_dm_token_storage_mac.mm
@@ -23,7 +23,6 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/syslog_logging.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/policy/browser_dm_token_storage_win.cc b/chrome/browser/policy/browser_dm_token_storage_win.cc index 0aee627..9a369de 100644 --- a/chrome/browser/policy/browser_dm_token_storage_win.cc +++ b/chrome/browser/policy/browser_dm_token_storage_win.cc
@@ -28,7 +28,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/browser/policy/chrome_browser_policy_connector.cc index 4c744b2..b5f700df 100644 --- a/chrome/browser/policy/chrome_browser_policy_connector.cc +++ b/chrome/browser/policy/chrome_browser_policy_connector.cc
@@ -12,7 +12,6 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc b/chrome/browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc index 57c2209..b7de1eb 100644 --- a/chrome/browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc +++ b/chrome/browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc
@@ -14,7 +14,6 @@ #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.h b/chrome/browser/policy/cloud/cloud_policy_invalidator.h index ce74b7c..6cefc7a 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator.h +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.h
@@ -15,6 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "components/invalidation/public/invalidation.h" #include "components/invalidation/public/invalidation_handler.h" #include "components/invalidation/public/invalidation_util.h"
diff --git a/chrome/browser/policy/device_account_initializer.cc b/chrome/browser/policy/device_account_initializer.cc index 4b1a1a5..12cff831 100644 --- a/chrome/browser/policy/device_account_initializer.cc +++ b/chrome/browser/policy/device_account_initializer.cc
@@ -13,7 +13,6 @@ #include "base/guid.h" #include "base/location.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc b/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc index d09b205..86725e1 100644 --- a/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc +++ b/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc
@@ -14,7 +14,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/singleton.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/values.h"
diff --git a/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service.cc b/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service.cc index b3f6f2b..6339146 100644 --- a/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service.cc +++ b/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service.cc
@@ -8,7 +8,6 @@ #include <utility> #include <vector> -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/policy/messaging_layer/upload/record_handler_impl.h"
diff --git a/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service.h b/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service.h index f618f3c..3f181f3 100644 --- a/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service.h +++ b/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service.h
@@ -10,7 +10,6 @@ #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/policy/messaging_layer/upload/record_handler_impl.h b/chrome/browser/policy/messaging_layer/upload/record_handler_impl.h index e4e74a5..c6bc2ab 100644 --- a/chrome/browser/policy/messaging_layer/upload/record_handler_impl.h +++ b/chrome/browser/policy/messaging_layer/upload/record_handler_impl.h
@@ -9,7 +9,6 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner.h" #include "chrome/browser/policy/messaging_layer/upload/dm_server_upload_service.h"
diff --git a/chrome/browser/policy/messaging_layer/upload/record_handler_impl_unittest.cc b/chrome/browser/policy/messaging_layer/upload/record_handler_impl_unittest.cc index 59e0de1..f9b20ce 100644 --- a/chrome/browser/policy/messaging_layer/upload/record_handler_impl_unittest.cc +++ b/chrome/browser/policy/messaging_layer/upload/record_handler_impl_unittest.cc
@@ -12,7 +12,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/test/task_environment.h" #include "base/values.h"
diff --git a/chrome/browser/policy/messaging_layer/upload/upload_client.h b/chrome/browser/policy/messaging_layer/upload/upload_client.h index 9ce8a19f..db94c491 100644 --- a/chrome/browser/policy/messaging_layer/upload/upload_client.h +++ b/chrome/browser/policy/messaging_layer/upload/upload_client.h
@@ -8,7 +8,6 @@ #include <memory> #include <vector> -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "chrome/browser/policy/messaging_layer/upload/dm_server_upload_service.h" #include "components/policy/core/common/cloud/cloud_policy_client.h"
diff --git a/chrome/browser/policy/networking/policy_cert_service.cc b/chrome/browser/policy/networking/policy_cert_service.cc index c0b14959..ac6f0a1a 100644 --- a/chrome/browser/policy/networking/policy_cert_service.cc +++ b/chrome/browser/policy/networking/policy_cert_service.cc
@@ -9,7 +9,6 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/net/nss_temp_certs_cache_chromeos.h" #include "chrome/browser/net/profile_network_context_service.h"
diff --git a/chrome/browser/portal/portal_browsertest.cc b/chrome/browser/portal/portal_browsertest.cc index 0cbdb2a..3ecbdbbc 100644 --- a/chrome/browser/portal/portal_browsertest.cc +++ b/chrome/browser/portal/portal_browsertest.cc
@@ -11,7 +11,6 @@ #include "base/containers/flat_set.h" #include "base/memory/scoped_refptr.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "chrome/browser/devtools/devtools_window_testing.h"
diff --git a/chrome/browser/predictors/loading_predictor_browsertest.cc b/chrome/browser/predictors/loading_predictor_browsertest.cc index c23d5cc..90c43b6 100644 --- a/chrome/browser/predictors/loading_predictor_browsertest.cc +++ b/chrome/browser/predictors/loading_predictor_browsertest.cc
@@ -16,7 +16,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/predictors/preconnect_manager.h b/chrome/browser/predictors/preconnect_manager.h index 5e3d929..1eeee20 100644 --- a/chrome/browser/predictors/preconnect_manager.h +++ b/chrome/browser/predictors/preconnect_manager.h
@@ -15,6 +15,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/predictors/proxy_lookup_client_impl.h" #include "chrome/browser/predictors/resolve_host_client_impl.h" #include "chrome/browser/predictors/resource_prefetch_predictor.h"
diff --git a/chrome/browser/predictors/predictor_database_factory.cc b/chrome/browser/predictors/predictor_database_factory.cc index 7b82c578..d4ee7e1 100644 --- a/chrome/browser/predictors/predictor_database_factory.cc +++ b/chrome/browser/predictors/predictor_database_factory.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/predictors/predictor_database.h"
diff --git a/chrome/browser/predictors/prefetch_manager.h b/chrome/browser/predictors/prefetch_manager.h index 7ac1cc9..d32f718 100644 --- a/chrome/browser/predictors/prefetch_manager.h +++ b/chrome/browser/predictors/prefetch_manager.h
@@ -12,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/predictors/resource_prefetch_predictor.h" #include "net/base/network_isolation_key.h" #include "services/network/public/mojom/url_loader.mojom-forward.h"
diff --git a/chrome/browser/predictors/proxy_lookup_client_impl.h b/chrome/browser/predictors/proxy_lookup_client_impl.h index 680061fd..fb838cd 100644 --- a/chrome/browser/predictors/proxy_lookup_client_impl.h +++ b/chrome/browser/predictors/proxy_lookup_client_impl.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_PREDICTORS_PROXY_LOOKUP_CLIENT_IMPL_H_ #include "base/bind.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/receiver.h" #include "services/network/public/mojom/proxy_lookup_client.mojom.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/predictors/resolve_host_client_impl.h b/chrome/browser/predictors/resolve_host_client_impl.h index 26f92682..61ea479 100644 --- a/chrome/browser/predictors/resolve_host_client_impl.h +++ b/chrome/browser/predictors/resolve_host_client_impl.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_PREDICTORS_RESOLVE_HOST_CLIENT_IMPL_H_ #include "base/bind.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/receiver.h" #include "net/base/address_list.h" #include "services/network/public/cpp/resolve_host_client_base.h"
diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_container.h b/chrome/browser/prefetch/prefetch_proxy/prefetch_container.h index 21f1029..bee8e73 100644 --- a/chrome/browser/prefetch/prefetch_proxy/prefetch_container.h +++ b/chrome/browser/prefetch/prefetch_proxy/prefetch_container.h
@@ -7,6 +7,7 @@ #include <memory> +#include "base/time/time.h" #include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_cookie_listener.h" #include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_network_context.h" #include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_prefetch_status.h"
diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.cc b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.cc index aa39528..eee0c4b3 100644 --- a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.cc +++ b/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/feature_list.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_canary_checker.h" #include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_dns_prober.h" #include "chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.h"
diff --git a/chrome/browser/prefetch/search_prefetch/back_forward_search_prefetch_url_loader.cc b/chrome/browser/prefetch/search_prefetch/back_forward_search_prefetch_url_loader.cc index 5b63ae3..f9cc1a2f 100644 --- a/chrome/browser/prefetch/search_prefetch/back_forward_search_prefetch_url_loader.cc +++ b/chrome/browser/prefetch/search_prefetch/back_forward_search_prefetch_url_loader.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/prefetch/search_prefetch/search_prefetch_service.h b/chrome/browser/prefetch/search_prefetch/search_prefetch_service.h index 2d8be947..959c3b8 100644 --- a/chrome/browser/prefetch/search_prefetch/search_prefetch_service.h +++ b/chrome/browser/prefetch/search_prefetch/search_prefetch_service.h
@@ -12,6 +12,7 @@ #include "base/callback_list.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/prefetch/search_prefetch/base_search_prefetch_request.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc b/chrome/browser/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc index 5262adc..8c77d07 100644 --- a/chrome/browser/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc +++ b/chrome/browser/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/printing/pdf_to_emf_converter.cc b/chrome/browser/printing/pdf_to_emf_converter.cc index b656958e..b0f08f2 100644 --- a/chrome/browser/printing/pdf_to_emf_converter.cc +++ b/chrome/browser/printing/pdf_to_emf_converter.cc
@@ -19,7 +19,6 @@ #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h index a654507..3a0d2be 100644 --- a/chrome/browser/printing/print_job_worker.h +++ b/chrome/browser/printing/print_job_worker.h
@@ -11,6 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/printing/printer_manager_dialog_linux.cc b/chrome/browser/printing/printer_manager_dialog_linux.cc index ba446689..f91965d 100644 --- a/chrome/browser/printing/printer_manager_dialog_linux.cc +++ b/chrome/browser/printing/printer_manager_dialog_linux.cc
@@ -13,7 +13,6 @@ #include "base/nix/xdg_util.h" #include "base/process/kill.h" #include "base/process/launch.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/printing/printer_manager_dialog_win.cc b/chrome/browser/printing/printer_manager_dialog_win.cc index 7da8890..e3dc0bf6 100644 --- a/chrome/browser/printing/printer_manager_dialog_win.cc +++ b/chrome/browser/printing/printer_manager_dialog_win.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h" #include "base/win/windows_version.h"
diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc index dcb6eb1..e0bc88b9 100644 --- a/chrome/browser/process_singleton_browsertest.cc +++ b/chrome/browser/process_singleton_browsertest.cc
@@ -28,6 +28,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/test_timeouts.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/process_singleton_posix_unittest.cc b/chrome/browser/process_singleton_posix_unittest.cc index 3494376..063f18c9 100644 --- a/chrome/browser/process_singleton_posix_unittest.cc +++ b/chrome/browser/process_singleton_posix_unittest.cc
@@ -31,6 +31,7 @@ #include "base/test/test_timeouts.h" #include "base/test/thread_test_helper.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/common/chrome_constants.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/process_singleton_win_unittest.cc b/chrome/browser/process_singleton_win_unittest.cc index a91135e..106f5a3 100644 --- a/chrome/browser/process_singleton_win_unittest.cc +++ b/chrome/browser/process_singleton_win_unittest.cc
@@ -22,6 +22,7 @@ #include "base/strings/stringprintf.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/multiprocess_test.h" +#include "base/time/time.h" #include "base/win/scoped_handle.h" #include "base/win/wrapped_window_proc.h" #include "chrome/browser/win/chrome_process_finder.h"
diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc index 586020f2..1bfe081 100644 --- a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc +++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc
@@ -14,7 +14,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/atomic_flag.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/profiles/incognito_profile_containment_browsertest.cc b/chrome/browser/profiles/incognito_profile_containment_browsertest.cc index d29b596..90c1058 100644 --- a/chrome/browser/profiles/incognito_profile_containment_browsertest.cc +++ b/chrome/browser/profiles/incognito_profile_containment_browsertest.cc
@@ -11,6 +11,7 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index fa75e05..64f159f 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -16,7 +16,6 @@ #include "base/metrics/user_metrics_action.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/accessibility/accessibility_labels_service.h"
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.h b/chrome/browser/profiles/off_the_record_profile_impl.h index 5a59fa5e..e2b9f75 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.h +++ b/chrome/browser/profiles/off_the_record_profile_impl.h
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h"
diff --git a/chrome/browser/profiles/profile_attributes_storage.cc b/chrome/browser/profiles/profile_attributes_storage.cc index 3381b8a6..969451e 100644 --- a/chrome/browser/profiles/profile_attributes_storage.cc +++ b/chrome/browser/profiles/profile_attributes_storage.cc
@@ -20,7 +20,6 @@ #include "base/observer_list.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc index 1ecb5f4..456f1c202 100644 --- a/chrome/browser/profiles/profile_browsertest.cc +++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -23,7 +23,6 @@ #include "base/run_loop.h" #include "base/scoped_multi_source_observation.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/bind.h"
diff --git a/chrome/browser/profiles/profile_browsertest_android.cc b/chrome/browser/profiles/profile_browsertest_android.cc index 460af731..2de4bc1b 100644 --- a/chrome/browser/profiles/profile_browsertest_android.cc +++ b/chrome/browser/profiles/profile_browsertest_android.cc
@@ -15,7 +15,6 @@ #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/ui/android/tab_model/tab_model.h"
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index fca66c2bf..2fab15e 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc
@@ -31,7 +31,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/supports_user_data.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc index b2cef54..d87ac253 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
@@ -14,7 +14,6 @@ #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/test/scoped_path_override.h"
diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc index c7b5c9e..793a008 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
@@ -23,7 +23,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/push_messaging/budget_database.cc b/chrome/browser/push_messaging/budget_database.cc index 96b2d36..29cf82d 100644 --- a/chrome/browser/push_messaging/budget_database.cc +++ b/chrome/browser/push_messaging/budget_database.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/clock.h" #include "base/time/default_clock.h"
diff --git a/chrome/browser/push_messaging/budget_database.h b/chrome/browser/push_messaging/budget_database.h index 0ae2037..70f16984 100644 --- a/chrome/browser/push_messaging/budget_database.h +++ b/chrome/browser/push_messaging/budget_database.h
@@ -13,6 +13,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/leveldb_proto/public/proto_database.h" namespace base {
diff --git a/chrome/browser/push_messaging/push_messaging_notification_manager.cc b/chrome/browser/push_messaging/push_messaging_notification_manager.cc index 9312378..5b403b2 100644 --- a/chrome/browser/push_messaging/push_messaging_notification_manager.cc +++ b/chrome/browser/push_messaging/push_messaging_notification_manager.cc
@@ -15,7 +15,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/notifications/platform_notification_service_factory.h"
diff --git a/chrome/browser/reading_list/android/reading_list_notification_service.cc b/chrome/browser/reading_list/android/reading_list_notification_service.cc index 2c518ee..db22cc6 100644 --- a/chrome/browser/reading_list/android/reading_list_notification_service.cc +++ b/chrome/browser/reading_list/android/reading_list_notification_service.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/reading_list/android/reading_list_notification_service.h" #include "base/feature_list.h" +#include "base/time/time.h" #include "chrome/browser/notifications/scheduler/public/client_overview.h" #include "chrome/browser/notifications/scheduler/public/notification_data.h" #include "chrome/browser/notifications/scheduler/public/notification_params.h"
diff --git a/chrome/browser/resource_coordinator/intervention_policy_database.cc b/chrome/browser/resource_coordinator/intervention_policy_database.cc index 7367a23..f5ddddc9 100644 --- a/chrome/browser/resource_coordinator/intervention_policy_database.cc +++ b/chrome/browser/resource_coordinator/intervention_policy_database.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/resource_coordinator/lifecycle_unit_base.h b/chrome/browser/resource_coordinator/lifecycle_unit_base.h index 9c4e15c..798019c 100644 --- a/chrome/browser/resource_coordinator/lifecycle_unit_base.h +++ b/chrome/browser/resource_coordinator/lifecycle_unit_base.h
@@ -7,6 +7,7 @@ #include "base/memory/raw_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "chrome/browser/resource_coordinator/lifecycle_unit.h" #include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom-shared.h" #include "chrome/browser/resource_coordinator/time.h"
diff --git a/chrome/browser/resource_coordinator/tab_activity_watcher.cc b/chrome/browser/resource_coordinator/tab_activity_watcher.cc index 9b66fc6..87d28cf9 100644 --- a/chrome/browser/resource_coordinator/tab_activity_watcher.cc +++ b/chrome/browser/resource_coordinator/tab_activity_watcher.cc
@@ -9,6 +9,7 @@ #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" #include "base/rand_util.h" +#include "base/time/time.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/resource_coordinator/lifecycle_unit.h" #include "chrome/browser/resource_coordinator/tab_lifecycle_unit_external.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager.cc b/chrome/browser/resource_coordinator/tab_manager.cc index 72b659cf..0f5b36a2 100644 --- a/chrome/browser/resource_coordinator/tab_manager.cc +++ b/chrome/browser/resource_coordinator/tab_manager.cc
@@ -25,8 +25,8 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "base/trace_event/traced_value.h" #include "build/build_config.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h index ce78d52a..00d86fa3 100644 --- a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h +++ b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h
@@ -17,6 +17,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/process/process.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/arc/process/arc_process.h" #include "chrome/browser/ash/arc/process/arc_process_service.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager_web_contents_data.cc b/chrome/browser/resource_coordinator/tab_manager_web_contents_data.cc index 9587c36..6591919 100644 --- a/chrome/browser/resource_coordinator/tab_manager_web_contents_data.cc +++ b/chrome/browser/resource_coordinator/tab_manager_web_contents_data.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/resource_coordinator/tab_manager_web_contents_data.h" #include "base/metrics/histogram_macros.h" +#include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/resource_coordinator/tab_manager.h" #include "chrome/browser/resource_coordinator/tab_manager_stats_collector.h"
diff --git a/chrome/browser/resource_coordinator/tab_memory_metrics_reporter_unittest.cc b/chrome/browser/resource_coordinator/tab_memory_metrics_reporter_unittest.cc index f33209e..4a42a002 100644 --- a/chrome/browser/resource_coordinator/tab_memory_metrics_reporter_unittest.cc +++ b/chrome/browser/resource_coordinator/tab_memory_metrics_reporter_unittest.cc
@@ -7,7 +7,6 @@ #include <memory> #include "base/memory/raw_ptr.h" -#include "base/task/post_task.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_mock_time_task_runner.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/resource_coordinator/test_lifecycle_unit.h b/chrome/browser/resource_coordinator/test_lifecycle_unit.h index 4b43298..2531a63 100644 --- a/chrome/browser/resource_coordinator/test_lifecycle_unit.h +++ b/chrome/browser/resource_coordinator/test_lifecycle_unit.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_RESOURCE_COORDINATOR_TEST_LIFECYCLE_UNIT_H_ #include "base/strings/string_piece.h" +#include "base/time/time.h" #include "chrome/browser/resource_coordinator/lifecycle_unit_base.h" namespace resource_coordinator {
diff --git a/chrome/browser/resources/nearby_share/shared/nearby_preview.html b/chrome/browser/resources/nearby_share/shared/nearby_preview.html index 573dd7a..4930978 100644 --- a/chrome/browser/resources/nearby_share/shared/nearby_preview.html +++ b/chrome/browser/resources/nearby_share/shared/nearby_preview.html
@@ -7,8 +7,9 @@ } iron-icon.disabled { - --nearby-preview-color: var(--google-grey-600); - --nearby-preview-background-color: var(--google-grey-200); + --nearby-preview-color: var(--cros-color-disabled); + --nearby-preview-background-color: var( + --cros-shortcut-background-color); } #title {
diff --git a/chrome/browser/resources/nearby_share/shared/nearby_progress.html b/chrome/browser/resources/nearby_share/shared/nearby_progress.html index 2b43f93..e5047cf 100644 --- a/chrome/browser/resources/nearby_share/shared/nearby_progress.html +++ b/chrome/browser/resources/nearby_share/shared/nearby_progress.html
@@ -18,8 +18,9 @@ } .has-error #icon { - --nearby-device-icon-color: var(--google-grey-600); - --nearby-device-icon-background-color: var(--google-grey-200); + --nearby-device-icon-color: var(--cros-color-disabled); + --nearby-device-icon-background-color: var( + --cros-shortcut-background-color); } #progress-container {
diff --git a/chrome/browser/resources/nearby_share/shared/nearby_shared_share_type_icons.html b/chrome/browser/resources/nearby_share/shared/nearby_shared_share_type_icons.html index 25e8bffb..56ada24 100644 --- a/chrome/browser/resources/nearby_share/shared/nearby_shared_share_type_icons.html +++ b/chrome/browser/resources/nearby_share/shared/nearby_shared_share_type_icons.html
@@ -5,56 +5,56 @@ Keep these in sorted order by id="". See also http://goo.gl/Y1OdAq --> <g id="address"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--google-blue-50))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M12 2C8.13 2 5 5.13 5 9C5 14.25 12 22 12 22C12 22 19 14.25 19 9C19 5.13 15.87 2 12 2ZM7 9C7 6.24 9.24 4 12 4C14.76 4 17 6.24 17 9C17 11.88 14.12 16.19 12 18.88C9.92 16.21 7 11.85 7 9ZM14.5 9C14.5 10.3807 13.3807 11.5 12 11.5C10.6193 11.5 9.5 10.3807 9.5 9C9.5 7.61929 10.6193 6.5 12 6.5C13.3807 6.5 14.5 7.61929 14.5 9Z" style="fill: var(--nearby-preview-color, var(--google-blue-600))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color-blue))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M12 2C8.13 2 5 5.13 5 9C5 14.25 12 22 12 22C12 22 19 14.25 19 9C19 5.13 15.87 2 12 2ZM7 9C7 6.24 9.24 4 12 4C14.76 4 17 6.24 17 9C17 11.88 14.12 16.19 12 18.88C9.92 16.21 7 11.85 7 9ZM14.5 9C14.5 10.3807 13.3807 11.5 12 11.5C10.6193 11.5 9.5 10.3807 9.5 9C9.5 7.61929 10.6193 6.5 12 6.5C13.3807 6.5 14.5 7.61929 14.5 9Z" style="fill: var(--nearby-preview-color, var(--cros-icon-color-blue))"></path> </g> <g id="audio-file"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--google-blue-50))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M6 8C7.1 8 8 8.9 8 10V14C8 15.1 7.1 16 6 16C4.9 16 4 15.1 4 14V10C4 8.9 4.9 8 6 8ZM16 10V14C16 15.1 16.9 16 18 16C19.1 16 20 15.1 20 14V10C20 8.9 19.1 8 18 8C16.9 8 16 8.9 16 10ZM10 6V18C10 19.1 10.9 20 12 20C13.1 20 14 19.1 14 18V6C14 4.9 13.1 4 12 4C10.9 4 10 4.9 10 6Z" style="fill: var(--nearby-preview-color, var(--google-blue-600))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M6 8C7.1 8 8 8.9 8 10V14C8 15.1 7.1 16 6 16C4.9 16 4 15.1 4 14V10C4 8.9 4.9 8 6 8ZM16 10V14C16 15.1 16.9 16 18 16C19.1 16 20 15.1 20 14V10C20 8.9 19.1 8 18 8C16.9 8 16 8.9 16 10ZM10 6V18C10 19.1 10.9 20 12 20C13.1 20 14 19.1 14 18V6C14 4.9 13.1 4 12 4C10.9 4 10 4.9 10 6Z" style="fill: var(--nearby-preview-color, var(--cros-icon-color-blue))"></path> </g> <g id="google-docs-file"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--google-blue-50))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M19 3H5C3.9 3 3 3.9 3 5V19C3 20.1 3.9 21 5 21H19C20.1 21 21 20.1 21 19V5C21 3.9 20.1 3 19 3V3ZM17.01 9H7V7H17.01V9V9ZM17.01 13H7V11H17.01V13V13ZM14.01 17H7V15H14.01V17V17Z" style="fill: var(--nearby-preview-color, var(--google-blue-600))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M19 3H5C3.9 3 3 3.9 3 5V19C3 20.1 3.9 21 5 21H19C20.1 21 21 20.1 21 19V5C21 3.9 20.1 3 19 3V3ZM17.01 9H7V7H17.01V9V9ZM17.01 13H7V11H17.01V13V13ZM14.01 17H7V15H14.01V17V17Z" style="fill: var(--nearby-preview-color, var(--cros-icon-color-blue))"></path> </g> <g id="google-sheets-file"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, rgb(230, 244, 234))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M19 3H5C3.9 3 3.01 3.9 3.01 5L3 8V19C3 20.1 3.9 21 5 21H19C20.1 21 21 20.1 21 19V5C21 3.9 20.1 3 19 3V3ZM19 11H11V19H9V11H5V9H9V5H11V9H19V11V11Z" style="fill: var(--nearby-preview-color, rgb(30, 142, 162))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color-green))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M19 3H5C3.9 3 3.01 3.9 3.01 5L3 8V19C3 20.1 3.9 21 5 21H19C20.1 21 21 20.1 21 19V5C21 3.9 20.1 3 19 3V3ZM19 11H11V19H9V11H5V9H9V5H11V9H19V11V11Z" style="fill: var(--nearby-preview-color, var(--cros-icon-color-green))"></path> </g> <g id="google-slides-file"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--google-yellow-50))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M18.9998 3H4.99977C3.89977 3 3.00977 3.9 3.00977 5V19C3.00977 20.1 3.89977 21 4.99977 21H18.9998C20.0998 21 20.9998 20.1 20.9998 19V5C20.9998 3.9 20.0998 3 18.9998 3V3ZM18.9998 16H4.99977V8H18.9998V16V16Z" style="fill: var(--nearby-preview-color, rgb(249, 171, 0))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color-yellow))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M18.9998 3H4.99977C3.89977 3 3.00977 3.9 3.00977 5V19C3.00977 20.1 3.89977 21 4.99977 21H18.9998C20.0998 21 20.9998 20.1 20.9998 19V5C20.9998 3.9 20.0998 3 18.9998 3V3ZM18.9998 16H4.99977V8H18.9998V16V16Z" style="fill: var(--nearby-preview-color, var(--cros-icon-color-yellow))"></path> </g> <g id="image-video-file"> - <rect x="5" height="68" width="58" rx="4" style="fill: var(--nearby-preview-background-color, var(--google-blue-50))"></rect> - <path transform="translate(16 16)" fill-rule="evenodd" d="M14 8v6a9 9 0 1 0 10 11h7v-17zm10 17a9 9 0 0 0 -10 -11v11h10z" style="fill: var(--nearby-preview-color, var(--google-blue-200))"></path> + <rect x="5" height="68" width="58" rx="4" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color))"></rect> + <path transform="translate(16 16)" fill-rule="evenodd" d="M14 8v6a9 9 0 1 0 10 11h7v-17zm10 17a9 9 0 0 0 -10 -11v11h10z" style="fill: var(--nearby-preview-color, rgba(var(--cros-icon-color-blue-rgb), var(--cros-second-tone-opacity)))"></path> </g> <g id="multiple-file"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--google-blue-50))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M15 1H8C6.9 1 6.01 1.9 6.01 3L6 17C6 18.1 6.89 19 7.99 19H19C20.1 19 21 18.1 21 17V7L15 1ZM18 23H4C2.9 23 2 22.1 2 21V7H4V21H18V23ZM8 3V17H19V8H14V3H8Z" style="fill: var(--nearby-preview-color, var(--google-blue-600))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M15 1H8C6.9 1 6.01 1.9 6.01 3L6 17C6 18.1 6.89 19 7.99 19H19C20.1 19 21 18.1 21 17V7L15 1ZM18 23H4C2.9 23 2 22.1 2 21V7H4V21H18V23ZM8 3V17H19V8H14V3H8Z" style="fill: var(--nearby-preview-color, var(--cros-icon-color-blue))"></path> </g> <g id="pdf-file"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, rgb(252, 232, 230))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M5 3H19C20.1 3 21 3.9 21 5V19C21 20.1 20.1 21 19 21H5C3.9 21 3 20.1 3 19V5C3 3.9 3.9 3 5 3ZM8 11.5H7V10.5H8V11.5ZM9.5 11.5C9.5 12.33 8.83 13 8 13H7V15H5.5V9H8C8.83 9 9.5 9.67 9.5 10.5V11.5ZM17 10.5H19.5V9H15.5V15H17V13H18.5V11.5H17V10.5ZM14.5 13.5C14.5 14.33 13.83 15 13 15H10.5V9H13C13.83 9 14.5 9.67 14.5 10.5V13.5ZM13 13.5H12V10.5H13V13.5Z" style="fill: var(--nearby-preview-color, var(--google-red-600))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color-red))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M5 3H19C20.1 3 21 3.9 21 5V19C21 20.1 20.1 21 19 21H5C3.9 21 3 20.1 3 19V5C3 3.9 3.9 3 5 3ZM8 11.5H7V10.5H8V11.5ZM9.5 11.5C9.5 12.33 8.83 13 8 13H7V15H5.5V9H8C8.83 9 9.5 9.67 9.5 10.5V11.5ZM17 10.5H19.5V9H15.5V15H17V13H18.5V11.5H17V10.5ZM14.5 13.5C14.5 14.33 13.83 15 13 15H10.5V9H13C13.83 9 14.5 9.67 14.5 10.5V13.5ZM13 13.5H12V10.5H13V13.5Z" style="fill: var(--nearby-preview-color, var(--cros-icon-color-red))"></path> </g> <g id="phone"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--google-blue-50))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M17 1H7C5.9 1 5 1.9 5 3V21C5 22.1 5.9 23 7 23H17C18.1 23 19 22.1 19 21V3C19 1.9 18.1 1 17 1ZM7 6H17V16H7V6ZM7 21H17V18H7V21ZM7 4V3H17V4H7ZM14 19H10V20H14V19Z" style="fill: var(--nearby-preview-color, var(--google-blue-600))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M17 1H7C5.9 1 5 1.9 5 3V21C5 22.1 5.9 23 7 23H17C18.1 23 19 22.1 19 21V3C19 1.9 18.1 1 17 1ZM7 6H17V16H7V6ZM7 21H17V18H7V21ZM7 4V3H17V4H7ZM14 19H10V20H14V19Z" style="fill: var(--nearby-preview-color, var(--cros-icon-color-blue))"></path> </g> <g id="text"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--google-blue-50))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M3.59961 6H20.3996V8.4H3.59961V6ZM3.59961 10.8H20.3996V13.2H3.59961V10.8ZM13.1996 15.6H3.59961V18H13.1996V15.6Z" style="fill: var(--nearby-preview-color, var(--google-blue-600))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M3.59961 6H20.3996V8.4H3.59961V6ZM3.59961 10.8H20.3996V13.2H3.59961V10.8ZM13.1996 15.6H3.59961V18H13.1996V15.6Z" style="fill: var(--nearby-preview-color, var(--cros-icon-color-blue))"></path> </g> <g id="unknown-file"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--google-blue-50))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M6 2H14L20 8V20C20 21.1 19.1 22 18 22H5.99C4.89 22 4 21.1 4 20L4.01 4C4.01 2.9 4.9 2 6 2ZM6 4V20H18V9H13V4H6Z" style="fill: var(--nearby-preview-color, var(--google-blue-600))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M6 2H14L20 8V20C20 21.1 19.1 22 18 22H5.99C4.89 22 4 21.1 4 20L4.01 4C4.01 2.9 4.9 2 6 2ZM6 4V20H18V9H13V4H6Z" style="fill: var(--nearby-preview-color, var(--cros-icon-color-blue))"></path> </g> <g id="url"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--google-blue-50))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M11 15H7C5.35 15 4 13.65 4 12C4 10.35 5.35 9 7 9H11V7H7C4.24 7 2 9.24 2 12C2 14.76 4.24 17 7 17H11V15ZM17 7H13V9H17C18.65 9 20 10.35 20 12C20 13.65 18.65 15 17 15H13V17H17C19.76 17 22 14.76 22 12C22 9.24 19.76 7 17 7ZM16 11H8V13H16V11Z" style="fill: var(--nearby-preview-color, var(--google-blue-600))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M11 15H7C5.35 15 4 13.65 4 12C4 10.35 5.35 9 7 9H11V7H7C4.24 7 2 9.24 2 12C2 14.76 4.24 17 7 17H11V15ZM17 7H13V9H17C18.65 9 20 10.35 20 12C20 13.65 18.65 15 17 15H13V17H17C19.76 17 22 14.76 22 12C22 9.24 19.76 7 17 7ZM16 11H8V13H16V11Z" style="fill: var(--nearby-preview-color, var(--cros-icon-color-blue))"></path> </g> <g id="wifi-credentials"> - <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--google-blue-50))"></circle> - <path fill-rule="evenodd" transform="translate(22 22)" d="M18.4561 6.76542C18.7337 6.40882 18.6571 5.88721 18.2916 5.62915C17.0249 4.7353 14.0896 3 10.1235 3C6.15814 3 3.22206 4.7353 1.95539 5.62915C1.58981 5.88721 1.5132 6.40882 1.7908 6.76542L9.5311 16.7072C9.83449 17.0975 10.4102 17.0975 10.7136 16.708L10.9047 16.4626C10.4075 15.5886 10.1235 14.5774 10.1235 13.5C10.1235 10.1863 12.8098 7.5 16.1235 7.5C16.6754 7.5 17.2099 7.57451 17.7174 7.71403L18.4561 6.76542ZM13.8663 10.6527V11.561H13.6763C13.124 11.561 12.6763 12.0088 12.6763 12.561V16C12.6763 16.5523 13.124 17 13.6763 17H17.6763C18.2286 17 18.6763 16.5523 18.6763 16V12.561C18.6763 12.0088 18.2286 11.561 17.6763 11.561H17.6873V10.6527C17.6873 9.59753 16.8319 8.74219 15.7768 8.74219C14.7217 8.74219 13.8663 9.59753 13.8663 10.6527ZM15.7768 10.2422C15.5501 10.2422 15.3663 10.426 15.3663 10.6527V11.561H16.1873V10.6527C16.1873 10.426 16.0035 10.2422 15.7768 10.2422ZM14.1763 13.061V15.5H17.1763V13.061H14.1763Z" style="fill : var(--nearby-preview-color, var(--google-blue-600))"></path> + <circle cx="34" cy="34" r="34" style="fill: var(--nearby-preview-background-color, var(--cros-highlight-color))"></circle> + <path fill-rule="evenodd" transform="translate(22 22)" d="M18.4561 6.76542C18.7337 6.40882 18.6571 5.88721 18.2916 5.62915C17.0249 4.7353 14.0896 3 10.1235 3C6.15814 3 3.22206 4.7353 1.95539 5.62915C1.58981 5.88721 1.5132 6.40882 1.7908 6.76542L9.5311 16.7072C9.83449 17.0975 10.4102 17.0975 10.7136 16.708L10.9047 16.4626C10.4075 15.5886 10.1235 14.5774 10.1235 13.5C10.1235 10.1863 12.8098 7.5 16.1235 7.5C16.6754 7.5 17.2099 7.57451 17.7174 7.71403L18.4561 6.76542ZM13.8663 10.6527V11.561H13.6763C13.124 11.561 12.6763 12.0088 12.6763 12.561V16C12.6763 16.5523 13.124 17 13.6763 17H17.6763C18.2286 17 18.6763 16.5523 18.6763 16V12.561C18.6763 12.0088 18.2286 11.561 17.6763 11.561H17.6873V10.6527C17.6873 9.59753 16.8319 8.74219 15.7768 8.74219C14.7217 8.74219 13.8663 9.59753 13.8663 10.6527ZM15.7768 10.2422C15.5501 10.2422 15.3663 10.426 15.3663 10.6527V11.561H16.1873V10.6527C16.1873 10.426 16.0035 10.2422 15.7768 10.2422ZM14.1763 13.061V15.5H17.1763V13.061H14.1763Z" style="fill : var(--nearby-preview-color, var(--cros-icon-color-blue))"></path> </g> </defs> </svg>
diff --git a/chrome/browser/resources/settings/chromeos/os_people_page/pin_autosubmit_dialog.html b/chrome/browser/resources/settings/chromeos/os_people_page/pin_autosubmit_dialog.html index c26a76e..a4064be 100644 --- a/chrome/browser/resources/settings/chromeos/os_people_page/pin_autosubmit_dialog.html +++ b/chrome/browser/resources/settings/chromeos/os_people_page/pin_autosubmit_dialog.html
@@ -51,8 +51,7 @@ <div id="pinKeyboardDiv" class="settings-box continuation"> <pin-keyboard id="pinKeyboard" on-pin-change="onPinChange_" on-submit="onPinSubmit_" value="{{pinValue_}}" - disabled="[[requestInProcess_]]" - enable-letters> + disabled="[[requestInProcess_]]"> <div id="errorDiv" invisible$="[[!error_]]"> <iron-icon id="errorIcon" icon="cr:error-outline"></iron-icon> <span id="errorMessage">[[getErrorMessageString_(error_)]]</span>
diff --git a/chrome/browser/safe_browsing/advanced_protection_status_manager.h b/chrome/browser/safe_browsing/advanced_protection_status_manager.h index a69f6d5..020159f 100644 --- a/chrome/browser/safe_browsing/advanced_protection_status_manager.h +++ b/chrome/browser/safe_browsing/advanced_protection_status_manager.h
@@ -8,6 +8,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/keyed_service/core/keyed_service.h" #include "components/signin/public/identity_manager/access_token_info.h"
diff --git a/chrome/browser/safe_browsing/android/password_reuse_controller_android.h b/chrome/browser/safe_browsing/android/password_reuse_controller_android.h index b542a24..1da6349 100644 --- a/chrome/browser/safe_browsing/android/password_reuse_controller_android.h +++ b/chrome/browser/safe_browsing/android/password_reuse_controller_android.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/chrome_password_protection_service.h" #include "content/public/browser/web_contents_observer.h" #include "url/gurl.h"
diff --git a/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc b/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc index 3820f89..e2423001 100644 --- a/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc +++ b/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h"
diff --git a/chrome/browser/safe_browsing/certificate_reporting_service_test_utils.cc b/chrome/browser/safe_browsing/certificate_reporting_service_test_utils.cc index 70991d6..654bffb1 100644 --- a/chrome/browser/safe_browsing/certificate_reporting_service_test_utils.cc +++ b/chrome/browser/safe_browsing/certificate_reporting_service_test_utils.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "components/encrypted_messages/encrypted_message.pb.h" #include "components/encrypted_messages/message_encrypter.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.h b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.h index 7f958c27..48d4367 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.h +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.h
@@ -15,6 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results_win.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_actions_win.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win_unittest.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win_unittest.cc index 36441726..e5ac237 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win_unittest.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win_unittest.cc
@@ -13,7 +13,6 @@ #include "base/callback_helpers.h" #include "base/command_line.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/multiprocess_test.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.cc index efebff38..84a4bcb 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.cc
@@ -21,7 +21,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc index 806ba60..2ae7871 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.cc
@@ -17,7 +17,6 @@ #include "base/path_service.h" #include "base/process/launch.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win.cc index 1efd4c2..9d27ce97 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win.cc
@@ -22,7 +22,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/unguessable_token.h" #include "base/win/win_util.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win_unittest.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win_unittest.cc index 12cde9d..43ab763 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win_unittest.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win_unittest.cc
@@ -21,7 +21,6 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc index 826f45e..b9cc021d 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc
@@ -27,7 +27,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc b/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc index 9e7cf2f..b7827085 100644 --- a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc +++ b/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.h" #include "base/callback.h" -#include "base/task/post_task.h" #include "chrome/browser/enterprise/connectors/connectors_service.h" #include "chrome/browser/policy/dm_token_utils.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service.cc b/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service.cc index 9c8e787e..6566f6c 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service.cc
@@ -9,7 +9,6 @@ #include "base/base64.h" #include "base/callback_helpers.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "chrome/browser/gcm/gcm_profile_service_factory.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h index de345eb..c78677b 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h +++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h
@@ -20,6 +20,7 @@ #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.cc b/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.cc index 567a6db..9b82a229 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.cc
@@ -8,7 +8,6 @@ #include "base/files/memory_mapped_file.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/file_util_service.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.cc b/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.cc index aa6e7e6..65d5a9a4 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.cc
@@ -12,7 +12,6 @@ #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h b/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h index 79bcd566..5dc2ac0 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h +++ b/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h
@@ -14,6 +14,7 @@ #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/multipart_data_pipe_getter.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "services/network/public/cpp/resource_request.h"
diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.h b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.h index 90c58145..9b9762d 100644 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.h +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.h
@@ -17,6 +17,7 @@ #include "base/files/file_path.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h"
diff --git a/chrome/browser/safe_browsing/download_protection/deep_scanning_request.h b/chrome/browser/safe_browsing/download_protection/deep_scanning_request.h index b02b2c47..4fcfe82 100644 --- a/chrome/browser/safe_browsing/download_protection/deep_scanning_request.h +++ b/chrome/browser/safe_browsing/download_protection/deep_scanning_request.h
@@ -12,6 +12,7 @@ #include "base/files/file_path.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h"
diff --git a/chrome/browser/safe_browsing/download_protection/download_feedback_service_unittest.cc b/chrome/browser/safe_browsing/download_protection/download_feedback_service_unittest.cc index 1693a9f..1aae0e1 100644 --- a/chrome/browser/safe_browsing/download_protection/download_feedback_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/download_feedback_service_unittest.cc
@@ -16,7 +16,6 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc index bce0c6f2..7b31cd1c 100644 --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/safe_browsing/download_protection/download_url_sb_client.h b/chrome/browser/safe_browsing/download_protection/download_url_sb_client.h index 81bf649b..5d8520c4 100644 --- a/chrome/browser/safe_browsing/download_protection/download_url_sb_client.h +++ b/chrome/browser/safe_browsing/download_protection/download_url_sb_client.h
@@ -10,6 +10,7 @@ #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h" #include "components/download/public/common/download_item.h" #include "components/safe_browsing/core/browser/db/database_manager.h"
diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc index a2b7083..f8f16b99 100644 --- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc +++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -8,7 +8,6 @@ #include "base/feature_list.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.h b/chrome/browser/safe_browsing/download_protection/file_analyzer.h index 152e448..15caa54 100644 --- a/chrome/browser/safe_browsing/download_protection/file_analyzer.h +++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.h
@@ -9,6 +9,7 @@ #include "base/files/file_path.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/common/safe_browsing/binary_feature_extractor.h" #include "chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h"
diff --git a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.h b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.h index ab964262..b1c7ad0 100644 --- a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.h +++ b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.h
@@ -11,6 +11,7 @@ #include "base/files/file_path.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/download_protection/download_protection_util.h" #include "components/sessions/core/session_id.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/safe_browsing/download_protection/two_phase_uploader_unittest.cc b/chrome/browser/safe_browsing/download_protection/two_phase_uploader_unittest.cc index ea23089..eddf6023 100644 --- a/chrome/browser/safe_browsing/download_protection/two_phase_uploader_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/two_phase_uploader_unittest.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_persister.cc b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_persister.cc index e58035ad..1556789 100644 --- a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_persister.cc +++ b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_persister.cc
@@ -13,7 +13,6 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service.h b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service.h index 122f5ee..064e764e 100644 --- a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service.h +++ b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service.h
@@ -12,6 +12,7 @@ #include "base/feature_list.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/keyed_service/core/keyed_service.h" #include "components/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc index a832a8b..30366d2 100644 --- a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc +++ b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc
@@ -19,10 +19,10 @@ #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "components/download/public/common/download_item.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" #include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection.cc b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection.cc index caad629..457463c 100644 --- a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection.cc +++ b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection.cc
@@ -6,6 +6,7 @@ #include "base/containers/contains.h" #include "base/json/json_string_value_serializer.h" +#include "base/time/time.h" #include "base/version.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_util.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc index eb96351..9598a0f 100644 --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -18,7 +18,6 @@ #include "base/metrics/histogram_macros.h" #include "base/process/process.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc index 4af90ab..8e3c84fe 100644 --- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc +++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service_unittest.cc
@@ -8,7 +8,6 @@ #include "base/files/file_path.h" #include "base/memory/raw_ptr.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/safe_browsing/user_interaction_observer.h b/chrome/browser/safe_browsing/user_interaction_observer.h index 95eddb9..fc2be7f 100644 --- a/chrome/browser/safe_browsing/user_interaction_observer.h +++ b/chrome/browser/safe_browsing/user_interaction_observer.h
@@ -7,6 +7,7 @@ #include "base/memory/raw_ptr.h" #include "base/time/default_clock.h" +#include "base/time/time.h" #include "components/permissions/permission_request_manager.h" #include "components/safe_browsing/content/browser/ui_manager.h" #include "components/security_interstitials/core/unsafe_resource.h"
diff --git a/chrome/browser/search/background/ntp_custom_background_service.cc b/chrome/browser/search/background/ntp_custom_background_service.cc index f17e143..c6b9703 100644 --- a/chrome/browser/search/background/ntp_custom_background_service.cc +++ b/chrome/browser/search/background/ntp_custom_background_service.cc
@@ -10,7 +10,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/observer_list.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/clock.h" #include "base/time/default_clock.h"
diff --git a/chrome/browser/search/background/ntp_custom_background_service_unittest.cc b/chrome/browser/search/background/ntp_custom_background_service_unittest.cc index b64d25d..ef37ac8f8 100644 --- a/chrome/browser/search/background/ntp_custom_background_service_unittest.cc +++ b/chrome/browser/search/background/ntp_custom_background_service_unittest.cc
@@ -11,6 +11,7 @@ #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/mock_callback.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/search/background/ntp_custom_background_service_observer.h" #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc index d8705cf..b894994 100644 --- a/chrome/browser/search/instant_service.cc +++ b/chrome/browser/search/instant_service.cc
@@ -16,7 +16,6 @@ #include "base/scoped_observation.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/clock.h" #include "build/build_config.h"
diff --git a/chrome/browser/search/instant_service.h b/chrome/browser/search/instant_service.h index f51c73f9..f15598c 100644 --- a/chrome/browser/search/instant_service.h +++ b/chrome/browser/search/instant_service.h
@@ -16,6 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/themes/theme_service_observer.h" #include "components/history/core/browser/history_types.h"
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index db75ce8..826a2118 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc
@@ -32,6 +32,7 @@ #include "base/task/cancelable_task_tracker.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/sessions/session_restore_stats_collector.h b/chrome/browser/sessions/session_restore_stats_collector.h index c4e02ca4..6894199 100644 --- a/chrome/browser/sessions/session_restore_stats_collector.h +++ b/chrome/browser/sessions/session_restore_stats_collector.h
@@ -12,6 +12,7 @@ #include <vector> #include "base/scoped_multi_source_observation.h" +#include "base/time/time.h" #include "chrome/browser/sessions/session_restore.h" #include "chrome/browser/sessions/session_restore_delegate.h" #include "content/public/browser/render_widget_host.h"
diff --git a/chrome/browser/sessions/tab_loader.h b/chrome/browser/sessions/tab_loader.h index 6b3d2e9..fd086d6 100644 --- a/chrome/browser/sessions/tab_loader.h +++ b/chrome/browser/sessions/tab_loader.h
@@ -14,6 +14,7 @@ #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/resource_coordinator/tab_load_tracker.h" #include "chrome/browser/sessions/session_restore_delegate.h"
diff --git a/chrome/browser/sessions/tab_restore_service_unittest.cc b/chrome/browser/sessions/tab_restore_service_unittest.cc index 55e0f6b..ceaa4b7 100644 --- a/chrome/browser/sessions/tab_restore_service_unittest.cc +++ b/chrome/browser/sessions/tab_restore_service_unittest.cc
@@ -19,6 +19,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" +#include "base/time/time.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/sessions/chrome_tab_restore_service_client.h" #include "chrome/browser/sessions/exit_type_service.h"
diff --git a/chrome/browser/sharing/click_to_call/phone_number_regex.cc b/chrome/browser/sharing/click_to_call/phone_number_regex.cc index 4dadfc7..a8a560e 100644 --- a/chrome/browser/sharing/click_to_call/phone_number_regex.cc +++ b/chrome/browser/sharing/click_to_call/phone_number_regex.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/feature_list.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "third_party/re2/src/re2/re2.h"
diff --git a/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc b/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc index 580342d8..9c59f29 100644 --- a/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc +++ b/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc
@@ -11,7 +11,6 @@ #include "base/callback_helpers.h" #include "base/guid.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h"
diff --git a/chrome/browser/sharing/sharing_device_source_sync.cc b/chrome/browser/sharing/sharing_device_source_sync.cc index 93f71e3..4ff25bc0 100644 --- a/chrome/browser/sharing/sharing_device_source_sync.cc +++ b/chrome/browser/sharing/sharing_device_source_sync.cc
@@ -11,7 +11,6 @@ #include "base/callback.h" #include "base/containers/cxx20_erase.h" #include "base/stl_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/sharing/features.h" #include "chrome/browser/sharing/proto/sharing_message.pb.h"
diff --git a/chrome/browser/sharing_hub/sharing_hub_model.cc b/chrome/browser/sharing_hub/sharing_hub_model.cc index 3e116f24..d64116b 100644 --- a/chrome/browser/sharing_hub/sharing_hub_model.cc +++ b/chrome/browser/sharing_hub/sharing_hub_model.cc
@@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index 8c177bd..f8df7ca 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc
@@ -31,7 +31,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/platform_thread.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/signin/mirror_browsertest.cc b/chrome/browser/signin/mirror_browsertest.cc index abc65d0..2e6bbaf 100644 --- a/chrome/browser/signin/mirror_browsertest.cc +++ b/chrome/browser/signin/mirror_browsertest.cc
@@ -14,7 +14,6 @@ #include "base/command_line.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/signin/signin_util.cc b/chrome/browser/signin/signin_util.cc index 0e4379c11..68004f6 100644 --- a/chrome/browser/signin/signin_util.cc +++ b/chrome/browser/signin/signin_util.cc
@@ -13,7 +13,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/supports_user_data.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc b/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc index 49ae552..75912c2 100644 --- a/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc +++ b/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc
@@ -15,7 +15,6 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/chrome_content_browser_client.h"
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc index 6855d627..b8f7405e 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc
@@ -22,7 +22,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc index c1821235..ff5ee1d 100644 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -16,7 +16,6 @@ #include "base/notreached.h" #include "base/observer_list.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc index 80e5807..fb1ce87c 100644 --- a/chrome/browser/spellchecker/spellcheck_service.cc +++ b/chrome/browser/spellchecker/spellcheck_service.cc
@@ -50,7 +50,6 @@ #endif #if BUILDFLAG(IS_WIN) && BUILDFLAG(USE_BROWSER_SPELLCHECKER) -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "components/spellcheck/browser/windows_spell_checker.h"
diff --git a/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.cc b/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.cc index e8eac61..3f76ca23 100644 --- a/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.cc +++ b/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "chrome/browser/spellchecker/spell_check_panel_host_impl.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc index cd04ef8..7efc3fa7 100644 --- a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc +++ b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
@@ -15,7 +15,6 @@ #include "base/feature_list.h" #include "base/logging.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "chrome/browser/interstitials/security_interstitial_idn_test.h"
diff --git a/chrome/browser/ssl/https_only_mode_navigation_throttle.cc b/chrome/browser/ssl/https_only_mode_navigation_throttle.cc index dc17b99..20f3551 100644 --- a/chrome/browser/ssl/https_only_mode_navigation_throttle.cc +++ b/chrome/browser/ssl/https_only_mode_navigation_throttle.cc
@@ -6,7 +6,6 @@ #include "base/feature_list.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "chrome/browser/ssl/https_only_mode_tab_helper.h" #include "chrome/common/chrome_features.h"
diff --git a/chrome/browser/ssl/known_interception_disclosure_infobar_delegate.h b/chrome/browser/ssl/known_interception_disclosure_infobar_delegate.h index 51302e4..9e73c89 100644 --- a/chrome/browser/ssl/known_interception_disclosure_infobar_delegate.h +++ b/chrome/browser/ssl/known_interception_disclosure_infobar_delegate.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/singleton.h" #include "base/time/default_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar_delegate.h"
diff --git a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc index 5212fb63..0678e78 100644 --- a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc +++ b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
@@ -18,7 +18,6 @@ #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_command_line.h"
diff --git a/chrome/browser/ssl/ssl_error_controller_client.cc b/chrome/browser/ssl/ssl_error_controller_client.cc index 05c4414..5101125 100644 --- a/chrome/browser/ssl/ssl_error_controller_client.cc +++ b/chrome/browser/ssl/ssl_error_controller_client.cc
@@ -13,7 +13,6 @@ #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "base/process/launch.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ssl/typed_navigation_upgrade_throttle.cc b/chrome/browser/ssl/typed_navigation_upgrade_throttle.cc index 1ef5031..be9fb2e 100644 --- a/chrome/browser/ssl/typed_navigation_upgrade_throttle.cc +++ b/chrome/browser/ssl/typed_navigation_upgrade_throttle.cc
@@ -9,7 +9,6 @@ #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h" #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h"
diff --git a/chrome/browser/startup_data.cc b/chrome/browser/startup_data.cc index 12266dc..267d17c 100644 --- a/chrome/browser/startup_data.cc +++ b/chrome/browser/startup_data.cc
@@ -21,7 +21,6 @@ #if BUILDFLAG(IS_ANDROID) #include "base/files/file_util.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "chrome/browser/android/profile_key_startup_accessor.h" #include "chrome/browser/policy/cloud/user_cloud_policy_manager_builder.h" #include "chrome/browser/policy/profile_policy_connector.h"
diff --git a/chrome/browser/subresource_filter/subresource_filter_intercepting_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_intercepting_browsertest.cc index 1c5233ee..3255b1f 100644 --- a/chrome/browser/subresource_filter/subresource_filter_intercepting_browsertest.cc +++ b/chrome/browser/subresource_filter/subresource_filter_intercepting_browsertest.cc
@@ -7,6 +7,7 @@ #include <utility> #include <vector> +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "chrome/browser/safe_browsing/test_safe_browsing_database_helper.h" #include "chrome/browser/subresource_filter/subresource_filter_browser_test_harness.h"
diff --git a/chrome/browser/supervised_user/supervised_user_denylist.cc b/chrome/browser/supervised_user/supervised_user_denylist.cc index d4f6464..f430ec56 100644 --- a/chrome/browser/supervised_user/supervised_user_denylist.cc +++ b/chrome/browser/supervised_user/supervised_user_denylist.cc
@@ -12,7 +12,6 @@ #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "url/gurl.h"
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc index a9b9b963..2926a74 100644 --- a/chrome/browser/supervised_user/supervised_user_service.cc +++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -22,7 +22,6 @@ #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "base/version.h"
diff --git a/chrome/browser/support_tool/ash/ui_hierarchy_data_collector.cc b/chrome/browser/support_tool/ash/ui_hierarchy_data_collector.cc index 58d3d41c0..aa254ae3 100644 --- a/chrome/browser/support_tool/ash/ui_hierarchy_data_collector.cc +++ b/chrome/browser/support_tool/ash/ui_hierarchy_data_collector.cc
@@ -16,7 +16,6 @@ #include "base/files/file_util.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/support_tool/data_collector.h"
diff --git a/chrome/browser/support_tool/support_tool_handler_unittest.cc b/chrome/browser/support_tool/support_tool_handler_unittest.cc index 4a81390..99170b0 100644 --- a/chrome/browser/support_tool/support_tool_handler_unittest.cc +++ b/chrome/browser/support_tool/support_tool_handler_unittest.cc
@@ -18,7 +18,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc index 11007eb7..cec6037 100644 --- a/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/dictionary_sync_perf_test.cc
@@ -5,6 +5,7 @@ #include <stddef.h> #include "base/strings/string_number_conversions.h" +#include "base/time/time.h" #include "chrome/browser/sync/test/integration/dictionary_helper.h" #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h"
diff --git a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc index 5017c1a..40f9733 100644 --- a/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc
@@ -1897,8 +1897,14 @@ ModelTypeHistogramValue(syncer::BOOKMARKS))); } +// TODO(crbug.com/1311883): flakes on Mac. +#if BUILDFLAG(IS_MAC) +#define MAYBE_DoNotDepleteQuota DISABLED_DoNotDepleteQuota +#else +#define MAYBE_DoNotDepleteQuota DoNotDepleteQuota +#endif IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTestWithEnabledThrottling, - DoNotDepleteQuota) { + MAYBE_DoNotDepleteQuota) { ASSERT_TRUE(SetupClients()); // Setup custom quota params: to effectively never refill.
diff --git a/chrome/browser/sync/test/integration/single_client_sharing_message_sync_test.cc b/chrome/browser/sync/test/integration/single_client_sharing_message_sync_test.cc index 0c7b6ee..ea5b0562 100644 --- a/chrome/browser/sync/test/integration/single_client_sharing_message_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_sharing_message_sync_test.cc
@@ -7,6 +7,7 @@ #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" #include "base/test/mock_callback.h" +#include "base/time/time.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/sharing/features.h" #include "chrome/browser/sharing/sharing_message_bridge.h"
diff --git a/chrome/browser/sync/test/integration/sync_test_utils_android.cc b/chrome/browser/sync/test/integration/sync_test_utils_android.cc index 0725113..0446560 100644 --- a/chrome/browser/sync/test/integration/sync_test_utils_android.cc +++ b/chrome/browser/sync/test/integration/sync_test_utils_android.cc
@@ -7,7 +7,6 @@ #include "base/android/jni_android.h" #include "base/callback.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "chrome/test/sync_integration_test_support_jni_headers/SyncTestSigninUtils_jni.h"
diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc index a536851..c6f0eb6 100644 --- a/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc +++ b/chrome/browser/sync/test/integration/two_client_web_apps_integration_test_mac_win_linux.cc
@@ -1130,9 +1130,10 @@ helper_.CheckAppInListNotLocallyInstalled("SiteA"); } +// TODO(crbug.com/1311896): Consistently fails on win10 and win7. IN_PROC_BROWSER_TEST_F( TwoClientWebAppsIntegrationTestMacWinLinux, - WebAppIntegration_29SiteA_11SiteA_7SiteA_40Client2_45SiteA_10SiteA_15SiteA_40Client1_15SiteA) { + DISABLED_WebAppIntegration_29SiteA_11SiteA_7SiteA_40Client2_45SiteA_10SiteA_15SiteA_40Client1_15SiteA) { // Test contents are generated by script. Please do not modify! // See `chrome/test/webapps/README.md` for more info. // Sheriffs: Disabling this test is supported.
diff --git a/chrome/browser/sync/test/integration/wallet_helper.h b/chrome/browser/sync/test/integration/wallet_helper.h index b0e7f424..aae28fa 100644 --- a/chrome/browser/sync/test/integration/wallet_helper.h +++ b/chrome/browser/sync/test/integration/wallet_helper.h
@@ -13,6 +13,7 @@ #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "chrome/browser/sync/test/integration/multi_client_status_change_checker.h" #include "components/autofill/core/browser/personal_data_manager_observer.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc index b7b3150..2f5654c 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
@@ -11,7 +11,6 @@ #include "base/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/observer_list.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc index 04fbac3a..f2742b14 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
@@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker.h b/chrome/browser/sync_file_system/drive_backend/sync_worker.h index 6a26da6..f7da9ce7 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_worker.h +++ b/chrome/browser/sync_file_system/drive_backend/sync_worker.h
@@ -13,6 +13,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" #include "chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h" #include "chrome/browser/sync_file_system/remote_file_sync_service.h"
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_context.h b/chrome/browser/sync_file_system/local/local_file_sync_context.h index b21f2676..5ee9ac0 100644 --- a/chrome/browser/sync_file_system/local/local_file_sync_context.h +++ b/chrome/browser/sync_file_system/local/local_file_sync_context.h
@@ -19,6 +19,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/sync_file_system/local/local_file_sync_status.h" #include "chrome/browser/sync_file_system/sync_callbacks.h"
diff --git a/chrome/browser/sync_file_system/sync_process_runner.h b/chrome/browser/sync_file_system/sync_process_runner.h index 253d73b..cd18534 100644 --- a/chrome/browser/sync_file_system/sync_process_runner.h +++ b/chrome/browser/sync_file_system/sync_process_runner.h
@@ -13,6 +13,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/sync_file_system/sync_callbacks.h" #include "chrome/browser/sync_file_system/sync_service_state.h"
diff --git a/chrome/browser/sync_file_system/sync_process_runner_unittest.cc b/chrome/browser/sync_file_system/sync_process_runner_unittest.cc index be8110f..c4877073 100644 --- a/chrome/browser/sync_file_system/sync_process_runner_unittest.cc +++ b/chrome/browser/sync_file_system/sync_process_runner_unittest.cc
@@ -11,6 +11,7 @@ #include <utility> #include "base/containers/queue.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_file_system {
diff --git a/chrome/browser/tab_contents/form_interaction_tab_helper_unittest.cc b/chrome/browser/tab_contents/form_interaction_tab_helper_unittest.cc index 66653b9..39f5a02 100644 --- a/chrome/browser/tab_contents/form_interaction_tab_helper_unittest.cc +++ b/chrome/browser/tab_contents/form_interaction_tab_helper_unittest.cc
@@ -9,7 +9,6 @@ #include "base/callback_helpers.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/test/bind.h" #include "chrome/browser/performance_manager/test_support/page_aggregator.h"
diff --git a/chrome/browser/task_manager/providers/vm/vm_process_task_provider.cc b/chrome/browser/task_manager/providers/vm/vm_process_task_provider.cc index bce5317..d056426 100644 --- a/chrome/browser/task_manager/providers/vm/vm_process_task_provider.cc +++ b/chrome/browser/task_manager/providers/vm/vm_process_task_provider.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/containers/flat_set.h" #include "base/process/process_iterator.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/task_manager/sampling/shared_sampler_win_unittest.cc b/chrome/browser/task_manager/sampling/shared_sampler_win_unittest.cc index 46aba8a..8dde0fe 100644 --- a/chrome/browser/task_manager/sampling/shared_sampler_win_unittest.cc +++ b/chrome/browser/task_manager/sampling/shared_sampler_win_unittest.cc
@@ -14,7 +14,6 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/task_manager/sampling/task_manager_impl.cc b/chrome/browser/task_manager/sampling/task_manager_impl.cc index c54831c6..fbd69e4 100644 --- a/chrome/browser/task_manager/sampling/task_manager_impl.cc +++ b/chrome/browser/task_manager/sampling/task_manager_impl.cc
@@ -15,7 +15,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/containers/adapters.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/taskbar/taskbar_decorator_win.cc b/chrome/browser/taskbar/taskbar_decorator_win.cc index 5066f716..ac852d4 100644 --- a/chrome/browser/taskbar/taskbar_decorator_win.cc +++ b/chrome/browser/taskbar/taskbar_decorator_win.cc
@@ -16,7 +16,6 @@ #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/win/scoped_gdi_object.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index b5008110..628577ad 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -22,7 +22,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "base/values.h"
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index e921b7e..dbc4dfd 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc
@@ -25,7 +25,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_bridge.cc b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_bridge.cc index db07775..39f7410 100644 --- a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_bridge.cc +++ b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_bridge.cc
@@ -6,7 +6,6 @@ #include "base/android/jni_string.h" #include "base/bind.h" #include "base/files/file_path.h" -#include "base/task/post_task.h" #include "chrome/browser/thumbnail/generator/android/thumbnail_media_parser.h" #include "chrome/browser/thumbnail/generator/test_support_jni_headers/ThumbnailMediaData_jni.h" #include "chrome/browser/thumbnail/generator/test_support_jni_headers/ThumbnailMediaParserBridge_jni.h"
diff --git a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.cc b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.cc index aa0c2b4..760f324 100644 --- a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.cc +++ b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.cc
@@ -10,7 +10,6 @@ #include "base/files/file.h" #include "base/files/file_util.h" #include "base/numerics/safe_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/thumbnail/generator/thumbnail_util.cc b/chrome/browser/thumbnail/generator/thumbnail_util.cc index 969ec725..08c6940 100644 --- a/chrome/browser/thumbnail/generator/thumbnail_util.cc +++ b/chrome/browser/thumbnail/generator/thumbnail_util.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/check.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_thread.h" #include "skia/ext/image_operations.h"
diff --git a/chrome/browser/touch_to_fill/touch_to_fill_controller_unittest.cc b/chrome/browser/touch_to_fill/touch_to_fill_controller_unittest.cc index ac2af5d..ca0c0155 100644 --- a/chrome/browser/touch_to_fill/touch_to_fill_controller_unittest.cc +++ b/chrome/browser/touch_to_fill/touch_to_fill_controller_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "base/types/pass_key.h" #include "components/autofill/core/common/mojom/autofill_types.mojom.h" #include "components/device_reauth/biometric_authenticator.h"
diff --git a/chrome/browser/tracing/chrome_tracing_delegate.h b/chrome/browser/tracing/chrome_tracing_delegate.h index 684073a..953a892 100644 --- a/chrome/browser/tracing/chrome_tracing_delegate.h +++ b/chrome/browser/tracing/chrome_tracing_delegate.h
@@ -10,6 +10,7 @@ #include "base/containers/flat_map.h" #include "base/gtest_prod_util.h" #include "base/no_destructor.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/public/browser/tracing_delegate.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ui/app_list/app_list_client_impl.h b/chrome/browser/ui/app_list/app_list_client_impl.h index eb23db2..b32d6fca 100644 --- a/chrome/browser/ui/app_list/app_list_client_impl.h +++ b/chrome/browser/ui/app_list/app_list_client_impl.h
@@ -20,6 +20,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "components/search_engines/template_url_service.h" #include "components/search_engines/template_url_service_observer.h"
diff --git a/chrome/browser/ui/app_list/arc/arc_app_icon.cc b/chrome/browser/ui/app_list/arc/arc_app_icon.cc index 39c0fe9..73f87f7 100644 --- a/chrome/browser/ui/app_list/arc/arc_app_icon.cc +++ b/chrome/browser/ui/app_list/arc/arc_app_icon.cc
@@ -17,7 +17,6 @@ #include "base/lazy_instance.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/image_decoder/image_decoder.h" #include "chrome/browser/ui/app_list/arc/arc_app_icon_descriptor.h"
diff --git a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc index e1d1313..1a10214 100644 --- a/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc +++ b/chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc
@@ -27,7 +27,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/ui/app_list/arc/arc_default_app_list.cc b/chrome/browser/ui/app_list/arc/arc_default_app_list.cc index e8e7446..f841d287 100644 --- a/chrome/browser/ui/app_list/arc/arc_default_app_list.cc +++ b/chrome/browser/ui/app_list/arc/arc_default_app_list.cc
@@ -18,7 +18,6 @@ #include "base/path_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/app_list/arc/arc_vpn_provider_manager.h b/chrome/browser/ui/app_list/arc/arc_vpn_provider_manager.h index db456ae3e..d0c946d 100644 --- a/chrome/browser/ui/app_list/arc/arc_vpn_provider_manager.h +++ b/chrome/browser/ui/app_list/arc/arc_vpn_provider_manager.h
@@ -12,6 +12,7 @@ #include "base/observer_list.h" #include "base/observer_list_types.h" +#include "base/time/time.h" #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc b/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc index 06948b1..ba931e1 100644 --- a/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc +++ b/chrome/browser/ui/app_list/internal_app/internal_app_metadata.cc
@@ -16,6 +16,7 @@ #include "base/no_destructor.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/apps/app_service/metrics/app_service_metrics.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_util.h" #include "chrome/browser/ash/release_notes/release_notes_storage.h"
diff --git a/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.h b/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.h index d03251b..0f9f5b9b 100644 --- a/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.h +++ b/chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher_impl.h
@@ -7,6 +7,7 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string_piece_forward.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ui/app_list/search/arc/recommend_apps_fetcher.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder.cc b/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder.cc index 74d725d..82e719f 100644 --- a/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder.cc +++ b/chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder.cc
@@ -18,7 +18,6 @@ #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "chrome/browser/download/download_prefs.h"
diff --git a/chrome/browser/ui/app_list/search/files/zero_state_drive_provider.cc b/chrome/browser/ui/app_list/search/files/zero_state_drive_provider.cc index 2ac1163..0872806 100644 --- a/chrome/browser/ui/app_list/search/files/zero_state_drive_provider.cc +++ b/chrome/browser/ui/app_list/search/files/zero_state_drive_provider.cc
@@ -18,7 +18,6 @@ #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/app_list/search/files/zero_state_file_provider.cc b/chrome/browser/ui/app_list/search/files/zero_state_file_provider.cc index 904e7e8..93288ea0 100644 --- a/chrome/browser/ui/app_list/search/files/zero_state_file_provider.cc +++ b/chrome/browser/ui/app_list/search/files/zero_state_file_provider.cc
@@ -17,7 +17,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/app_list/search/games/game_provider.cc b/chrome/browser/ui/app_list/search/games/game_provider.cc index 4a78905..4050eeb4 100644 --- a/chrome/browser/ui/app_list/search/games/game_provider.cc +++ b/chrome/browser/ui/app_list/search/games/game_provider.cc
@@ -6,6 +6,7 @@ #include <utility> +#include "ash/constants/ash_pref_names.h" #include "base/strings/strcat.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" @@ -19,6 +20,7 @@ #include "chrome/grit/generated_resources.h" #include "chromeos/components/string_matching/tokenized_string.h" #include "chromeos/components/string_matching/tokenized_string_match.h" +#include "components/prefs/pref_service.h" #include "ui/base/l10n/l10n_util.h" namespace app_list { @@ -30,6 +32,10 @@ constexpr double kRelevanceThreshold = 0.7; constexpr size_t kMaxResults = 3u; +bool IsSuggestedContentEnabled(Profile* profile) { + return profile->GetPrefs()->GetBoolean(ash::prefs::kSuggestedContentEnabled); +} + double CalculateTitleRelevance(const TokenizedString& tokenized_query, const std::u16string& game_title) { const TokenizedString tokenized_title(game_title, @@ -102,7 +108,7 @@ void GameProvider::Start(const std::u16string& query) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (game_index_.empty()) + if (!IsSuggestedContentEnabled(profile_) || game_index_.empty()) return; // Clear results and discard any existing searches.
diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.h b/chrome/browser/ui/app_list/search/omnibox_provider.h index d1387ca..2b85e01 100644 --- a/chrome/browser/ui/app_list/search/omnibox_provider.h +++ b/chrome/browser/ui/app_list/search/omnibox_provider.h
@@ -7,6 +7,7 @@ #include <memory> +#include "base/time/time.h" #include "chrome/browser/ui/app_list/search/search_provider.h" #include "chromeos/components/string_matching/tokenized_string.h" #include "components/omnibox/browser/autocomplete_controller.h"
diff --git a/chrome/browser/ui/app_list/search/ranking/removed_results_ranker.h b/chrome/browser/ui/app_list/search/ranking/removed_results_ranker.h index 3b6a15e..d7ac981b 100644 --- a/chrome/browser/ui/app_list/search/ranking/removed_results_ranker.h +++ b/chrome/browser/ui/app_list/search/ranking/removed_results_ranker.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_APP_LIST_SEARCH_RANKING_REMOVED_RESULTS_RANKER_H_ #include "base/files/file_path.h" +#include "base/time/time.h" #include "chrome/browser/ui/app_list/search/ranking/ranker.h" #include "chrome/browser/ui/app_list/search/ranking/removed_results.pb.h" #include "chrome/browser/ui/app_list/search/util/persistent_proto.h"
diff --git a/chrome/browser/ui/app_list/search/search_controller_factory.cc b/chrome/browser/ui/app_list/search/search_controller_factory.cc index dd5a791..6029791e 100644 --- a/chrome/browser/ui/app_list/search/search_controller_factory.cc +++ b/chrome/browser/ui/app_list/search/search_controller_factory.cc
@@ -35,6 +35,7 @@ #include "chrome/browser/ui/app_list/search/search_controller.h" #include "chrome/browser/ui/app_list/search/search_controller_impl.h" #include "chrome/browser/ui/app_list/search/search_controller_impl_new.h" +#include "chrome/browser/ui/app_list/search/search_features.h" #include "chrome/common/chrome_features.h" #include "chrome/common/chrome_switches.h" #include "chromeos/services/assistant/public/cpp/features.h" @@ -185,10 +186,7 @@ controller->AddProvider(help_app_group_id, std::make_unique<HelpAppProvider>(profile)); - // TODO(crbug.com/1305880): Move this to its own flag. - if (ash::features::IsProductivityLauncherEnabled() && - base::GetFieldTrialParamByFeatureAsBool( - ash::features::kProductivityLauncher, "enable_games", false)) { + if (search_features::IsLauncherGameSearchEnabled()) { size_t games_group_id = controller->AddGroup(kGenericMaxResults); controller->AddProvider(games_group_id, std::make_unique<GameProvider>( profile, list_controller));
diff --git a/chrome/browser/ui/app_list/search/search_controller_impl_new.h b/chrome/browser/ui/app_list/search/search_controller_impl_new.h index 80c245f..13ca9b8 100644 --- a/chrome/browser/ui/app_list/search/search_controller_impl_new.h +++ b/chrome/browser/ui/app_list/search/search_controller_impl_new.h
@@ -15,6 +15,7 @@ #include "base/callback.h" #include "base/containers/flat_map.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ui/app_list/search/mixer.h" #include "chrome/browser/ui/app_list/search/ranking/launch_data.h"
diff --git a/chrome/browser/ui/app_list/search/search_controller_impl_new_unittest.cc b/chrome/browser/ui/app_list/search/search_controller_impl_new_unittest.cc index 79249bed..666283b6 100644 --- a/chrome/browser/ui/app_list/search/search_controller_impl_new_unittest.cc +++ b/chrome/browser/ui/app_list/search/search_controller_impl_new_unittest.cc
@@ -10,10 +10,10 @@ #include "ash/public/cpp/app_list/app_list_features.h" #include "ash/public/cpp/app_list/app_list_types.h" #include "ash/public/cpp/test/shell_test_api.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "chrome/browser/ui/app_list/search/chrome_search_result.h" #include "chrome/browser/ui/app_list/search/ranking/ranker_delegate.h" #include "chrome/browser/ui/app_list/search/search_controller.h"
diff --git a/chrome/browser/ui/app_list/search/search_features.cc b/chrome/browser/ui/app_list/search/search_features.cc index 04e3f3a..aecc38a 100644 --- a/chrome/browser/ui/app_list/search/search_features.cc +++ b/chrome/browser/ui/app_list/search/search_features.cc
@@ -7,4 +7,13 @@ #include "base/feature_list.h" #include "base/metrics/field_trial_params.h" -namespace search_features {} // namespace search_features +namespace search_features { + +const base::Feature kLauncherGameSearch{"LauncherGameSearch", + base::FEATURE_DISABLED_BY_DEFAULT}; + +bool IsLauncherGameSearchEnabled() { + return base::FeatureList::IsEnabled(kLauncherGameSearch); +} + +} // namespace search_features
diff --git a/chrome/browser/ui/app_list/search/search_features.h b/chrome/browser/ui/app_list/search/search_features.h index bbb3799e..7e5fbbc 100644 --- a/chrome/browser/ui/app_list/search/search_features.h +++ b/chrome/browser/ui/app_list/search/search_features.h
@@ -11,8 +11,10 @@ namespace search_features { -// This file is currently unused, but is kept as a staging ground for search -// backend feature flags. +// Enables cloud game search in the launcher. +extern const base::Feature kLauncherGameSearch; + +bool IsLauncherGameSearchEnabled(); } // namespace search_features
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_event_logger.cc b/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_event_logger.cc index 226d59e6..1b3c4e7 100644 --- a/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_event_logger.cc +++ b/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_event_logger.cc
@@ -13,7 +13,6 @@ #include "base/metrics/histogram_macros.h" #include "base/rand_util.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "chrome/browser/ash/power/ml/recent_events_counter.h"
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_predictor_unittest.cc b/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_predictor_unittest.cc index 1e15ca58..31c2aed 100644 --- a/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_predictor_unittest.cc +++ b/chrome/browser/ui/app_list/search/search_result_ranker/app_launch_predictor_unittest.cc
@@ -7,6 +7,7 @@ #include "ash/public/cpp/app_list/app_list_features.h" #include "base/test/scoped_feature_list.h" #include "base/test/scoped_mock_clock_override.h" +#include "base/time/time.h" #include "chrome/browser/ui/app_list/search/search_result_ranker/app_launch_predictor_test_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/app_search_result_ranker.cc b/chrome/browser/ui/app_list/search/search_result_ranker/app_search_result_ranker.cc index 26cb9a3..915dfa1 100644 --- a/chrome/browser/ui/app_list/search/search_result_ranker/app_search_result_ranker.cc +++ b/chrome/browser/ui/app_list/search/search_result_ranker/app_search_result_ranker.cc
@@ -9,7 +9,6 @@ #include "base/files/file_util.h" #include "base/files/important_file_writer.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_predictor_unittest.cc b/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_predictor_unittest.cc index 51f4129..dd578ea 100644 --- a/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_predictor_unittest.cc +++ b/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_predictor_unittest.cc
@@ -14,6 +14,7 @@ #include "base/hash/hash.h" #include "base/test/scoped_mock_clock_override.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "chrome/browser/ui/app_list/search/search_result_ranker/app_launch_predictor_test_util.h" #include "chrome/browser/ui/app_list/search/search_result_ranker/frecency_store.h" #include "chrome/browser/ui/app_list/search/search_result_ranker/recurrence_ranker_config.pb.h"
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_ranker.cc b/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_ranker.cc index 380522e..0e460933 100644 --- a/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_ranker.cc +++ b/chrome/browser/ui/app_list/search/search_result_ranker/recurrence_ranker.cc
@@ -12,7 +12,6 @@ #include "base/files/file_util.h" #include "base/files/important_file_writer.h" #include "base/hash/hash.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc b/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc index 289a4ed..2abe6a3e 100644 --- a/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc +++ b/chrome/browser/ui/app_list/search/search_result_ranker/search_result_ranker.cc
@@ -17,7 +17,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h" #include "chrome/browser/ash/file_manager/file_tasks_notifier.h"
diff --git a/chrome/browser/ui/app_list/search/util/persistent_proto.h b/chrome/browser/ui/app_list/search/util/persistent_proto.h index 18de4ad..7a3d0aab 100644 --- a/chrome/browser/ui/app_list/search/util/persistent_proto.h +++ b/chrome/browser/ui/app_list/search/util/persistent_proto.h
@@ -12,7 +12,6 @@ #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc b/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc index 7ef5924..3273968 100644 --- a/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc +++ b/chrome/browser/ui/ash/assistant/assistant_timers_browsertest.cc
@@ -18,6 +18,7 @@ #include "base/test/bind.h" #include "base/test/icu_test_util.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "chrome/browser/ui/ash/assistant/assistant_test_mixin.h" #include "chrome/browser/ui/ash/assistant/test_support/test_util.h" #include "chrome/test/base/mixin_based_in_process_browser_test.h"
diff --git a/chrome/browser/ui/ash/calendar/calendar_keyed_service_unittest.cc b/chrome/browser/ui/ash/calendar/calendar_keyed_service_unittest.cc index 0f600f4..7d27c6f7 100644 --- a/chrome/browser/ui/ash/calendar/calendar_keyed_service_unittest.cc +++ b/chrome/browser/ui/ash/calendar/calendar_keyed_service_unittest.cc
@@ -10,6 +10,7 @@ #include "ash/calendar/calendar_controller.h" #include "ash/shell.h" #include "base/test/bind.h" +#include "base/time/time.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/ui/ash/calendar/calendar_keyed_service_factory.h" #include "chrome/test/base/browser_with_test_window_test.h"
diff --git a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc index 5ce671c8..d0d527e 100644 --- a/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc +++ b/chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc
@@ -14,7 +14,6 @@ #include "ash/shell.h" #include "base/command_line.h" #include "base/scoped_observation.h" -#include "base/task/post_task.h" #include "chrome/browser/ash/crosapi/browser_util.h" #include "chrome/browser/ash/login/signin/signin_error_notifier_factory.h" #include "chrome/browser/ash/night_light/night_light_client.h"
diff --git a/chrome/browser/ui/ash/session_controller_client_impl.cc b/chrome/browser/ui/ash/session_controller_client_impl.cc index 3ca4690..3f69c7f 100644 --- a/chrome/browser/ui/ash/session_controller_client_impl.cc +++ b/chrome/browser/ui/ash/session_controller_client_impl.cc
@@ -16,6 +16,7 @@ #include "base/cxx17_backports.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/ash/crosapi/browser_manager.h" #include "chrome/browser/ash/crosapi/browser_util.h"
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_arc_tracker.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_arc_tracker.cc index 687e88bb..d074862 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_arc_tracker.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_app_window_arc_tracker.cc
@@ -13,7 +13,6 @@ #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h"
diff --git a/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.h b/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.h index 247e6247..5cd96ec2 100644 --- a/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.h +++ b/chrome/browser/ui/ash/shelf/arc_shelf_spinner_item_controller.h
@@ -12,6 +12,7 @@ #include "ash/components/arc/mojom/app.mojom.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/arc/session/arc_session_manager_observer.h" #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc index 4214029f..1e113233 100644 --- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc +++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc
@@ -31,7 +31,6 @@ #include "base/strings/pattern.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/ash/test_session_controller.h b/chrome/browser/ui/ash/test_session_controller.h index beefd1c90..efd4c35 100644 --- a/chrome/browser/ui/ash/test_session_controller.h +++ b/chrome/browser/ui/ash/test_session_controller.h
@@ -10,6 +10,7 @@ #include "ash/public/cpp/session/session_controller.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" // Test implementation of ash's SessionController interface.
diff --git a/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.h b/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.h index da56e3d..7db2d35 100644 --- a/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.h +++ b/chrome/browser/ui/autofill/payments/offer_notification_bubble_controller_impl.h
@@ -7,6 +7,7 @@ #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "chrome/browser/commerce/coupons/coupon_service.h" #include "chrome/browser/commerce/coupons/coupon_service_observer.h" #include "chrome/browser/ui/autofill/autofill_bubble_controller_base.h"
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc index 2d08540..4bf3832 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h" +#include <iterator> #include <numeric> #include "base/containers/contains.h" @@ -18,6 +19,7 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/simple_message_box.h" +#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group.h" #include "chrome/browser/ui/tabs/tab_group.h" #include "chrome/browser/ui/tabs/tab_group_model.h" #include "chrome/grit/chromium_strings.h" @@ -264,8 +266,13 @@ if (!navigator) return; - const auto opened_web_contents = OpenAllHelper( - navigator, std::move(saved_group->urls), initial_disposition); + std::vector<GURL> urls; + auto get_urls = [&](SavedTabGroupTab saved_tab) { return saved_tab.url; }; + base::ranges::transform(saved_group->saved_tabs, std::back_inserter(urls), + get_urls); + + const auto opened_web_contents = + OpenAllHelper(navigator, std::move(urls), initial_disposition); TabStripModel* model = browser->tab_strip_model(); @@ -303,7 +310,7 @@ const SavedTabGroup* saved_group, WindowOpenDisposition initial_disposition) { // Skip the prompt if there are few bookmarks. - size_t child_count = saved_group->urls.size(); + size_t child_count = saved_group->saved_tabs.size(); if (child_count < kNumBookmarkUrlsBeforePrompting) { OpenSavedTabGroupHelper(browser, std::move(get_navigator), std::move(saved_group), initial_disposition,
diff --git a/chrome/browser/ui/browser_navigator_params.h b/chrome/browser/ui/browser_navigator_params.h index 5a09683..b2b87cc 100644 --- a/chrome/browser/ui/browser_navigator_params.h +++ b/chrome/browser/ui/browser_navigator_params.h
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/public/browser/global_request_id.h" #include "content/public/browser/reload_type.h"
diff --git a/chrome/browser/ui/certificate_dialogs.cc b/chrome/browser/ui/certificate_dialogs.cc index 9f5bbd29..15cfe72 100644 --- a/chrome/browser/ui/certificate_dialogs.cc +++ b/chrome/browser/ui/certificate_dialogs.cc
@@ -16,7 +16,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/ui/chrome_select_file_policy.h"
diff --git a/chrome/browser/ui/color/chrome_color_id.h b/chrome/browser/ui/color/chrome_color_id.h index 044e68b..5a48ec9 100644 --- a/chrome/browser/ui/color/chrome_color_id.h +++ b/chrome/browser/ui/color/chrome_color_id.h
@@ -435,7 +435,15 @@ E_CPONLY(kColorCaptionCloseButtonBackgroundHovered) \ E_CPONLY(kColorCaptionCloseButtonForegroundHovered) \ E_CPONLY(kColorCaptionForegroundActive) \ - E_CPONLY(kColorCaptionForegroundInactive) + E_CPONLY(kColorCaptionForegroundInactive) \ + E_CPONLY(kColorTryChromeAcceptButtonBackground) \ + E_CPONLY(kColorTryChromeBackground) \ + E_CPONLY(kColorTryChromeBorder) \ + E_CPONLY(kColorTryChromeButtonForeground) \ + E_CPONLY(kColorTryChromeForeground) \ + E_CPONLY(kColorTryChromeIcon) \ + E_CPONLY(kColorTryChromeNoThanksButtonBackground) \ + #else #define CHROME_PLATFORM_SPECIFIC_COLOR_IDS #endif // BUILDFLAG(IS_WIN)
diff --git a/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc b/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc index d23cbc60..56fbac9 100644 --- a/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc +++ b/chrome/browser/ui/color/win/native_chrome_color_mixer_win.cc
@@ -242,6 +242,15 @@ GetCaptionForegroundColor(ui::kColorFrameActive); mixer[kColorCaptionForegroundInactive] = SetAlpha(GetCaptionForegroundColor(ui::kColorFrameInactive), 0x66); + mixer[kColorTryChromeAcceptButtonBackground] = { + SkColorSetRGB(0x00, 0x78, 0xDA)}; + mixer[kColorTryChromeBackground] = {SkColorSetRGB(0x1F, 0x1F, 0x1F)}; + mixer[kColorTryChromeBorder] = {SkColorSetARGB(0x80, 0x80, 0x80, 0x80)}; + mixer[kColorTryChromeButtonForeground] = {SK_ColorWHITE}; + mixer[kColorTryChromeForeground] = {SK_ColorWHITE}; + mixer[kColorTryChromeIcon] = {SkColorSetA(SK_ColorWHITE, 0xAD)}; + mixer[kColorTryChromeNoThanksButtonBackground] = { + SkColorSetA(SK_ColorWHITE, 0x33)}; if (key.color_mode == ui::ColorProviderManager::ColorMode::kLight) { mixer[kColorNewTabPageBackground] = {ui::kColorNativeWindow};
diff --git a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc index ad150da..cad7eb1 100644 --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
@@ -8,7 +8,6 @@ #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/global_media_controls/cast_media_notification_item.cc b/chrome/browser/ui/global_media_controls/cast_media_notification_item.cc index a8d4d499..dcfcd5c 100644 --- a/chrome/browser/ui/global_media_controls/cast_media_notification_item.cc +++ b/chrome/browser/ui/global_media_controls/cast_media_notification_item.cc
@@ -8,6 +8,7 @@ #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/feature_engagement/tracker_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/global_media_controls/cast_media_session_controller.h"
diff --git a/chrome/browser/ui/hats/hats_helper.cc b/chrome/browser/ui/hats/hats_helper.cc index c629f379..3f017ad 100644 --- a/chrome/browser/ui/hats/hats_helper.cc +++ b/chrome/browser/ui/hats/hats_helper.cc
@@ -26,15 +26,10 @@ : WebContentsObserver(web_contents), content::WebContentsUserData<HatsHelper>(*web_contents) {} -void HatsHelper::DidFinishNavigation( - content::NavigationHandle* navigation_handle) { +void HatsHelper::PrimaryPageChanged(content::Page& page) { // Ignore everything except NTP opens. - if (!navigation_handle->HasCommitted() || - !navigation_handle->IsInMainFrame() || - navigation_handle->GetWebContents()->GetLastCommittedURL() != - chrome::kChromeUINewTabURL) { + if (web_contents()->GetLastCommittedURL() != chrome::kChromeUINewTabURL) return; - } if (auto* sentiment_service = TrustSafetySentimentServiceFactory::GetForProfile(profile())) {
diff --git a/chrome/browser/ui/hats/hats_helper.h b/chrome/browser/ui/hats/hats_helper.h index 763f1bc..2d842ac 100644 --- a/chrome/browser/ui/hats/hats_helper.h +++ b/chrome/browser/ui/hats/hats_helper.h
@@ -30,8 +30,7 @@ explicit HatsHelper(content::WebContents* web_contents); // contents::WebContentsObserver: - void DidFinishNavigation( - content::NavigationHandle* navigation_handle) override; + void PrimaryPageChanged(content::Page& page) override; Profile* profile() const;
diff --git a/chrome/browser/ui/hats/hats_helper_unittest.cc b/chrome/browser/ui/hats/hats_helper_unittest.cc index 3829daa..d141a9c 100644 --- a/chrome/browser/ui/hats/hats_helper_unittest.cc +++ b/chrome/browser/ui/hats/hats_helper_unittest.cc
@@ -12,9 +12,11 @@ #include "chrome/common/webui_url_constants.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/browser_task_environment.h" +#include "content/public/test/navigation_simulator.h" #include "content/public/test/test_renderer_host.h" #include "content/public/test/web_contents_tester.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/blink/public/common/features.h" class HatsHelperTest : public testing::Test { public: @@ -46,6 +48,8 @@ return content::WebContentsTester::For(web_contents_.get()); } + content::RenderFrameHost* main_rfh() { return web_contents_->GetMainFrame(); } + private: content::BrowserTaskEnvironment task_environment_; TestingProfile profile_; @@ -66,3 +70,43 @@ EXPECT_CALL(*mock_sentiment_service(), OpenedNewTabPage()).Times(0); test_web_contents()->NavigateAndCommit(GURL("https://unrelated.com")); } + +class HatsHelperFencedFrameTest : public HatsHelperTest { + public: + HatsHelperFencedFrameTest() { + scoped_feature_list_.InitAndEnableFeatureWithParameters( + blink::features::kFencedFrames, {{"implementation_type", "mparch"}}); + } + ~HatsHelperFencedFrameTest() override = default; + + content::RenderFrameHost* CreateFencedFrame( + content::RenderFrameHost* parent) { + content::RenderFrameHost* fenced_frame = + content::RenderFrameHostTester::For(parent)->AppendFencedFrame(); + return fenced_frame; + } + + private: + base::test::ScopedFeatureList scoped_feature_list_; +}; + +TEST_F(HatsHelperFencedFrameTest, + SentimentServiceIsNotInformedAfterNavigationInFencedFrame) { + // Check that the helper correctly informs the sentiment service that the + // user has visited the NTP on the main frame. + EXPECT_CALL(*mock_sentiment_service(), OpenedNewTabPage()); + test_web_contents()->NavigateAndCommit(GURL(chrome::kChromeUINewTabURL)); + testing::Mock::VerifyAndClearExpectations(mock_hats_service()); + + // Navigations in fenced frames should not inform the service. + EXPECT_CALL(*mock_sentiment_service(), OpenedNewTabPage()).Times(0); + content::RenderFrameHostTester::For(main_rfh()) + ->InitializeRenderFrameIfNeeded(); + content::RenderFrameHost* fenced_frame_rfh = CreateFencedFrame(main_rfh()); + GURL fenced_frame_url = GURL("https://unrelated.com"); + std::unique_ptr<content::NavigationSimulator> navigation_simulator = + content::NavigationSimulator::CreateForFencedFrame(fenced_frame_url, + fenced_frame_rfh); + navigation_simulator->Commit(); + EXPECT_TRUE(fenced_frame_rfh->IsFencedFrameRoot()); +}
diff --git a/chrome/browser/ui/hats/trust_safety_sentiment_service.h b/chrome/browser/ui/hats/trust_safety_sentiment_service.h index da285fd3..e2db7648 100644 --- a/chrome/browser/ui/hats/trust_safety_sentiment_service.h +++ b/chrome/browser/ui/hats/trust_safety_sentiment_service.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_multi_source_observation.h" +#include "base/time/time.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_observer.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc b/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc index cac3d3a..105ee2f0 100644 --- a/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc +++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller_browsertest.cc
@@ -11,7 +11,6 @@ #include "base/files/file_util.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/threading/thread_restrictions.h" #include "base/timer/elapsed_timer.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/startup/launch_mode_recorder.cc b/chrome/browser/ui/startup/launch_mode_recorder.cc index 91bb734..9171d6da 100644 --- a/chrome/browser/ui/startup/launch_mode_recorder.cc +++ b/chrome/browser/ui/startup/launch_mode_recorder.cc
@@ -12,7 +12,6 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc index e13874b..67e7307 100644 --- a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc +++ b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop.cc
@@ -8,7 +8,6 @@ #include "base/files/file_util.h" #include "base/memory/weak_ptr.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h"
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group.cc b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group.cc index aff17943..e424473 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group.cc +++ b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group.cc
@@ -4,11 +4,27 @@ #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group.h" +#include <string> +#include <vector> + +#include "components/tab_groups/tab_group_color.h" +#include "components/tab_groups/tab_group_id.h" +#include "ui/gfx/image/image.h" +#include "url/gurl.h" + +SavedTabGroupTab::SavedTabGroupTab(const GURL& url, + const std::u16string& tab_title, + const gfx::Image& favicon) + : url(url), tab_title(tab_title), favicon(favicon) {} + SavedTabGroup::SavedTabGroup(const tab_groups::TabGroupId& group_id, const std::u16string& title, const tab_groups::TabGroupColorId& color, - const std::vector<GURL>& urls) - : group_id(group_id), title(title), color(color), urls(urls) {} + const std::vector<SavedTabGroupTab>& saved_tabs) + : group_id(group_id), title(title), color(color), saved_tabs(saved_tabs) {} -SavedTabGroup::~SavedTabGroup() = default; +SavedTabGroupTab::SavedTabGroupTab(const SavedTabGroupTab& other) = default; SavedTabGroup::SavedTabGroup(const SavedTabGroup& other) = default; + +SavedTabGroupTab::~SavedTabGroupTab() = default; +SavedTabGroup::~SavedTabGroup() = default;
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group.h b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group.h index 66bc7ae..bc7a921 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group.h +++ b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group.h
@@ -10,8 +10,25 @@ #include "components/tab_groups/tab_group_color.h" #include "components/tab_groups/tab_group_id.h" +#include "ui/gfx/image/image.h" #include "url/gurl.h" +// A SavedTabGroupTab stores the url, title, and favicon of a tab. +struct SavedTabGroupTab { + SavedTabGroupTab(const GURL& url, + const std::u16string& tab_title, + const gfx::Image& favicon); + SavedTabGroupTab(const SavedTabGroupTab& other); + ~SavedTabGroupTab(); + + // The link to navigate with. + GURL url; + // The title of the website this urls is associated with. + std::u16string tab_title; + // The favicon of the website this SavedTabGroupTab represents. + gfx::Image favicon; +}; + // Preserves the state of a Tab group that was saved from the // tab_group_editor_bubble_views save toggle button. Additionally, these values // may change if the tab groups name, color, or urls are changed from the @@ -20,7 +37,7 @@ SavedTabGroup(const tab_groups::TabGroupId& group_id, const std::u16string& title, const tab_groups::TabGroupColorId& color, - const std::vector<GURL>& urls); + const std::vector<SavedTabGroupTab>& urls); SavedTabGroup(const SavedTabGroup& other); ~SavedTabGroup(); @@ -32,7 +49,7 @@ // The color of the saved tab group. tab_groups::TabGroupColorId color; // The URLS and later webcontents (such as favicons) of the saved tab group. - std::vector<GURL> urls; + std::vector<SavedTabGroupTab> saved_tabs; }; #endif // CHROME_BROWSER_UI_TABS_SAVED_TAB_GROUPS_SAVED_TAB_GROUP_H_
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_unittest.cc b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_unittest.cc index 6e1507b..39c1c3e 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_unittest.cc +++ b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_unittest.cc
@@ -3,14 +3,15 @@ // found in the LICENSE file. #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model.h" -#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_observer.h" #include <map> #include <memory> #include <string> #include <vector> +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group.h" +#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_observer.h" #include "components/tab_groups/tab_group_color.h" #include "components/tab_groups/tab_group_id.h" #include "testing/gtest/include/gtest/gtest.h" @@ -46,6 +47,38 @@ retrieved_group_.emplace_back(group); } + SavedTabGroupTab CreateSavedTabGroupTab(const std::string& url, + const std::u16string& title) { + return SavedTabGroupTab(GURL(base_path_ + url), title, + favicon::GetDefaultFavicon()); + } + + SavedTabGroup CreateTestSavedTabGroup() { + tab_groups::TabGroupId id_4 = tab_groups::TabGroupId::GenerateNew(); + const std::u16string title_4 = u"Test Test"; + const tab_groups::TabGroupColorId& color_4 = + tab_groups::TabGroupColorId::kBlue; + + SavedTabGroupTab tab1 = CreateSavedTabGroupTab("4th group", u"first tab"); + SavedTabGroupTab tab2 = CreateSavedTabGroupTab("2nd link", u"new tab"); + std::vector<SavedTabGroupTab> group_4_tabs = {tab1, tab2}; + + SavedTabGroup group_4(id_4, title_4, color_4, group_4_tabs); + return group_4; + } + + void CompareSavedTabGroupTabs(const std::vector<SavedTabGroupTab>& v1, + const std::vector<SavedTabGroupTab>& v2) { + ASSERT_EQ(v1.size(), v2.size()); + for (size_t i = 0; i < v1.size(); i++) { + SavedTabGroupTab tab1 = v1[i]; + SavedTabGroupTab tab2 = v2[i]; + EXPECT_EQ(tab1.url, tab2.url); + EXPECT_EQ(tab1.tab_title, tab2.tab_title); + EXPECT_EQ(tab1.favicon, tab2.favicon); + } + } + std::unique_ptr<SavedTabGroupModel> saved_tab_group_model_; std::vector<SavedTabGroup> retrieved_group_; int retrieved_index_ = -1; @@ -84,23 +117,22 @@ const tab_groups::TabGroupColorId& color_3 = tab_groups::TabGroupColorId::kGreen; - std::vector<GURL> urls_1; - std::vector<GURL> urls_2; - std::vector<GURL> urls_3; - urls_1.emplace_back(GURL(base_path_ + "A_Link")); - urls_2.emplace_back(GURL(base_path_ + "One_Link")); - urls_2.emplace_back(GURL(base_path_ + "Two_Link")); - urls_3.emplace_back(GURL(base_path_ + "Athos")); - urls_3.emplace_back(GURL(base_path_ + "Porthos")); - urls_3.emplace_back(GURL(base_path_ + "Aramis")); + std::vector<SavedTabGroupTab> group_1_tabs = { + CreateSavedTabGroupTab("A_Link", u"Only Tab")}; + std::vector<SavedTabGroupTab> group_2_tabs = { + CreateSavedTabGroupTab("One_Link", u"One Of Two"), + CreateSavedTabGroupTab("Two_Link", u"Second")}; + std::vector<SavedTabGroupTab> group_3_tabs = { + CreateSavedTabGroupTab("Athos", u"All For One"), + CreateSavedTabGroupTab("Porthos", u"And"), + CreateSavedTabGroupTab("Aramis", u"One For All")}; - SavedTabGroup group_1(id_1_, title_1, color_1, urls_1); - SavedTabGroup group_2(id_2_, title_2, color_2, urls_2); - SavedTabGroup group_3(id_3_, title_3, color_3, urls_3); - - saved_tab_group_model_->Add(group_1); - saved_tab_group_model_->Add(group_2); - saved_tab_group_model_->Add(group_3); + saved_tab_group_model_->Add( + CreateSavedTabGroup(title_1, color_1, group_1_tabs, id_1_)); + saved_tab_group_model_->Add( + CreateSavedTabGroup(title_2, color_2, group_2_tabs, id_2_)); + saved_tab_group_model_->Add( + CreateSavedTabGroup(title_3, color_3, group_3_tabs, id_3_)); } void RemoveTestData() { @@ -118,6 +150,32 @@ } } + SavedTabGroupTab CreateSavedTabGroupTab(const std::string& url, + const std::u16string& title) { + return SavedTabGroupTab(GURL(base_path_ + url), title, + favicon::GetDefaultFavicon()); + } + + SavedTabGroup CreateSavedTabGroup( + const std::u16string& group_title, + const tab_groups::TabGroupColorId& color, + const std::vector<SavedTabGroupTab>& group_tabs, + const tab_groups::TabGroupId& id) { + return SavedTabGroup(id, group_title, color, group_tabs); + } + + void CompareSavedTabGroupTabs(const std::vector<SavedTabGroupTab>& v1, + const std::vector<SavedTabGroupTab>& v2) { + EXPECT_EQ(v1.size(), v2.size()); + for (size_t i = 0; i < v1.size(); i++) { + const SavedTabGroupTab& tab1 = v1[i]; + const SavedTabGroupTab& tab2 = v2[i]; + EXPECT_EQ(tab1.url, tab2.url); + EXPECT_EQ(tab1.tab_title, tab2.tab_title); + EXPECT_EQ(tab1.favicon, tab2.favicon); + } + } + std::unique_ptr<SavedTabGroupModel> saved_tab_group_model_; std::string base_path_ = "file:///c:/tmp/"; tab_groups::TabGroupId id_1_; @@ -184,11 +242,14 @@ const std::u16string title_4 = u"Test Test"; const tab_groups::TabGroupColorId& color_4 = tab_groups::TabGroupColorId::kBlue; - std::vector<GURL> urls_4; - urls_4.emplace_back(GURL(base_path_ + "4th group")); - urls_4.emplace_back(GURL(base_path_ + "2nd link")); - SavedTabGroup group_4(id_4, title_4, color_4, urls_4); + SavedTabGroupTab tab1 = + CreateSavedTabGroupTab("4th group", u"First Tab 4th Group"); + SavedTabGroupTab tab2 = + CreateSavedTabGroupTab("2nd link", u"Second Tab 4th Group"); + + std::vector<SavedTabGroupTab> group_4_tabs = {tab1, tab2}; + SavedTabGroup group_4(id_4, title_4, color_4, group_4_tabs); saved_tab_group_model_->Add(group_4); EXPECT_TRUE(saved_tab_group_model_->Contains(id_4)); @@ -199,6 +260,7 @@ EXPECT_EQ(saved_group->group_id, id_4); EXPECT_EQ(saved_group->title, title_4); EXPECT_EQ(saved_group->color, color_4); + CompareSavedTabGroupTabs(saved_group->saved_tabs, group_4_tabs); } // Tests that SavedTabGroupModel::Update updates the correct element if the @@ -249,15 +311,7 @@ // Tests that SavedTabGroupModelObserver::Added passes the correct element from // the model. TEST_F(SavedTabGroupModelObserverTest, AddElement) { - tab_groups::TabGroupId id_4 = tab_groups::TabGroupId::GenerateNew(); - const std::u16string title_4 = u"Test Test"; - const tab_groups::TabGroupColorId& color_4 = - tab_groups::TabGroupColorId::kBlue; - std::vector<GURL> urls_4; - urls_4.emplace_back(GURL(base_path_ + "4th group")); - urls_4.emplace_back(GURL(base_path_ + "2nd link")); - - SavedTabGroup group_4(id_4, title_4, color_4, urls_4); + SavedTabGroup group_4(CreateTestSavedTabGroup()); saved_tab_group_model_->Add(group_4); const int index = retrieved_group_.size() - 1; @@ -267,7 +321,7 @@ EXPECT_EQ(group_4.group_id, received_group.group_id); EXPECT_EQ(group_4.title, received_group.title); EXPECT_EQ(group_4.color, received_group.color); - EXPECT_EQ(group_4.urls, received_group.urls); + CompareSavedTabGroupTabs(group_4.saved_tabs, received_group.saved_tabs); EXPECT_EQ(saved_tab_group_model_->GetIndexOf(received_group.group_id), retrieved_index_); } @@ -275,17 +329,9 @@ // Tests that SavedTabGroupModelObserver::Removed passes the correct // element from the model. TEST_F(SavedTabGroupModelObserverTest, RemovedElement) { - tab_groups::TabGroupId id_4 = tab_groups::TabGroupId::GenerateNew(); - const std::u16string title_4 = u"Test Test"; - const tab_groups::TabGroupColorId& color_4 = - tab_groups::TabGroupColorId::kBlue; - std::vector<GURL> urls_4; - urls_4.emplace_back(GURL(base_path_ + "4th group")); - urls_4.emplace_back(GURL(base_path_ + "2nd link")); - - SavedTabGroup group_4(id_4, title_4, color_4, urls_4); + SavedTabGroup group_4(CreateTestSavedTabGroup()); saved_tab_group_model_->Add(group_4); - saved_tab_group_model_->Remove(id_4); + saved_tab_group_model_->Remove(group_4.group_id); const int index = retrieved_group_.size() - 1; ASSERT_GE(index, 0); @@ -294,10 +340,11 @@ EXPECT_EQ(group_4.group_id, received_group.group_id); EXPECT_EQ(group_4.title, received_group.title); EXPECT_EQ(group_4.color, received_group.color); - EXPECT_EQ(group_4.urls, received_group.urls); + CompareSavedTabGroupTabs(group_4.saved_tabs, received_group.saved_tabs); - // The model will removed an and send the index that element was at before it - // was removed. Because the only element in the model exists, we get -1. + // The model will have already removed and sent the index our element was at + // before it was removed from the model. As such, we should get -1 when + // checking the model and 0 for the retrieved index. EXPECT_EQ(saved_tab_group_model_->GetIndexOf(received_group.group_id), -1); EXPECT_EQ(retrieved_index_, 0); } @@ -305,15 +352,7 @@ // Tests that SavedTabGroupModelObserver::Updated passes the correct // element from the model. TEST_F(SavedTabGroupModelObserverTest, UpdatedElement) { - tab_groups::TabGroupId id_4 = tab_groups::TabGroupId::GenerateNew(); - const std::u16string title_4 = u"Test Test"; - const tab_groups::TabGroupColorId& color_4 = - tab_groups::TabGroupColorId::kBlue; - std::vector<GURL> urls_4; - urls_4.emplace_back(GURL(base_path_ + "4th group")); - urls_4.emplace_back(GURL(base_path_ + "2nd link")); - - SavedTabGroup group_4(id_4, title_4, color_4, urls_4); + SavedTabGroup group_4(CreateTestSavedTabGroup()); saved_tab_group_model_->Add(group_4); const std::u16string new_title = u"New Title"; @@ -322,16 +361,16 @@ const tab_groups::TabGroupVisualData new_visual_data(new_title, new_color, /*is_collapsed*/ false); - saved_tab_group_model_->Update(id_4, &new_visual_data); + saved_tab_group_model_->Update(group_4.group_id, &new_visual_data); const int index = retrieved_group_.size() - 1; ASSERT_GE(index, 0); SavedTabGroup received_group = retrieved_group_[index]; - EXPECT_EQ(id_4, received_group.group_id); + EXPECT_EQ(group_4.group_id, received_group.group_id); EXPECT_EQ(new_title, received_group.title); EXPECT_EQ(new_color, received_group.color); - EXPECT_EQ(group_4.urls, received_group.urls); + CompareSavedTabGroupTabs(group_4.saved_tabs, received_group.saved_tabs); EXPECT_EQ(saved_tab_group_model_->GetIndexOf(received_group.group_id), retrieved_index_); }
diff --git a/chrome/browser/ui/tabs/tab_group.cc b/chrome/browser/ui/tabs/tab_group.cc index 9866324..173eb194 100644 --- a/chrome/browser/ui/tabs/tab_group.cc +++ b/chrome/browser/ui/tabs/tab_group.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/check_op.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/ui/tab_ui_helper.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" #include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model.h" @@ -22,6 +22,7 @@ #include "components/tab_groups/tab_group_visual_data.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/image/image.h" #include "ui/gfx/text_elider.h" #include "url/gurl.h" @@ -136,11 +137,15 @@ void TabGroup::SaveGroup() { is_saved_ = true; - std::vector<GURL> urls; + std::vector<SavedTabGroupTab> urls; const gfx::Range tab_range = ListTabs(); for (auto i = tab_range.start(); i < tab_range.end(); ++i) { - GURL url = controller_->GetWebContentsAt(i)->GetVisibleURL(); - urls.push_back(url); + content::WebContents* web_contents = controller_->GetWebContentsAt(i); + const GURL& url = web_contents->GetVisibleURL(); + const std::u16string& tab_title = web_contents->GetTitle(); + const gfx::Image& favicon = + favicon::TabFaviconFromWebContents(web_contents); + urls.emplace_back(SavedTabGroupTab(url, tab_title, favicon)); } SavedTabGroupKeyedService* backend =
diff --git a/chrome/browser/ui/thumbnails/thumbnail_capture_driver.cc b/chrome/browser/ui/thumbnails/thumbnail_capture_driver.cc index 7d7264fa..71acd36 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_capture_driver.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_capture_driver.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/thumbnails/thumbnail_capture_driver.h" #include "base/check_op.h" +#include "base/time/time.h" // static constexpr base::TimeDelta ThumbnailCaptureDriver::kCooldownDelay;
diff --git a/chrome/browser/ui/thumbnails/thumbnail_image.cc b/chrome/browser/ui/thumbnails/thumbnail_image.cc index de635eb6..72ca880 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_image.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_image.cc
@@ -9,7 +9,6 @@ #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc b/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc index 3b45d739..20467cc 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc
@@ -14,7 +14,6 @@ #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger.h b/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger.h index 6f63ff5..38920cc 100644 --- a/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger.h +++ b/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" namespace feature_engagement { class Tracker;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 48e7a2b..87aca6c4 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -1584,7 +1584,7 @@ // TODO: Handle click if group has already been opened (crbug.com/1238539) // left click on a saved tab group opens all links in new group if (event.flags() & ui::EF_LEFT_MOUSE_BUTTON) { - if (group->urls.empty()) + if (group->saved_tabs.empty()) return; chrome::OpenSavedTabGroup(browser_, GetPageNavigatorGetter(), group, WindowOpenDisposition::NEW_BACKGROUND_TAB);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc index be93f13..322db11 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
@@ -16,6 +16,7 @@ #include "build/chromeos_buildflags.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/app_list/app_list_util.h" @@ -143,17 +144,26 @@ const tab_groups::TabGroupColorId& color_3 = tab_groups::TabGroupColorId::kGreen; - std::vector<GURL> urls_1(CreateGURL({"A_Link"})); - std::vector<GURL> urls_2(CreateGURL({"B_Link", "Not_A_Link"})); - std::vector<GURL> urls_3(CreateGURL({"Mickey", "Donald", "Goofy"})); + std::vector<SavedTabGroupTab> group_1_tabs = { + CreateSavedTabGroupTab("A_Link", u"A Link")}; + std::vector<SavedTabGroupTab> group_2_tabs = { + CreateSavedTabGroupTab("B_Link", u"B Link"), + CreateSavedTabGroupTab("Not A Link", u"Not A Link")}; + std::vector<SavedTabGroupTab> group_3_tabs = { + CreateSavedTabGroupTab("Mickey", u"Mickey"), + CreateSavedTabGroupTab("Donald", u"Donald"), + CreateSavedTabGroupTab("Goofy", u"Goofy")}; - SavedTabGroup group_1(id_1_, title_1, color_1, urls_1); - SavedTabGroup group_2(id_2_, title_2, color_2, urls_2); - SavedTabGroup group_3(id_3_, title_3, color_3, urls_3); + SavedTabGroup group_1(id_1_, title_1, color_1, group_1_tabs); + SavedTabGroup group_2(id_2_, title_2, color_2, group_2_tabs); + SavedTabGroup group_3(id_3_, title_3, color_3, group_3_tabs); - stg_model()->Add(group_1); - stg_model()->Add(group_2); - stg_model()->Add(group_3); + stg_model()->Add( + CreateSavedTabGroup(id_1_, title_1, color_1, group_1_tabs)); + stg_model()->Add( + CreateSavedTabGroup(id_2_, title_2, color_2, group_2_tabs)); + stg_model()->Add( + CreateSavedTabGroup(id_3_, title_3, color_3, group_3_tabs)); size_t current_button_count = test_helper_->GetTabGroupButtonCount(); EXPECT_EQ(3u, current_button_count - initial_button_count); @@ -176,6 +186,19 @@ return gurls; } + SavedTabGroupTab CreateSavedTabGroupTab(std::string url, + std::u16string title) { + return SavedTabGroupTab(GURL(base_path_ + url), title, + favicon::GetDefaultFavicon()); + } + + SavedTabGroup CreateSavedTabGroup(tab_groups::TabGroupId id, + std::u16string group_title, + tab_groups::TabGroupColorId color, + std::vector<SavedTabGroupTab> group_tabs) { + return SavedTabGroup(id, group_title, color, group_tabs); + } + // Creates the model, blocking until it loads, then creates the // BookmarkBarView. std::unique_ptr<BookmarkBarView> CreateBookmarkModelAndBookmarkBarView() { @@ -282,9 +305,10 @@ const tab_groups::TabGroupColorId& group_color = tab_groups::TabGroupColorId::kBlue; - std::vector<GURL> group_urls(CreateGURL({"Additional_Link"})); - SavedTabGroup group(group_id, group_title, group_color, group_urls); - stg_model()->Add(group); + std::vector<SavedTabGroupTab> group_tabs = { + CreateSavedTabGroupTab("Additional_Link", u"Additional Link")}; + stg_model()->Add( + CreateSavedTabGroup(group_id, group_title, group_color, group_tabs)); // Verify we have 4 buttons and the title of the group is the same. EXPECT_EQ(4u, test_helper_->GetTabGroupButtonCount());
diff --git a/chrome/browser/ui/views/borealis/borealis_splash_screen_view.cc b/chrome/browser/ui/views/borealis/borealis_splash_screen_view.cc index 8c9322d..4da887cc 100644 --- a/chrome/browser/ui/views/borealis/borealis_splash_screen_view.cc +++ b/chrome/browser/ui/views/borealis/borealis_splash_screen_view.cc
@@ -9,7 +9,6 @@ #include "base/callback.h" #include "base/files/file_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/borealis/borealis_service.h"
diff --git a/chrome/browser/ui/views/chrome_views_delegate_win.cc b/chrome/browser/ui/views/chrome_views_delegate_win.cc index 880a4770..508732ee 100644 --- a/chrome/browser/ui/views/chrome_views_delegate_win.cc +++ b/chrome/browser/ui/views/chrome_views_delegate_win.cc
@@ -10,7 +10,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/win/windows_version.h" #include "chrome/browser/ui/views/native_widget_factory.h"
diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.h b/chrome/browser/ui/views/critical_notification_bubble_view.h index eb72d87..3c71984 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.h +++ b/chrome/browser/ui/views/critical_notification_bubble_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_CRITICAL_NOTIFICATION_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_CRITICAL_NOTIFICATION_BUBBLE_VIEW_H_ +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/bubble/bubble_dialog_delegate_view.h"
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc index bfed707c..9d59503 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_unittest.cc
@@ -13,7 +13,6 @@ #include "base/command_line.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "chrome/browser/media/webrtc/desktop_media_picker_manager.h"
diff --git a/chrome/browser/ui/views/download/download_shelf_view.h b/chrome/browser/ui/views/download/download_shelf_view.h index 7a9dd00..aebd65a0 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.h +++ b/chrome/browser/ui/views/download/download_shelf_view.h
@@ -10,6 +10,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/download/download_shelf.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/gfx/animation/slide_animation.h"
diff --git a/chrome/browser/ui/views/elevation_icon_setter.cc b/chrome/browser/ui/views/elevation_icon_setter.cc index 05eed7824..ad49743 100644 --- a/chrome/browser/ui/views/elevation_icon_setter.cc +++ b/chrome/browser/ui/views/elevation_icon_setter.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_view_interactive_uitest.cc b/chrome/browser/ui/views/extensions/extensions_menu_view_interactive_uitest.cc index a62dc85..5f97d66 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_view_interactive_uitest.cc
@@ -8,7 +8,6 @@ #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/extensions/chrome_test_extension_loader.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame_view_linux.cc b/chrome/browser/ui/views/frame/browser_frame_view_linux.cc index 6486c2b4..7387245e 100644 --- a/chrome/browser/ui/views/frame/browser_frame_view_linux.cc +++ b/chrome/browser/ui/views/frame/browser_frame_view_linux.cc
@@ -32,7 +32,7 @@ SkRRect BrowserFrameViewLinux::GetRestoredClipRegion() const { gfx::RectF bounds_dip(GetLocalBounds()); if (ShouldDrawRestoredFrameShadow()) { - auto border = layout_->MirroredFrameBorderInsets(); + gfx::InsetsF border(layout_->MirroredFrameBorderInsets()); bounds_dip.Inset(border); } float radius_dip = GetRestoredCornerRadiusDip();
diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc index ffcde35..b7ca863 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.cc +++ b/chrome/browser/ui/views/frame/browser_root_view.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/metrics/user_metrics.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/defaults.h"
diff --git a/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc b/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc index 6417a192b..c071f840 100644 --- a/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc +++ b/chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc
@@ -18,7 +18,6 @@ #include "base/notreached.h" #include "base/scoped_observation.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ui/views/hats/hats_next_web_dialog.h b/chrome/browser/ui/views/hats/hats_next_web_dialog.h index 4c288341..89ec6c9 100644 --- a/chrome/browser/ui/views/hats/hats_next_web_dialog.h +++ b/chrome/browser/ui/views/hats/hats_next_web_dialog.h
@@ -7,6 +7,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/profiles/profile_observer.h" #include "chrome/browser/ui/hats/hats_service.h"
diff --git a/chrome/browser/ui/views/location_bar/permission_quiet_chip.h b/chrome/browser/ui/views/location_bar/permission_quiet_chip.h index d63a0b2..47697990 100644 --- a/chrome/browser/ui/views/location_bar/permission_quiet_chip.h +++ b/chrome/browser/ui/views/location_bar/permission_quiet_chip.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PERMISSION_QUIET_CHIP_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/ui/views/location_bar/permission_chip.h" class Browser;
diff --git a/chrome/browser/ui/views/location_bar/permission_request_chip.h b/chrome/browser/ui/views/location_bar/permission_request_chip.h index f44dea9f..d1c65e15 100644 --- a/chrome/browser/ui/views/location_bar/permission_request_chip.h +++ b/chrome/browser/ui/views/location_bar/permission_request_chip.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PERMISSION_REQUEST_CHIP_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/ui/views/location_bar/permission_chip.h" class Browser;
diff --git a/chrome/browser/ui/views/location_bar/zoom_bubble_view.h b/chrome/browser/ui/views/location_bar/zoom_bubble_view.h index a46801f0..749c4ae 100644 --- a/chrome/browser/ui/views/location_bar/zoom_bubble_view.h +++ b/chrome/browser/ui/views/location_bar/zoom_bubble_view.h
@@ -7,6 +7,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h"
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view.cc b/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view.cc index be28e2d..6183e6f 100644 --- a/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view.cc +++ b/chrome/browser/ui/views/media_router/cast_dialog_no_sinks_view.cc
@@ -9,7 +9,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index 40991d85..4445631 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -17,7 +17,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h index 8e34ff7..1cb7e262 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
@@ -14,6 +14,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_sub_menu_model.h"
diff --git a/chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc b/chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc index 0d5708942..8b2c2eb5 100644 --- a/chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc +++ b/chrome/browser/ui/views/payments/cvc_unmask_view_controller.cc
@@ -8,6 +8,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/autofill/risk_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/identity_manager_factory.h"
diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.h b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.h index 116da9a0..f404395 100644 --- a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.h +++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.h
@@ -8,6 +8,7 @@ #include <string> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/ui/views/permission_bubble/permission_prompt_style.h" #include "components/permissions/permission_prompt.h" #include "ui/base/metadata/metadata_header_macros.h"
diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.h b/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.h index f87b1553..ff55857 100644 --- a/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.h +++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_impl.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_PERMISSION_BUBBLE_PERMISSION_PROMPT_IMPL_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.h" #include "chrome/browser/ui/views/permission_bubble/permission_prompt_style.h"
diff --git a/chrome/browser/ui/views/privacy_sandbox/privacy_sandbox_dialog_view.h b/chrome/browser/ui/views/privacy_sandbox/privacy_sandbox_dialog_view.h index dc0e9253..3574b2aac 100644 --- a/chrome/browser/ui/views/privacy_sandbox/privacy_sandbox_dialog_view.h +++ b/chrome/browser/ui/views/privacy_sandbox/privacy_sandbox_dialog_view.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PRIVACY_SANDBOX_PRIVACY_SANDBOX_DIALOG_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_PRIVACY_SANDBOX_PRIVACY_SANDBOX_DIALOG_VIEW_H_ +#include "base/time/time.h" #include "chrome/browser/privacy_sandbox/privacy_sandbox_service.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h index 53c7cce..a8dfa6f 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h
@@ -11,6 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "chrome/browser/ui/views/toolbar/toolbar_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_icon_container_view.h" #include "ui/base/metadata/metadata_header_macros.h"
diff --git a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h index 537e539..d61e62f 100644 --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/safe_browsing/chrome_password_protection_service.h" #include "components/password_manager/core/browser/password_manager_metrics_util.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc index a3a7a19..ac86576 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_view_impl.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "chrome/browser/share/share_features.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_bubble_controller.h"
diff --git a/chrome/browser/ui/views/side_panel/side_panel.cc b/chrome/browser/ui/views/side_panel/side_panel.cc index 0b41152f..8088cb6 100644 --- a/chrome/browser/ui/views/side_panel/side_panel.cc +++ b/chrome/browser/ui/views/side_panel/side_panel.cc
@@ -71,8 +71,8 @@ view.GetLayoutProvider()->GetCornerRadiusMetric( views::Emphasis::kMedium, view.GetContentsBounds().size()) * dsf; - gfx::Insets insets_in_pixels = - gfx::ToFlooredInsets(gfx::ConvertInsetsToPixels(GetInsets(), dsf)); + gfx::InsetsF insets_in_pixels( + gfx::ToFlooredInsets(gfx::ConvertInsetsToPixels(GetInsets(), dsf))); scaled_bounds.Inset(insets_in_pixels); SkRRect rect = SkRRect::MakeRectXY(gfx::RectFToSkRect(scaled_bounds), corner_radius, corner_radius);
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc index f35b8cd..8689d71 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc +++ b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc
@@ -20,7 +20,6 @@ #include "base/process/process.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "components/dbus/menu/menu.h"
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.cc b/chrome/browser/ui/views/status_icons/status_tray_win.cc index 27c482fa..c13d5a7 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win.cc
@@ -14,6 +14,7 @@ #include "base/sequence_checker.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/win/windows_types.h" #include "base/win/wrapped_window_proc.h" #include "chrome/browser/lifetime/application_lifetime.h"
diff --git a/chrome/browser/ui/views/tabs/color_picker_view.cc b/chrome/browser/ui/views/tabs/color_picker_view.cc index f8fddcd..7ea92f03 100644 --- a/chrome/browser/ui/views/tabs/color_picker_view.cc +++ b/chrome/browser/ui/views/tabs/color_picker_view.cc
@@ -49,7 +49,7 @@ SkPath GetHighlightPath(const views::View* view) override { // Our highlight path should be slightly larger than the circle we paint. gfx::RectF bounds(view->GetContentsBounds()); - bounds.Inset(gfx::Insets(-2.0f)); + bounds.Inset(-2.0f); const gfx::PointF center = bounds.CenterPoint(); return SkPath().addCircle(center.x(), center.y(), bounds.width() / 2.0f); }
diff --git a/chrome/browser/ui/views/tabs/tab_group_header.h b/chrome/browser/ui/views/tabs/tab_group_header.h index 80c4128f..0dcf6f1 100644 --- a/chrome/browser/ui/views/tabs/tab_group_header.h +++ b/chrome/browser/ui/views/tabs/tab_group_header.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_GROUP_HEADER_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/ui/views/tabs/tab_slot_view.h" #include "components/tab_groups/tab_group_id.h" #include "ui/base/metadata/metadata_header_macros.h"
diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc index 3dac57b..ac16fb5 100644 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc +++ b/chrome/browser/ui/views/tabs/tab_style_views.cc
@@ -959,8 +959,8 @@ // bottom inset, because we want to pixel-align the bottom of the stroke, not // the bottom of the overlap. auto layout_insets = - gfx::Insets::TLBR(stroke_thickness, corner_radius, stroke_thickness, - corner_radius + GetSeparatorSize().width()); + gfx::InsetsF::TLBR(stroke_thickness, corner_radius, stroke_thickness, + corner_radius + GetSeparatorSize().width()); aligned_bounds.Inset(layout_insets); // Scale layout bounds from DIP to px.
diff --git a/chrome/browser/ui/views/test/view_event_test_base.h b/chrome/browser/ui/views/test/view_event_test_base.h index 63dbc12..ad9e47b35 100644 --- a/chrome/browser/ui/views/test/view_event_test_base.h +++ b/chrome/browser/ui/views/test/view_event_test_base.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TEST_VIEW_EVENT_TEST_BASE_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" // We only want to use ViewEventTestBase in test targets which properly // isolate each test case by running each test in a separate process.
diff --git a/chrome/browser/ui/views/toolbar/reload_button.h b/chrome/browser/ui/views/toolbar/reload_button.h index e314e2b..371b3013 100644 --- a/chrome/browser/ui/views/toolbar/reload_button.h +++ b/chrome/browser/ui/views/toolbar/reload_button.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_RELOAD_BUTTON_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ui/views/chrome_views_export.h" #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc index 8004830e..2ee559e 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_button.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -93,7 +93,7 @@ ui::PaintRecorder recorder(context, layer()->size()); gfx::RectF bounds(layer()->bounds()); - bounds.Inset(margins_); + bounds.Inset(gfx::InsetsF(margins_)); const float current_inset = throb_animation_.CurrentValueBetween(0.0f, max_inset_);
diff --git a/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.cc b/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.cc index c6a9daa..639c58cb 100644 --- a/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.cc +++ b/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.cc
@@ -21,6 +21,7 @@ #include "base/time/time.h" #include "cc/paint/paint_flags.h" #include "chrome/app/vector_icons/vector_icons.h" +#include "chrome/browser/ui/color/chrome_color_id.h" #include "chrome/browser/ui/views/chrome_typography.h" #include "chrome/browser/ui/views/try_chrome_dialog_win/arrow_border.h" #include "chrome/browser/ui/views/try_chrome_dialog_win/button_layout.h" @@ -37,6 +38,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/base/metadata/metadata_impl_macros.h" +#include "ui/color/color_provider.h" #include "ui/display/display.h" #include "ui/display/screen.h" #include "ui/display/win/screen_win.h" @@ -95,14 +97,6 @@ // popup's border. constexpr int kArrowInset = 3; -const SkColor kTryChromeBackgroundColor = SkColorSetRGB(0x1F, 0x1F, 0x1F); -const SkColor kHeaderColor = SK_ColorWHITE; -const SkColor kBodyColor = SkColorSetA(SK_ColorWHITE, 0xAD); -const SkColor kBorderColor = SkColorSetARGB(0x80, 0x80, 0x80, 0x80); -const SkColor kButtonTextColor = SK_ColorWHITE; -const SkColor kButtonAcceptColor = SkColorSetRGB(0x00, 0x78, 0xDA); -const SkColor kButtonNoThanksColor = SkColorSetA(SK_ColorWHITE, 0x33); - // Experiment specification information needed for layout. struct ExperimentVariations { enum class CloseStyle { @@ -179,16 +173,21 @@ views::Builder<views::LabelButton> CreateWin10StyleButton( views::Button::PressedCallback callback, const std::u16string& text, - TryChromeButtonType button_type) { + TryChromeButtonType button_type, + const ui::ColorProvider* color_provider) { return views::Builder<views::LabelButton>( std::make_unique<views::LabelButton>(std::move(callback), text, CONTEXT_WINDOWS10_NATIVE)) .SetHorizontalAlignment(gfx::ALIGN_CENTER) .SetBackground(views::CreateSolidBackground( button_type == TryChromeButtonType::OPEN_CHROME - ? kButtonAcceptColor - : kButtonNoThanksColor)) - .SetEnabledTextColors(kButtonTextColor) + ? color_provider->GetColor(kColorTryChromeAcceptButtonBackground) + : color_provider->GetColor( + kColorTryChromeNoThanksButtonBackground))) + // TODO(crbug.com/1311857): Ensure text color and background color + // selected above meet minimum contrast requirements. + .SetEnabledTextColors( + color_provider->GetColor(kColorTryChromeButtonForeground)) // Request specific 32pt height, 166+pt width. .SetMinSize(gfx::Size(166, 32)) .SetMaxSize(gfx::Size(0, 32)) @@ -594,8 +593,9 @@ void TryChromeDialog::Context::NotificationAreaCalculator::AddBorderToContents( views::Widget* popup, views::View* contents_view) { - contents_view->SetBorder( - views::CreateSolidBorder(kTryChromeBorderThickness, kBorderColor)); + contents_view->SetBorder(views::CreateSolidBorder( + kTryChromeBorderThickness, + popup->GetColorProvider()->GetColor(kColorTryChromeBorder))); } gfx::Rect TryChromeDialog::Context::NotificationAreaCalculator::ComputeBounds( @@ -636,7 +636,9 @@ // and observe the popup so that these pointers can be appropriately cleared. contents_view_ = contents_view; auto border = std::make_unique<ArrowBorder>( - kTryChromeBorderThickness, kBorderColor, kTryChromeBackgroundColor, + kTryChromeBorderThickness, + popup->GetColorProvider()->GetColor(kColorTryChromeBorder), + popup->GetColorProvider()->GetColor(kColorTryChromeBackground), kInactiveToastArrowIcon, &properties_->border_properties); border_ = border.get(); contents_view->SetBorder(std::move(border)); @@ -1054,12 +1056,6 @@ // that the logoff was cancelled. The toast may as well be shown. // Create the popup. - auto logo = - views::Builder<views::ImageView>() - .SetImage(gfx::CreateVectorIcon(kInactiveToastLogoIcon, kHeaderColor)) - .Build(); - const gfx::Size logo_size = logo->GetPreferredSize(); - views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); params.activatable = views::Widget::InitParams::Activatable::kYes; // An approximate window size. Layout() can adjust. @@ -1069,11 +1065,22 @@ popup_->AddObserver(this); popup_->Init(std::move(params)); + auto* color_provider = popup_->GetColorProvider(); + SkColor try_chrome_background_color = + color_provider->GetColor(kColorTryChromeBackground); + SkColor header_color = color_provider->GetColor(kColorTryChromeForeground); + + auto logo = + views::Builder<views::ImageView>() + .SetImage(gfx::CreateVectorIcon(kInactiveToastLogoIcon, header_color)) + .Build(); + const gfx::Size logo_size = logo->GetPreferredSize(); + auto contents_view = views::Builder<ClickableView>() .SetOrientation(views::BoxLayout::Orientation::kVertical) .SetBackground( - views::CreateSolidBackground(kTryChromeBackgroundColor)) + views::CreateSolidBackground(try_chrome_background_color)) .SetMinimumCrossAxisSize(kToastWidth) .CustomConfigure(base::BindOnce( [](Context* context, views::Widget* popup, @@ -1149,15 +1156,17 @@ // accessibility checks. .SetAccessibleName(l10n_util::GetStringUTF16(IDS_CLOSE)) .SetProperty(views::kTableColAndRowSpanKey, gfx::Size(1, 2)) - .CustomConfigure( - base::BindOnce([](views::ImageButton* image_button) { + .CustomConfigure(base::BindOnce( + [](SkColor image_button_color, + views::ImageButton* image_button) { image_button->SetImage( views::Button::STATE_NORMAL, gfx::CreateVectorIcon(kInactiveToastCloseIcon, - kBodyColor)); + image_button_color)); DCHECK_EQ(image_button->GetPreferredSize().width(), kCloseButtonWidth); - }))); + }, + color_provider->GetColor(kColorTryChromeIcon)))); } else { table_view.AddChild(views::Builder<views::View>().SetProperty( views::kTableColAndRowSpanKey, gfx::Size(1, 2))); @@ -1168,8 +1177,8 @@ views::Builder<views::Label>() .SetText(l10n_util::GetStringUTF16(kExperiments[group_].heading_id)) .SetTextContext(CONTEXT_WINDOWS10_NATIVE) - .SetBackgroundColor(kTryChromeBackgroundColor) - .SetEnabledColor(kHeaderColor) + .SetBackgroundColor(try_chrome_background_color) + .SetEnabledColor(header_color) .SetMultiLine(true) .SetHorizontalAlignment(gfx::ALIGN_LEFT)); @@ -1184,7 +1193,7 @@ views::Builder<views::Label>() .SetText(l10n_util::GetStringUTF16(body_string_id)) .SetTextContext(CONTEXT_WINDOWS10_NATIVE) - .SetBackgroundColor(kTryChromeBackgroundColor) + .SetBackgroundColor(try_chrome_background_color) .SetMultiLine(true) .SetHorizontalAlignment(gfx::ALIGN_LEFT) .SetProperty( @@ -1208,7 +1217,7 @@ &TryChromeDialog::ButtonPressed, base::Unretained(this), installer::ExperimentMetrics::kSelectedOpenChromeAndNoCrash), l10n_util::GetStringUTF16(IDS_WIN10_TOAST_OPEN_CHROME), - TryChromeButtonType::OPEN_CHROME)); + TryChromeButtonType::OPEN_CHROME, color_provider)); const auto style = kExperiments[group_].close_style; if (style == ExperimentVariations::CloseStyle::kNoThanksButton || style == ExperimentVariations::CloseStyle::kNoThanksButtonAndCloseX) { @@ -1217,7 +1226,7 @@ base::Unretained(this), installer::ExperimentMetrics::kSelectedNoThanks), l10n_util::GetStringUTF16(IDS_WIN10_TOAST_NO_THANKS), - TryChromeButtonType::NO_THANKS)); + TryChromeButtonType::NO_THANKS, color_provider)); } contents_view.AddChild(
diff --git a/chrome/browser/ui/views/user_education/browser_user_education_service.cc b/chrome/browser/ui/views/user_education/browser_user_education_service.cc index 221629fb..8b0fd4b 100644 --- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc +++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
@@ -64,6 +64,10 @@ result.push_back(accel); if (browser_view->GetAccelerator(IDC_FOCUS_PREVIOUS_PANE, &accel)) result.push_back(accel); + if (browser_view->GetAccelerator( + IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY, &accel)) { + result.push_back(accel); + } } } }
diff --git a/chrome/browser/ui/views/user_education/help_bubble_view.h b/chrome/browser/ui/views/user_education/help_bubble_view.h index 8ba6a95..ee88e2ce 100644 --- a/chrome/browser/ui/views/user_education/help_bubble_view.h +++ b/chrome/browser/ui/views/user_education/help_bubble_view.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ui/user_education/help_bubble_params.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view.cc b/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view.cc index 6074a7e..cafc58b 100644 --- a/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view.cc +++ b/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view.cc
@@ -167,26 +167,28 @@ SetAcceptCallback(base::BindOnce( &DeprecatedAppsDialogView::UninstallExtensions, base::Unretained(this))); - // Set up labels and link text. - info_label_ = AddChildView(std::make_unique<views::StyledLabel>()); - std::vector<size_t> offsets; + info_label_ = AddChildView( + std::make_unique<views::Label>(l10n_util::GetPluralStringFUTF16( + IDS_DEPRECATED_APPS_MONITOR_RENDERER, + deprecated_apps_table_model_->RowCount()))); + info_label_->SetMultiLine(true); + info_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT); - std::u16string link_text = - l10n_util::GetStringUTF16(IDS_DEPRECATED_APPS_LEARN_MORE); - std::u16string info_text = l10n_util::GetPluralStringFUTF16( - IDS_DEPRECATED_APPS_MONITOR_RENDERER, - deprecated_apps_table_model_->RowCount()); - std::u16string label_text = - l10n_util::FormatString(info_text, {link_text}, &offsets); - const size_t offset = offsets.back(); - - auto link_style = views::StyledLabel::RangeStyleInfo::CreateForLink( - base::BindRepeating(&DeprecatedAppsDialogView::OnLearnMoreLinkClicked, - base::Unretained(this))); - link_style.disable_line_wrapping = true; - info_label_->SetText(label_text); - info_label_->AddStyleRange(gfx::Range(offset, offset + link_text.length()), - link_style); + auto* learn_more = AddChildView(std::make_unique<views::Link>( + l10n_util::GetStringUTF16(IDS_DEPRECATED_APPS_LEARN_MORE))); + learn_more->SetCallback(base::BindRepeating( + [](content::WebContents* web_contents, const ui::Event& event) { + web_contents->OpenURL(content::OpenURLParams( + GURL(chrome::kChromeAppsDeprecationLearnMoreURL), + content::Referrer(), + ui::DispositionFromEventFlags( + event.flags(), WindowOpenDisposition::NEW_FOREGROUND_TAB), + ui::PAGE_TRANSITION_LINK, /*is_renderer_initiated=*/false)); + }, + web_contents_)); + learn_more->SetAccessibleName(l10n_util::GetStringUTF16( + IDS_FORCE_INSTALLED_DEPRECATED_APPS_LEARN_MORE_AX_LABEL)); + learn_more->SetHorizontalAlignment(gfx::ALIGN_LEFT); // Set up the table view. std::vector<ui::TableColumn> columns; @@ -212,14 +214,6 @@ GetWidget()->Close(); } -void DeprecatedAppsDialogView::OnLearnMoreLinkClicked() { - content::OpenURLParams params( - GURL(chrome::kChromeAppsDeprecationLearnMoreURL), content::Referrer(), - WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, - /*is_renderer_initiated=*/false); - web_contents_->OpenURL(params); -} - void DeprecatedAppsDialogView::OnIconsLoadedForTable() { deprecated_apps_table_view_->SchedulePaint(); }
diff --git a/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view.h b/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view.h index ba12205..9cc73c9 100644 --- a/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view.h +++ b/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view.h
@@ -25,7 +25,7 @@ } namespace views { -class StyledLabel; +class Label; class TableView; } // namespace views @@ -64,9 +64,6 @@ // Reset all information from Tablemodel and hide the dialog. void CloseDialog(); - // Callback that runs when the learn more link is clicked. - void OnLearnMoreLinkClicked(); - // Callback that runs when the icon images are updated. void OnIconsLoadedForTable(); @@ -80,7 +77,7 @@ // TableModel object that stores the app information. std::unique_ptr<DeprecatedAppsTableModel> deprecated_apps_table_model_; - raw_ptr<views::StyledLabel> info_label_; + raw_ptr<views::Label> info_label_; std::set<extensions::ExtensionId> deprecated_app_ids_;
diff --git a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_toolbar_button_container.cc b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_toolbar_button_container.cc index a55bbea..13ee0a9 100644 --- a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_toolbar_button_container.cc +++ b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_toolbar_button_container.cc
@@ -5,6 +5,7 @@ #include "chrome/browser/ui/views/web_apps/frame_toolbar/web_app_toolbar_button_container.h" #include "base/metrics/histogram_macros.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/ui/browser_command_controller.h"
diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc index 302b423..aade8b2 100644 --- a/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc +++ b/chrome/browser/ui/views/web_apps/web_app_integration_browsertest_mac_win_linux.cc
@@ -547,9 +547,10 @@ helper_.CheckLaunchIconNotShown(); } +// TODO(crbug.com/1311895): Fails on Win 7. IN_PROC_BROWSER_TEST_F( WebAppIntegrationBrowserTestMacWinLinux, - WebAppIntegration_29SiteA_11SiteA_7SiteA_33SiteA_7SiteA_11SiteA_1SiteA_22) { + DISABLED_WebAppIntegration_29SiteA_11SiteA_7SiteA_33SiteA_7SiteA_11SiteA_1SiteA_22) { // Test contents are generated by script. Please do not modify! // See `chrome/test/webapps/README.md` for more info. // Sheriffs: Disabling this test is supported. @@ -563,9 +564,10 @@ helper_.CheckTabCreated(); } +// TODO(crbug.com/1311895): Fails on Win 7. IN_PROC_BROWSER_TEST_F( WebAppIntegrationBrowserTestMacWinLinux, - WebAppIntegration_29SiteA_11SiteA_7SiteA_49SiteA_7SiteA_11SiteA_1SiteA_22) { + DISABLED_WebAppIntegration_29SiteA_11SiteA_7SiteA_49SiteA_7SiteA_11SiteA_1SiteA_22) { // Test contents are generated by script. Please do not modify! // See `chrome/test/webapps/README.md` for more info. // Sheriffs: Disabling this test is supported.
diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc index 2c12c1fe..ed527af 100644 --- a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc +++ b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
@@ -2326,6 +2326,7 @@ std::vector<base::Feature> disabled_features; enabled_features.push_back(features::kPwaUpdateDialogForIcon); enabled_features.push_back(features::kPwaUpdateDialogForName); + enabled_features.push_back(features::kDesktopPWAsEnforceWebAppSettingsPolicy); #if BUILDFLAG(IS_CHROMEOS_ASH) disabled_features.push_back(features::kWebAppsCrosapi); disabled_features.push_back(chromeos::features::kLacrosPrimary);
diff --git a/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc b/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc index c49af01..7319e2a7 100644 --- a/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc +++ b/chrome/browser/ui/web_applications/test/web_app_browsertest_util.cc
@@ -380,7 +380,8 @@ } Browser* BrowserWaiter::AwaitRemoved() { - removed_run_loop_.Run(); + if (!removed_browser_) + removed_run_loop_.Run(); return removed_browser_; }
diff --git a/chrome/browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc b/chrome/browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc index 4d7e73a..9b89577 100644 --- a/chrome/browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_ui_manager_impl_browsertest.cc
@@ -123,6 +123,7 @@ web_app::CloseAndWait(browser()); EXPECT_EQ(1u, BrowserList::GetInstance()->size()); Browser* app_browser = BrowserList::GetInstance()->GetLastActive(); + BrowserWaiter waiter(app_browser); // Uninstalling should close the |app_browser|, but keep the browser // object alive long enough to complete the uninstall. base::RunLoop run_loop; @@ -134,7 +135,7 @@ run_loop.Quit(); })); run_loop.Run(); - web_app::BrowserWaiter(app_browser).AwaitRemoved(); + waiter.AwaitRemoved(); EXPECT_EQ(0u, BrowserList::GetInstance()->size()); }
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 191ce0bb..5f63072 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc
@@ -25,7 +25,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/threading/thread.h"
diff --git a/chrome/browser/ui/webui/about_ui_unittest.cc b/chrome/browser/ui/webui/about_ui_unittest.cc index 038cc5f..a802b46 100644 --- a/chrome/browser/ui/webui/about_ui_unittest.cc +++ b/chrome/browser/ui/webui/about_ui_unittest.cc
@@ -17,7 +17,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h" #include "chrome/browser/ash/login/ui/fake_login_display_host.h" #include "chrome/browser/ash/login/wizard_controller.h"
diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc index 714a0357..ee17209 100644 --- a/chrome/browser/ui/webui/certificate_viewer_webui.cc +++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc
@@ -16,6 +16,7 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/platform_util.h"
diff --git a/chrome/browser/ui/webui/certificates_handler.cc b/chrome/browser/ui/webui/certificates_handler.cc index 10eb3e1..814821a 100644 --- a/chrome/browser/ui/webui/certificates_handler.cc +++ b/chrome/browser/ui/webui/certificates_handler.cc
@@ -20,7 +20,6 @@ #include "base/posix/safe_strerror.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc index 0e3578e..bff9300 100644 --- a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc +++ b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.cc
@@ -25,7 +25,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h index a68e741..858d4d26 100644 --- a/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h +++ b/chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing_handler.h
@@ -11,6 +11,7 @@ #include <vector> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ui/webui/chromeos/arc_graphics_tracing/arc_graphics_tracing.h" #include "components/exo/surface_observer.h"
diff --git a/chrome/browser/ui/webui/chromeos/arc_power_control/arc_power_control_handler.cc b/chrome/browser/ui/webui/chromeos/arc_power_control/arc_power_control_handler.cc index 2ec7618..132ede39 100644 --- a/chrome/browser/ui/webui/chromeos/arc_power_control/arc_power_control_handler.cc +++ b/chrome/browser/ui/webui/chromeos/arc_power_control/arc_power_control_handler.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/linux_util.h" #include "base/process/launch.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/chromeos/arc_power_control/arc_power_control_handler.h b/chrome/browser/ui/webui/chromeos/arc_power_control/arc_power_control_handler.h index d99333d..84ad07f 100644 --- a/chrome/browser/ui/webui/chromeos/arc_power_control/arc_power_control_handler.h +++ b/chrome/browser/ui/webui/chromeos/arc_power_control/arc_power_control_handler.h
@@ -13,6 +13,7 @@ #include "ash/components/arc/mojom/power.mojom.h" #include "ash/components/arc/power/arc_power_bridge.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/throttle_service.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_page_handler.cc b/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_page_handler.cc index b0b7eba..9e14a924c 100644 --- a/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_page_handler.cc +++ b/chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_page_handler.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/crostini/crostini_disk.h"
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc index 42259dda..033c83c 100644 --- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc +++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -27,10 +27,10 @@ #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "chrome/browser/ash/drive/drive_integration_service.h" #include "chrome/browser/ash/drive/file_system_util.h" #include "chrome/browser/ash/file_manager/path_util.h"
diff --git a/chrome/browser/ui/webui/chromeos/emoji/emoji_page_handler.h b/chrome/browser/ui/webui/chromeos/emoji/emoji_page_handler.h index 73872c6b0..af099780 100644 --- a/chrome/browser/ui/webui/chromeos/emoji/emoji_page_handler.h +++ b/chrome/browser/ui/webui/chromeos/emoji/emoji_page_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_EMOJI_EMOJI_PAGE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_EMOJI_EMOJI_PAGE_HANDLER_H_ +#include "base/time/time.h" #include "chrome/browser/ui/webui/chromeos/emoji/emoji_picker.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/chrome/browser/ui/webui/chromeos/image_source.cc b/chrome/browser/ui/webui/chromeos/image_source.cc index 6b800c7..de8c398 100644 --- a/chrome/browser/ui/webui/chromeos/image_source.cc +++ b/chrome/browser/ui/webui/chromeos/image_source.cc
@@ -12,7 +12,6 @@ #include "base/files/file_util.h" #include "base/location.h" #include "base/memory/ref_counted_memory.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.h index 752884bb..e01f1f8 100644 --- a/chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/assistant_optin_flow_screen_handler.h
@@ -12,6 +12,7 @@ #include "ash/public/cpp/assistant/assistant_setup.h" #include "ash/public/cpp/assistant/assistant_state.h" #include "base/containers/circular_deque.h" +#include "base/time/time.h" #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" #include "chromeos/services/assistant/public/cpp/assistant_settings.h" #include "components/sync/protocol/user_consent_types.pb.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/debug/debug_overlay_handler.cc b/chrome/browser/ui/webui/chromeos/login/debug/debug_overlay_handler.cc index 8a0ebf0..60ea94c 100644 --- a/chrome/browser/ui/webui/chromeos/login/debug/debug_overlay_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/debug/debug_overlay_handler.cc
@@ -14,7 +14,6 @@ #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc index 02bdaa7..2e2bb6c 100644 --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -35,7 +35,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/timer/timer.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc index 5243d78..69fa059 100644 --- a/chrome/browser/ui/webui/chromeos/login/l10n_util.cc +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util.cc
@@ -23,7 +23,6 @@ #include "base/notreached.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h index 79c17c6..a6e2175 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
@@ -14,6 +14,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" // TODO(https://crbug.com/1164001): move to forward declaration. #include "chrome/browser/ash/login/error_screens_histogram_helper.h" #include "chrome/browser/ash/login/screens/error_screen.h"
diff --git a/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.h b/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.h index dcce3b8..f79ea300 100644 --- a/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.h +++ b/chrome/browser/ui/webui/chromeos/sys_internals/sys_internals_message_handler.h
@@ -8,7 +8,6 @@ #include <stdint.h> #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/values.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/video_source.cc b/chrome/browser/ui/webui/chromeos/video_source.cc index 88365c9..b4cfa718 100644 --- a/chrome/browser/ui/webui/chromeos/video_source.cc +++ b/chrome/browser/ui/webui/chromeos/video_source.cc
@@ -11,7 +11,6 @@ #include "base/files/file_util.h" #include "base/location.h" #include "base/memory/ref_counted_memory.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner_util.h"
diff --git a/chrome/browser/ui/webui/devtools_ui_data_source.cc b/chrome/browser/ui/webui/devtools_ui_data_source.cc index dcd34ab8..113d3832 100644 --- a/chrome/browser/ui/webui/devtools_ui_data_source.cc +++ b/chrome/browser/ui/webui/devtools_ui_data_source.cc
@@ -13,7 +13,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/path_service.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/devtools/devtools_ui_bindings.h" #include "chrome/browser/devtools/url_constants.h"
diff --git a/chrome/browser/ui/webui/download_shelf/download_shelf_ui.h b/chrome/browser/ui/webui/download_shelf/download_shelf_ui.h index cb40ba0..0b4d115 100644 --- a/chrome/browser/ui/webui/download_shelf/download_shelf_ui.h +++ b/chrome/browser/ui/webui/download_shelf/download_shelf_ui.h
@@ -9,6 +9,7 @@ #include "base/containers/flat_map.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_ui_model.h" #include "chrome/browser/ui/webui/download_shelf/download_shelf.mojom.h"
diff --git a/chrome/browser/ui/webui/help/version_updater_mac.mm b/chrome/browser/ui/webui/help/version_updater_mac.mm index 17e4bb9e..4af73b4b 100644 --- a/chrome/browser/ui/webui/help/version_updater_mac.mm +++ b/chrome/browser/ui/webui/help/version_updater_mac.mm
@@ -29,7 +29,6 @@ #include "base/mac/authorization_util.h" #include "base/memory/scoped_refptr.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/updater/browser_updater_client.h"
diff --git a/chrome/browser/ui/webui/help/version_updater_win.cc b/chrome/browser/ui/webui/help/version_updater_win.cc index 58dd538..708e004 100644 --- a/chrome/browser/ui/webui/help/version_updater_win.cc +++ b/chrome/browser/ui/webui/help/version_updater_win.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/win/win_util.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc b/chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc index fadbe9c..3eae9cc 100644 --- a/chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc +++ b/chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc
@@ -16,6 +16,7 @@ #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h"
diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc index bb8eac9..8dcbef4 100644 --- a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc +++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
@@ -16,6 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc index 6ab684b..0ef629e 100644 --- a/chrome/browser/ui/webui/nacl_ui.cc +++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -21,7 +21,6 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index e6049754..bacb329 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
@@ -17,7 +17,6 @@ #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/threading/thread_restrictions.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h index 28e421a..699b6bf 100644 --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_NEW_TAB_PAGE_NEW_TAB_PAGE_UI_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/cart/chrome_cart.mojom.h" #include "chrome/browser/new_tab_page/modules/drive/drive.mojom.h" #include "chrome/browser/new_tab_page/modules/photos/photos.mojom.h"
diff --git a/chrome/browser/ui/webui/new_tab_page/untrusted_source.h b/chrome/browser/ui/webui/new_tab_page/untrusted_source.h index 5a30c88..81721f4 100644 --- a/chrome/browser/ui/webui/new_tab_page/untrusted_source.h +++ b/chrome/browser/ui/webui/new_tab_page/untrusted_source.h
@@ -10,6 +10,7 @@ #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "chrome/browser/new_tab_page/one_google_bar/one_google_bar_service.h" #include "chrome/browser/new_tab_page/one_google_bar/one_google_bar_service_observer.h" #include "content/public/browser/url_data_source.h"
diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browser/ui/webui/policy/policy_ui_handler.cc index a67aba7..0f61ab3 100644 --- a/chrome/browser/ui/webui/policy/policy_ui_handler.cc +++ b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
@@ -22,7 +22,6 @@ #include "base/notreached.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc b/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc index 9146508..290df746 100644 --- a/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc +++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc
@@ -14,7 +14,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "chrome/browser/printing/pwg_raster_converter.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/print_preview/print_preview_utils.h"
diff --git a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc index 15db3d1e..9bc66d8 100644 --- a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc +++ b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.cc
@@ -11,7 +11,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc b/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc index 86e16795..a213809 100644 --- a/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc +++ b/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
@@ -16,7 +16,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc index cd80e85..bf0151be 100644 --- a/chrome/browser/ui/webui/settings/about_handler.cc +++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -19,7 +19,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/default_clock.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/settings/about_handler_unittest.cc b/chrome/browser/ui/webui/settings/about_handler_unittest.cc index cf7d225..d45eb8c7 100644 --- a/chrome/browser/ui/webui/settings/about_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/about_handler_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/ui/webui/settings/about_handler.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chromeos/dbus/concierge/concierge_client.h"
diff --git a/chrome/browser/ui/webui/settings/ash/calculator/size_calculator.cc b/chrome/browser/ui/webui/settings/ash/calculator/size_calculator.cc index f702e32f..ef82ccb 100644 --- a/chrome/browser/ui/webui/settings/ash/calculator/size_calculator.cc +++ b/chrome/browser/ui/webui/settings/ash/calculator/size_calculator.cc
@@ -14,7 +14,6 @@ #include "base/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "chrome/browser/ash/crostini/crostini_features.h"
diff --git a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc index a37f3579..2fabd8f 100644 --- a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc +++ b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
@@ -18,7 +18,6 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h"
diff --git a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc index 89280a54..88849c6 100644 --- a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc +++ b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc
@@ -18,7 +18,6 @@ #include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc b/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc index 73fc745..9063f5b 100644 --- a/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc
@@ -16,6 +16,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/metrics/user_action_tester.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "base/types/strong_alias.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/webui/settings/settings_utils_win.cc b/chrome/browser/ui/webui/settings/settings_utils_win.cc index 8e8aa55..2500f52c 100644 --- a/chrome/browser/ui/webui/settings/settings_utils_win.cc +++ b/chrome/browser/ui/webui/settings/settings_utils_win.cc
@@ -11,7 +11,6 @@ #include "base/callback_helpers.h" #include "base/location.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h"
diff --git a/chrome/browser/ui/webui/test_data_source.cc b/chrome/browser/ui/webui/test_data_source.cc index 8ae2d5b..4b636f51 100644 --- a/chrome/browser/ui/webui/test_data_source.cc +++ b/chrome/browser/ui/webui/test_data_source.cc
@@ -12,7 +12,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/path_service.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/version/version_handler.cc b/chrome/browser/ui/webui/version/version_handler.cc index ef7fe92..1fc7153 100644 --- a/chrome/browser/ui/webui/version/version_handler.cc +++ b/chrome/browser/ui/webui/version/version_handler.cc
@@ -12,7 +12,6 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/metrics/field_trial.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/version/version_handler_chromeos.cc b/chrome/browser/ui/webui/version/version_handler_chromeos.cc index e8810a4..4a28204 100644 --- a/chrome/browser/ui/webui/version/version_handler_chromeos.cc +++ b/chrome/browser/ui/webui/version/version_handler_chromeos.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ui/webui/version/version_handler_chromeos.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/chromeos_buildflags.h" #include "chrome/common/channel_info.h"
diff --git a/chrome/browser/ui/webui/version/version_handler_win.cc b/chrome/browser/ui/webui/version/version_handler_win.cc index 1cb06bcf..c70005e 100644 --- a/chrome/browser/ui/webui/version/version_handler_win.cc +++ b/chrome/browser/ui/webui/version/version_handler_win.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/ui/webui/version/version_handler_win.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/win/windows_version.h" #include "chrome/browser/ui/webui/version/version_util_win.h"
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc index e253b0f..d31f1a1 100644 --- a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc +++ b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
@@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/feature_list.h" #include "base/strings/string_number_conversions.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/common/chrome_constants.h"
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc index 2edc98f..d977a7e 100644 --- a/chrome/browser/unload_browsertest.cc +++ b/chrome/browser/unload_browsertest.cc
@@ -6,7 +6,6 @@ #include "base/command_line.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/updater/browser_updater_client.cc b/chrome/browser/updater/browser_updater_client.cc index 276c216..276bfca7 100644 --- a/chrome/browser/updater/browser_updater_client.cc +++ b/chrome/browser/updater/browser_updater_client.cc
@@ -10,7 +10,6 @@ #include "base/callback.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/updater/update_service.h" #include "components/version_info/version_info.h"
diff --git a/chrome/browser/updater/browser_updater_client_mac.mm b/chrome/browser/updater/browser_updater_client_mac.mm index 44ab2d9e..8fd7004 100644 --- a/chrome/browser/updater/browser_updater_client_mac.mm +++ b/chrome/browser/updater/browser_updater_client_mac.mm
@@ -17,7 +17,6 @@ #include "base/notreached.h" #include "base/strings/strcat.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "chrome/browser/updater/browser_updater_client_util.h" #import "chrome/updater/app/server/mac/update_service_wrappers.h" #import "chrome/updater/mac/xpc_service_names.h"
diff --git a/chrome/browser/updater/browser_updater_helper_client_mac.mm b/chrome/browser/updater/browser_updater_helper_client_mac.mm index fda05c1..a326b64 100644 --- a/chrome/browser/updater/browser_updater_helper_client_mac.mm +++ b/chrome/browser/updater/browser_updater_helper_client_mac.mm
@@ -14,7 +14,6 @@ #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_refptr.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/browser/updater/browser_updater_client_util.h"
diff --git a/chrome/browser/updates/announcement_notification/announcement_notification_service.cc b/chrome/browser/updates/announcement_notification/announcement_notification_service.cc index 0d0e2a2..818800e 100644 --- a/chrome/browser/updates/announcement_notification/announcement_notification_service.cc +++ b/chrome/browser/updates/announcement_notification/announcement_notification_service.cc
@@ -11,6 +11,7 @@ #include "base/metrics/field_trial_params.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_attributes_entry.h" // nogncheck #include "chrome/browser/profiles/profile_attributes_storage.h" // nogncheck
diff --git a/chrome/browser/upgrade_detector/installed_version_poller.cc b/chrome/browser/upgrade_detector/installed_version_poller.cc index 04ccd27..6e69bd7 100644 --- a/chrome/browser/upgrade_detector/installed_version_poller.cc +++ b/chrome/browser/upgrade_detector/installed_version_poller.cc
@@ -14,7 +14,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.h b/chrome/browser/upgrade_detector/upgrade_detector_impl.h index 5034346..e562c45 100644 --- a/chrome/browser/upgrade_detector/upgrade_detector_impl.h +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.h
@@ -9,6 +9,7 @@ #include "base/no_destructor.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/version.h" #include "chrome/browser/upgrade_detector/build_state_observer.h"
diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl_unittest.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl_unittest.cc index 878cb76..83f7ffb 100644 --- a/chrome/browser/upgrade_detector/upgrade_detector_impl_unittest.cc +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl_unittest.cc
@@ -13,6 +13,7 @@ #include "base/memory/raw_ptr.h" #include "base/time/clock.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/video_tutorials/tutorial_factory_helper.cc b/chrome/browser/video_tutorials/tutorial_factory_helper.cc index 77a19356..7d68cc03 100644 --- a/chrome/browser/video_tutorials/tutorial_factory_helper.cc +++ b/chrome/browser/video_tutorials/tutorial_factory_helper.cc
@@ -6,7 +6,6 @@ #include <utility> -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/video_tutorials/internal/config.h"
diff --git a/chrome/browser/visibility_timer_tab_helper.cc b/chrome/browser/visibility_timer_tab_helper.cc index 24a4bfe..d0fb256f 100644 --- a/chrome/browser/visibility_timer_tab_helper.cc +++ b/chrome/browser/visibility_timer_tab_helper.cc
@@ -8,6 +8,7 @@ #include "base/callback_helpers.h" #include "base/logging.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "content/public/browser/visibility.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/vr/elements/environment/stars.h b/chrome/browser/vr/elements/environment/stars.h index d723d81..e3ec828b 100644 --- a/chrome/browser/vr/elements/environment/stars.h +++ b/chrome/browser/vr/elements/environment/stars.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_VR_ELEMENTS_ENVIRONMENT_STARS_H_ #define CHROME_BROWSER_VR_ELEMENTS_ENVIRONMENT_STARS_H_ +#include "base/time/time.h" #include "chrome/browser/vr/elements/ui_element.h" #include "chrome/browser/vr/renderers/base_renderer.h"
diff --git a/chrome/browser/vr/elements/spinner_unittest.cc b/chrome/browser/vr/elements/spinner_unittest.cc index e4d68fb6..440e960 100644 --- a/chrome/browser/vr/elements/spinner_unittest.cc +++ b/chrome/browser/vr/elements/spinner_unittest.cc
@@ -7,6 +7,7 @@ #include <vector> #include "base/test/gtest_util.h" +#include "base/time/time.h" #include "cc/test/test_skcanvas.h" #include "chrome/browser/vr/elements/ui_texture.h" #include "chrome/browser/vr/test/animation_utils.h"
diff --git a/chrome/browser/vr/elements/text_input.h b/chrome/browser/vr/elements/text_input.h index cc3e5d10..d7580380 100644 --- a/chrome/browser/vr/elements/text_input.h +++ b/chrome/browser/vr/elements/text_input.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/vr/elements/ui_element.h" #include "chrome/browser/vr/elements/ui_texture.h" #include "chrome/browser/vr/model/color_scheme.h"
diff --git a/chrome/browser/vr/elements/transient_element.h b/chrome/browser/vr/elements/transient_element.h index 130cb2bb..208907d 100644 --- a/chrome/browser/vr/elements/transient_element.h +++ b/chrome/browser/vr/elements/transient_element.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_VR_ELEMENTS_TRANSIENT_ELEMENT_H_ #include "base/callback.h" +#include "base/time/time.h" #include "chrome/browser/vr/elements/ui_element.h" #include "chrome/browser/vr/vr_ui_export.h"
diff --git a/chrome/browser/vr/elements/viewport_aware_root_unittest.cc b/chrome/browser/vr/elements/viewport_aware_root_unittest.cc index abc7d65..2b047d0 100644 --- a/chrome/browser/vr/elements/viewport_aware_root_unittest.cc +++ b/chrome/browser/vr/elements/viewport_aware_root_unittest.cc
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/numerics/ranges.h" +#include "base/time/time.h" #include "chrome/browser/vr/elements/draw_phase.h" #include "chrome/browser/vr/test/animation_utils.h" #include "chrome/browser/vr/test/constants.h"
diff --git a/chrome/browser/vr/gesture_detector_unittest.cc b/chrome/browser/vr/gesture_detector_unittest.cc index a6102c3..9f2ab6dd 100644 --- a/chrome/browser/vr/gesture_detector_unittest.cc +++ b/chrome/browser/vr/gesture_detector_unittest.cc
@@ -4,6 +4,7 @@ #include "chrome/browser/vr/gesture_detector.h" +#include "base/time/time.h" #include "chrome/browser/vr/input_event.h" #include "chrome/browser/vr/platform_controller.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/vr/input_delegate_for_testing.h b/chrome/browser/vr/input_delegate_for_testing.h index 82ae8107..cbdd0122 100644 --- a/chrome/browser/vr/input_delegate_for_testing.h +++ b/chrome/browser/vr/input_delegate_for_testing.h
@@ -8,6 +8,7 @@ #include <queue> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "chrome/browser/vr/gesture_detector.h" #include "chrome/browser/vr/input_delegate.h" #include "chrome/browser/vr/model/controller_model.h"
diff --git a/chrome/browser/vr/model/model.h b/chrome/browser/vr/model/model.h index cc10a5a..22725c96 100644 --- a/chrome/browser/vr/model/model.h +++ b/chrome/browser/vr/model/model.h
@@ -8,6 +8,7 @@ #include <memory> #include <vector> +#include "base/time/time.h" #include "chrome/browser/vr/gl_texture_location.h" #include "chrome/browser/vr/model/capturing_state_model.h" #include "chrome/browser/vr/model/color_scheme.h"
diff --git a/chrome/browser/vr/ui_host/vr_ui_host_impl.cc b/chrome/browser/vr/ui_host/vr_ui_host_impl.cc index 90b64ef..db849173 100644 --- a/chrome/browser/vr/ui_host/vr_ui_host_impl.cc +++ b/chrome/browser/vr/ui_host/vr_ui_host_impl.cc
@@ -6,7 +6,6 @@ #include <memory> -#include "base/task/post_task.h" #include "build/build_config.h" #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
diff --git a/chrome/browser/vr/ui_host/vr_ui_host_impl.h b/chrome/browser/vr/ui_host/vr_ui_host_impl.h index acfa91d..19e320ca 100644 --- a/chrome/browser/vr/ui_host/vr_ui_host_impl.h +++ b/chrome/browser/vr/ui_host/vr_ui_host_impl.h
@@ -11,6 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "chrome/browser/media/webrtc/desktop_media_picker_manager.h" #include "chrome/browser/vr/model/capturing_state_model.h" #include "components/permissions/permission_request_manager.h"
diff --git a/chrome/browser/web_applications/adjustments/link_capturing_pref_migration.cc b/chrome/browser/web_applications/adjustments/link_capturing_pref_migration.cc index d5dafd8b..ae8c7cf 100644 --- a/chrome/browser/web_applications/adjustments/link_capturing_pref_migration.cc +++ b/chrome/browser/web_applications/adjustments/link_capturing_pref_migration.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/web_applications/adjustments/link_capturing_pref_migration.h" -#include "base/task/post_task.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/web_applications/web_app.h"
diff --git a/chrome/browser/web_applications/adjustments/preinstalled_web_app_duplication_fixer.cc b/chrome/browser/web_applications/adjustments/preinstalled_web_app_duplication_fixer.cc index aa73fb13..a9dc388 100644 --- a/chrome/browser/web_applications/adjustments/preinstalled_web_app_duplication_fixer.cc +++ b/chrome/browser/web_applications/adjustments/preinstalled_web_app_duplication_fixer.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/web_applications/adjustments/preinstalled_web_app_duplication_fixer.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/web_applications/adjustments/preinstalled_web_app_duplication_fixer_browsertest.cc b/chrome/browser/web_applications/adjustments/preinstalled_web_app_duplication_fixer_browsertest.cc index 194a5ed..e81710c 100644 --- a/chrome/browser/web_applications/adjustments/preinstalled_web_app_duplication_fixer_browsertest.cc +++ b/chrome/browser/web_applications/adjustments/preinstalled_web_app_duplication_fixer_browsertest.cc
@@ -116,7 +116,8 @@ void UninstallWebApp() { test::UninstallWebApp(profile(), web_app_id()); } void RunAppDuplicationFix() { - WebAppAdjustments::Get(profile()) + WebAppAdjustmentsFactory::GetInstance() + ->Get(profile()) ->preinstalled_web_app_duplication_fixer() ->ScanForDuplicationForTesting(); }
diff --git a/chrome/browser/web_applications/adjustments/web_app_adjustments.cc b/chrome/browser/web_applications/adjustments/web_app_adjustments.cc index 6c91dc9..4cd26dd 100644 --- a/chrome/browser/web_applications/adjustments/web_app_adjustments.cc +++ b/chrome/browser/web_applications/adjustments/web_app_adjustments.cc
@@ -19,12 +19,6 @@ // WebAppAdjustments implementation // -------------------------------- -WebAppAdjustments* WebAppAdjustments::Get(Profile* profile) { - return static_cast<WebAppAdjustments*>( - WebAppAdjustmentsFactory::GetInstance()->GetServiceForBrowserContext( - profile, /*create=*/false)); -} - WebAppAdjustments::WebAppAdjustments(Profile* profile) { #if BUILDFLAG(IS_CHROMEOS) link_capturing_pref_migration_ = @@ -50,6 +44,11 @@ return instance.get(); } +WebAppAdjustments* WebAppAdjustmentsFactory::Get(Profile* profile) { + return static_cast<WebAppAdjustments*>( + GetInstance()->GetServiceForBrowserContext(profile, /*create=*/false)); +} + WebAppAdjustmentsFactory::WebAppAdjustmentsFactory() : BrowserContextKeyedServiceFactory( "WebAppAdjustments",
diff --git a/chrome/browser/web_applications/adjustments/web_app_adjustments.h b/chrome/browser/web_applications/adjustments/web_app_adjustments.h index 8864843f..53074bf 100644 --- a/chrome/browser/web_applications/adjustments/web_app_adjustments.h +++ b/chrome/browser/web_applications/adjustments/web_app_adjustments.h
@@ -25,8 +25,6 @@ // Everything in here should have a removal date. class WebAppAdjustments : public KeyedService { public: - static WebAppAdjustments* Get(Profile* profile); - explicit WebAppAdjustments(Profile* profile); ~WebAppAdjustments() override; @@ -49,10 +47,9 @@ ~WebAppAdjustmentsFactory() override; static WebAppAdjustmentsFactory* GetInstance(); + WebAppAdjustments* Get(Profile* profile); private: - friend class WebAppAdjustments; - // BrowserContextKeyedServiceFactory: KeyedService* BuildServiceInstanceFor( content::BrowserContext* context) const override;
diff --git a/chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc b/chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc index 1aaed0e..5c3c5b2 100644 --- a/chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc +++ b/chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc
@@ -13,7 +13,6 @@ #include "base/command_line.h" #include "base/no_destructor.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/web_applications/extensions/web_app_extension_shortcut_mac.mm b/chrome/browser/web_applications/extensions/web_app_extension_shortcut_mac.mm index 90a3497..23967ae 100644 --- a/chrome/browser/web_applications/extensions/web_app_extension_shortcut_mac.mm +++ b/chrome/browser/web_applications/extensions/web_app_extension_shortcut_mac.mm
@@ -10,7 +10,6 @@ #include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/web_applications/extensions/web_app_policy_manager_unittest.cc b/chrome/browser/web_applications/extensions/web_app_policy_manager_unittest.cc index 109bb2a..079295c 100644 --- a/chrome/browser/web_applications/extensions/web_app_policy_manager_unittest.cc +++ b/chrome/browser/web_applications/extensions/web_app_policy_manager_unittest.cc
@@ -312,11 +312,18 @@ void SetUp() override { #if BUILDFLAG(IS_CHROMEOS_ASH) if (GetParam() == TestParam::kLacrosEnabled) { - scoped_feature_list_.InitAndEnableFeature(features::kWebAppsCrosapi); + scoped_feature_list_.InitWithFeatures( + {features::kDesktopPWAsEnforceWebAppSettingsPolicy, + features::kWebAppsCrosapi}, + {}); } else if (GetParam() == TestParam::kLacrosDisabled) { scoped_feature_list_.InitWithFeatures( - {}, {features::kWebAppsCrosapi, ash::features::kLacrosPrimary}); + {features::kDesktopPWAsEnforceWebAppSettingsPolicy}, + {features::kWebAppsCrosapi, ash::features::kLacrosPrimary}); } +#else + scoped_feature_list_.InitAndEnableFeature( + features::kDesktopPWAsEnforceWebAppSettingsPolicy); #endif // BUILDFLAG(IS_CHROMEOS_ASH) ChromeRenderViewHostTestHarness::SetUp();
diff --git a/chrome/browser/web_applications/os_integration/os_integration_manager.cc b/chrome/browser/web_applications/os_integration/os_integration_manager.cc index 9da0d363..f1c4e3a 100644 --- a/chrome/browser/web_applications/os_integration/os_integration_manager.cc +++ b/chrome/browser/web_applications/os_integration/os_integration_manager.cc
@@ -16,7 +16,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/threading/sequenced_task_runner_handle.h" #include "build/build_config.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_win.cc b/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_win.cc index 77b42df2..f055dd84 100644 --- a/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_win.cc +++ b/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_win.cc
@@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.cc b/chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.cc index f821d52..11397bf 100644 --- a/chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.cc +++ b/chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win.cc
@@ -11,7 +11,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/win/windows_version.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_protocol_handler_registration_win.cc b/chrome/browser/web_applications/os_integration/web_app_protocol_handler_registration_win.cc index 6727800..45cffeb8 100644 --- a/chrome/browser/web_applications/os_integration/web_app_protocol_handler_registration_win.cc +++ b/chrome/browser/web_applications/os_integration/web_app_protocol_handler_registration_win.cc
@@ -17,7 +17,6 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcuts_menu_win.cc b/chrome/browser/web_applications/os_integration/web_app_shortcuts_menu_win.cc index 3411a49..9759ff2 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcuts_menu_win.cc +++ b/chrome/browser/web_applications/os_integration/web_app_shortcuts_menu_win.cc
@@ -20,7 +20,6 @@ #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/browser/shell_integration_win.h" #include "chrome/browser/web_applications/web_app_helpers.h"
diff --git a/chrome/browser/web_applications/policy/web_app_policy_manager.cc b/chrome/browser/web_applications/policy/web_app_policy_manager.cc index a4048f1..bbddd5a 100644 --- a/chrome/browser/web_applications/policy/web_app_policy_manager.cc +++ b/chrome/browser/web_applications/policy/web_app_policy_manager.cc
@@ -151,12 +151,15 @@ prefs::kWebAppInstallForceList, base::BindRepeating(&WebAppPolicyManager::RefreshPolicyInstalledApps, weak_ptr_factory_.GetWeakPtr())); - pref_change_registrar_.Add( - prefs::kWebAppSettings, - base::BindRepeating(&WebAppPolicyManager::RefreshPolicySettings, - weak_ptr_factory_.GetWeakPtr())); + if (base::FeatureList::IsEnabled( + features::kDesktopPWAsEnforceWebAppSettingsPolicy)) { + pref_change_registrar_.Add( + prefs::kWebAppSettings, + base::BindRepeating(&WebAppPolicyManager::RefreshPolicySettings, + weak_ptr_factory_.GetWeakPtr())); - RefreshPolicySettings(); + RefreshPolicySettings(); + } RefreshPolicyInstalledApps(); } ObserveDisabledSystemFeaturesPolicy();
diff --git a/chrome/browser/web_applications/preinstalled_web_app_manager.cc b/chrome/browser/web_applications/preinstalled_web_app_manager.cc index b2287c4..08bd1e88 100644 --- a/chrome/browser/web_applications/preinstalled_web_app_manager.cc +++ b/chrome/browser/web_applications/preinstalled_web_app_manager.cc
@@ -26,7 +26,6 @@ #include "base/observer_list.h" #include "base/path_service.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "build/build_config.h"
diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h index 4fc747c..908bc0a 100644 --- a/chrome/browser/web_applications/web_app.h +++ b/chrome/browser/web_applications/web_app.h
@@ -10,6 +10,7 @@ #include <string> #include <vector> +#include "base/time/time.h" #include "base/values.h" #include "chrome/browser/web_applications/web_app_chromeos_data.h" #include "chrome/browser/web_applications/web_app_constants.h"
diff --git a/chrome/browser/web_applications/web_app_install_info.cc b/chrome/browser/web_applications/web_app_install_info.cc index 46520fd..80280750 100644 --- a/chrome/browser/web_applications/web_app_install_info.cc +++ b/chrome/browser/web_applications/web_app_install_info.cc
@@ -213,6 +213,31 @@ } // WebAppInstallInfo + +// static +WebAppInstallInfo WebAppInstallInfo::CreateInstallInfoForCreateShortcut( + const GURL& document_url, + const WebAppInstallInfo& other) { + WebAppInstallInfo create_shortcut_info; + create_shortcut_info.title = other.title; + create_shortcut_info.description = other.description; + create_shortcut_info.start_url = document_url; + create_shortcut_info.manifest_url = other.manifest_url; + create_shortcut_info.manifest_icons = other.manifest_icons; + create_shortcut_info.icon_bitmaps = other.icon_bitmaps; + create_shortcut_info.other_icon_bitmaps = other.other_icon_bitmaps; + create_shortcut_info.is_generated_icon = other.is_generated_icon; + create_shortcut_info.generated_icon_color = other.generated_icon_color; + create_shortcut_info.theme_color = other.theme_color; + create_shortcut_info.dark_mode_theme_color = other.dark_mode_theme_color; + create_shortcut_info.background_color = other.background_color; + create_shortcut_info.dark_mode_background_color = + other.dark_mode_background_color; + create_shortcut_info.display_mode = other.display_mode; + create_shortcut_info.additional_search_terms = other.additional_search_terms; + return create_shortcut_info; +} + WebAppInstallInfo::WebAppInstallInfo() = default; WebAppInstallInfo::WebAppInstallInfo(const WebAppInstallInfo& other) = default;
diff --git a/chrome/browser/web_applications/web_app_install_info.h b/chrome/browser/web_applications/web_app_install_info.h index 7eca50fa..cf5a78c 100644 --- a/chrome/browser/web_applications/web_app_install_info.h +++ b/chrome/browser/web_applications/web_app_install_info.h
@@ -173,6 +173,13 @@ MOBILE_CAPABLE_APPLE }; + // Returns a copy of the |other| that has only the fields that should be + // copied/derived from various sources (e.g generated icons, manifest + // properties). This will strip out app-like fields such as file handlers etc. + static WebAppInstallInfo CreateInstallInfoForCreateShortcut( + const GURL& document_url, + const WebAppInstallInfo& other); + WebAppInstallInfo(); WebAppInstallInfo(const WebAppInstallInfo& other); explicit WebAppInstallInfo(const webapps::mojom::WebPageMetadata& metadata);
diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/browser/web_applications/web_app_install_task.cc index 2c13022a..e1e1e0e 100644 --- a/chrome/browser/web_applications/web_app_install_task.cc +++ b/chrome/browser/web_applications/web_app_install_task.cc
@@ -659,6 +659,14 @@ UpdateWebAppInfoFromManifest(*opt_manifest, manifest_url, web_app_info.get()); + // When creating a shortcut, the |manifest_id| is not part of the App's + // primary key. The only thing that identifies a shortcut is the start URL, + // which is always set to the current page. + if (flow_ == WebAppInstallFlow::kCreateShortcut) { + *web_app_info = WebAppInstallInfo::CreateInstallInfoForCreateShortcut( + web_contents()->GetLastCommittedURL(), *web_app_info); + } + AppId app_id = GenerateAppId(web_app_info->manifest_id, web_app_info->start_url);
diff --git a/chrome/browser/web_applications/web_app_install_task_unittest.cc b/chrome/browser/web_applications/web_app_install_task_unittest.cc index 9949e46..469950c 100644 --- a/chrome/browser/web_applications/web_app_install_task_unittest.cc +++ b/chrome/browser/web_applications/web_app_install_task_unittest.cc
@@ -1130,6 +1130,46 @@ run_loop.Run(); } +TEST_F(WebAppInstallTaskTest, CreateShortcutUsesDocumentURL) { + SetInstallFinalizerForTesting(); + + const GURL manifest_start_url{"https://example.com/?pwa=true"}; + const std::string title = "App Name"; + const std::string description = "Description"; + const GURL manifest_scope{"https://example.com/"}; + const absl::optional<SkColor> theme_color = 0xAABBCCDD; + + CreateRendererAppInfo(manifest_start_url, title, description, manifest_scope, + theme_color, + /*user_display_mode=*/DisplayMode::kStandalone); + + base::RunLoop run_loop; + + const GURL document_url{"https://example.com/my/special/document/"}; + NavigateAndCommit(document_url); + + install_task_->InstallWebAppFromManifestWithFallback( + web_contents(), WebAppInstallManager::WebAppInstallFlow::kCreateShortcut, + webapps::WebappInstallSource::MENU_BROWSER_TAB, + base::BindOnce(test::TestAcceptDialogCallback), + base::BindLambdaForTesting( + [&](const AppId& installed_app_id, webapps::InstallResultCode code) { + EXPECT_EQ(webapps::InstallResultCode::kSuccessNewInstall, code); + + std::unique_ptr<WebAppInstallInfo> final_web_app_info = + fake_install_finalizer().web_app_info(); + EXPECT_EQ(document_url, final_web_app_info->start_url); + EXPECT_EQ(absl::nullopt, final_web_app_info->manifest_id); + EXPECT_EQ(GURL{}, final_web_app_info->scope); + EXPECT_EQ(theme_color, final_web_app_info->theme_color); + EXPECT_EQ(title, base::UTF16ToUTF8(final_web_app_info->title)); + + run_loop.Quit(); + })); + + run_loop.Run(); +} + #if BUILDFLAG(IS_CHROMEOS_ASH) TEST_F(WebAppInstallTaskTest, IntentToPlayStore) { arc_test_.app_instance()->set_is_installable(true);
diff --git a/chrome/browser/webauthn/cablev2_devices.cc b/chrome/browser/webauthn/cablev2_devices.cc index c922c91..ff69a5cd 100644 --- a/chrome/browser/webauthn/cablev2_devices.cc +++ b/chrome/browser/webauthn/cablev2_devices.cc
@@ -15,6 +15,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/device_info_sync_service_factory.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/webshare/win/show_share_ui_for_window_operation.cc b/chrome/browser/webshare/win/show_share_ui_for_window_operation.cc index f9b9d387..068e17af 100644 --- a/chrome/browser/webshare/win/show_share_ui_for_window_operation.cc +++ b/chrome/browser/webshare/win/show_share_ui_for_window_operation.cc
@@ -10,7 +10,6 @@ #include <wrl/event.h> #include "base/callback.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "base/win/core_winrt_util.h" #include "base/win/windows_version.h"
diff --git a/chrome/browser/win/automation_controller.cc b/chrome/browser/win/automation_controller.cc index 8606dc8..23703df 100644 --- a/chrome/browser/win/automation_controller.cc +++ b/chrome/browser/win/automation_controller.cc
@@ -15,7 +15,6 @@ #include "base/sequence_checker.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/win/atl.h" #include "base/win/scoped_variant.h"
diff --git a/chrome/browser/win/chrome_elf_init.cc b/chrome/browser/win/chrome_elf_init.cc index e9c6998..7912f16 100644 --- a/chrome/browser/win/chrome_elf_init.cc +++ b/chrome/browser/win/chrome_elf_init.cc
@@ -10,7 +10,6 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/win/registry.h" #include "chrome/browser/browser_process.h" #include "chrome/chrome_elf/chrome_elf_constants.h"
diff --git a/chrome/browser/win/conflicts/enumerate_input_method_editors.cc b/chrome/browser/win/conflicts/enumerate_input_method_editors.cc index 4e5c5d8..f977763 100644 --- a/chrome/browser/win/conflicts/enumerate_input_method_editors.cc +++ b/chrome/browser/win/conflicts/enumerate_input_method_editors.cc
@@ -15,7 +15,6 @@ #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/win/conflicts/enumerate_shell_extensions.cc b/chrome/browser/win/conflicts/enumerate_shell_extensions.cc index d44000d..c34f7ad 100644 --- a/chrome/browser/win/conflicts/enumerate_shell_extensions.cc +++ b/chrome/browser/win/conflicts/enumerate_shell_extensions.cc
@@ -11,7 +11,6 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/win/conflicts/module_blocklist_cache_updater.cc b/chrome/browser/win/conflicts/module_blocklist_cache_updater.cc index 109d7a0..6c37952 100644 --- a/chrome/browser/win/conflicts/module_blocklist_cache_updater.cc +++ b/chrome/browser/win/conflicts/module_blocklist_cache_updater.cc
@@ -17,7 +17,6 @@ #include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/win/conflicts/module_database_unittest.cc b/chrome/browser/win/conflicts/module_database_unittest.cc index 8b34ae3..a8f2e3a 100644 --- a/chrome/browser/win/conflicts/module_database_unittest.cc +++ b/chrome/browser/win/conflicts/module_database_unittest.cc
@@ -7,7 +7,6 @@ #include <memory> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "chrome/browser/win/conflicts/module_database_observer.h" #include "chrome/browser/win/conflicts/module_info.h"
diff --git a/chrome/browser/win/conflicts/module_event_sink_impl.cc b/chrome/browser/win/conflicts/module_event_sink_impl.cc index d44d7515..9b8d07e 100644 --- a/chrome/browser/win/conflicts/module_event_sink_impl.cc +++ b/chrome/browser/win/conflicts/module_event_sink_impl.cc
@@ -16,7 +16,6 @@ #include "base/callback.h" #include "base/files/file_path.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/win/conflicts/module_inspector.cc b/chrome/browser/win/conflicts/module_inspector.cc index 15c9b2e1..8c75b03 100644 --- a/chrome/browser/win/conflicts/module_inspector.cc +++ b/chrome/browser/win/conflicts/module_inspector.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/metrics/histogram_functions.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/browser/win/conflicts/module_load_attempt_log_listener.cc b/chrome/browser/win/conflicts/module_load_attempt_log_listener.cc index 842fa2d..99a350f 100644 --- a/chrome/browser/win/conflicts/module_load_attempt_log_listener.cc +++ b/chrome/browser/win/conflicts/module_load_attempt_log_listener.cc
@@ -14,7 +14,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "chrome/browser/win/conflicts/module_blocklist_cache_util.h"
diff --git a/chrome/browser/win/conflicts/third_party_conflicts_manager.cc b/chrome/browser/win/conflicts/third_party_conflicts_manager.cc index 0d15476..dc7dd0d5 100644 --- a/chrome/browser/win/conflicts/third_party_conflicts_manager.cc +++ b/chrome/browser/win/conflicts/third_party_conflicts_manager.cc
@@ -17,7 +17,6 @@ #include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner.h" #include "base/task/task_runner_util.h"
diff --git a/chrome/browser/win/jumplist.cc b/chrome/browser/win/jumplist.cc index ac33ca55..cb50ec8 100644 --- a/chrome/browser/win/jumplist.cc +++ b/chrome/browser/win/jumplist.cc
@@ -19,7 +19,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/win/parental_controls.cc b/chrome/browser/win/parental_controls.cc index 5d77a57f..8700f58 100644 --- a/chrome/browser/win/parental_controls.cc +++ b/chrome/browser/win/parental_controls.cc
@@ -17,7 +17,6 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt index dd647b5..72cd0915 100644 --- a/chrome/build/linux.pgo.txt +++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@ -chrome-linux-main-1648663201-4cb77d53b364fffa810729b04af3d3b00b82533f.profdata +chrome-linux-main-1648705776-bd9c07ad4796fb0ee4ff2de7b2b93526c3715059.profdata
diff --git a/chrome/build/mac-arm.pgo.txt b/chrome/build/mac-arm.pgo.txt index d0f2f22..843fe627 100644 --- a/chrome/build/mac-arm.pgo.txt +++ b/chrome/build/mac-arm.pgo.txt
@@ -1 +1 @@ -chrome-mac-arm-main-1648663201-9213dc330dbba935a0c87313bc668ea48151b54a.profdata +chrome-mac-arm-main-1648684785-c22dc7444219656579aee7bde66f7fd378d8339a.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt index 73ce129..d15129a 100644 --- a/chrome/build/mac.pgo.txt +++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@ -chrome-mac-main-1648663201-ff158ea04e14738165acabb765bc7b23caac5cc5.profdata +chrome-mac-main-1648684785-4c8dec12340db2672cf0992b2cbf0632921d1336.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index d5b55fbe..27d7d3f 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@ -chrome-win32-main-1648663201-5c163365937a17e237d6c061db3bdef1b7c4378b.profdata +chrome-win32-main-1648695275-79fcbbbf1bdfc2f941f1252c1c7f7fbadad5f5cf.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index b738faf..763689a 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@ -chrome-win64-main-1648673977-83cc95cfc73acbe8de8911aff70527fdb30e60e1.profdata +chrome-win64-main-1648684785-0734256a29fff9f099e9e3ada6ac8c9f113002b5.profdata
diff --git a/chrome/chrome_cleaner/components/component_manager.cc b/chrome/chrome_cleaner/components/component_manager.cc index b72af22..32b16f4 100644 --- a/chrome/chrome_cleaner/components/component_manager.cc +++ b/chrome/chrome_cleaner/components/component_manager.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/chrome_cleaner/components/component_api.h"
diff --git a/chrome/chrome_cleaner/components/recovery_component.h b/chrome/chrome_cleaner/components/recovery_component.h index cb58dee5..bbdac4549 100644 --- a/chrome/chrome_cleaner/components/recovery_component.h +++ b/chrome/chrome_cleaner/components/recovery_component.h
@@ -11,6 +11,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chrome/chrome_cleaner/components/component_api.h" #include "url/gurl.h"
diff --git a/chrome/chrome_cleaner/engines/broker/cleaner_engine_requests_impl.cc b/chrome/chrome_cleaner/engines/broker/cleaner_engine_requests_impl.cc index 4fd9e27e..12bcd14b 100644 --- a/chrome/chrome_cleaner/engines/broker/cleaner_engine_requests_impl.cc +++ b/chrome/chrome_cleaner/engines/broker/cleaner_engine_requests_impl.cc
@@ -8,7 +8,6 @@ #include <string> #include <utility> -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/chrome_cleaner/engines/broker/cleaner_sandbox_interface.h" #include "chrome/chrome_cleaner/engines/common/engine_digest_verifier.h"
diff --git a/chrome/chrome_cleaner/engines/broker/engine_file_requests_impl.cc b/chrome/chrome_cleaner/engines/broker/engine_file_requests_impl.cc index a3a7113..77c0005 100644 --- a/chrome/chrome_cleaner/engines/broker/engine_file_requests_impl.cc +++ b/chrome/chrome_cleaner/engines/broker/engine_file_requests_impl.cc
@@ -11,7 +11,6 @@ #include "base/callback.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/chrome_cleaner/engines/broker/scanner_sandbox_interface.h"
diff --git a/chrome/chrome_cleaner/engines/broker/engine_requests_impl.cc b/chrome/chrome_cleaner/engines/broker/engine_requests_impl.cc index b37e022..859f9cf 100644 --- a/chrome/chrome_cleaner/engines/broker/engine_requests_impl.cc +++ b/chrome/chrome_cleaner/engines/broker/engine_requests_impl.cc
@@ -15,7 +15,6 @@ #include "base/callback.h" #include "base/task/thread_pool.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "chrome/chrome_cleaner/engines/broker/scanner_sandbox_interface.h" #include "chrome/chrome_cleaner/os/registry.h"
diff --git a/chrome/chrome_cleaner/engines/broker/engine_requests_no_blocking_unittest.cc b/chrome/chrome_cleaner/engines/broker/engine_requests_no_blocking_unittest.cc index e2319f3d..27c4a5f 100644 --- a/chrome/chrome_cleaner/engines/broker/engine_requests_no_blocking_unittest.cc +++ b/chrome/chrome_cleaner/engines/broker/engine_requests_no_blocking_unittest.cc
@@ -20,7 +20,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h"
diff --git a/chrome/chrome_cleaner/engines/controllers/main_controller.h b/chrome/chrome_cleaner/engines/controllers/main_controller.h index 63aee9d1..332dea6 100644 --- a/chrome/chrome_cleaner/engines/controllers/main_controller.h +++ b/chrome/chrome_cleaner/engines/controllers/main_controller.h
@@ -20,6 +20,7 @@ #include "base/sequence_checker.h" #include "base/synchronization/lock.h" #include "base/threading/watchdog.h" +#include "base/time/time.h" #include "chrome/chrome_cleaner/cleaner/cleaner.h" #include "chrome/chrome_cleaner/components/component_api.h" #include "chrome/chrome_cleaner/components/component_manager.h"
diff --git a/chrome/chrome_cleaner/engines/controllers/main_controller_unittest.cc b/chrome/chrome_cleaner/engines/controllers/main_controller_unittest.cc index 2014a154..be3dfcd 100644 --- a/chrome/chrome_cleaner/engines/controllers/main_controller_unittest.cc +++ b/chrome/chrome_cleaner/engines/controllers/main_controller_unittest.cc
@@ -12,6 +12,7 @@ #include "base/command_line.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "chrome/chrome_cleaner/components/component_api.h" #include "chrome/chrome_cleaner/components/component_manager.h" #include "chrome/chrome_cleaner/constants/chrome_cleaner_switches.h"
diff --git a/chrome/chrome_cleaner/engines/target/test_engine_delegate.h b/chrome/chrome_cleaner/engines/target/test_engine_delegate.h index cc7af61..e2e6b5df 100644 --- a/chrome/chrome_cleaner/engines/target/test_engine_delegate.h +++ b/chrome/chrome_cleaner/engines/target/test_engine_delegate.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/threading/thread.h" +#include "base/time/time.h" #include "chrome/chrome_cleaner/engines/target/engine_delegate.h" namespace chrome_cleaner {
diff --git a/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc.h b/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc.h index ebc791c..3b37151f 100644 --- a/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc.h +++ b/chrome/chrome_cleaner/ipc/proto_chrome_prompt_ipc.h
@@ -8,7 +8,6 @@ #include <windows.h> #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/win/scoped_handle.h"
diff --git a/chrome/chrome_cleaner/logging/safe_browsing_reporter.cc b/chrome/chrome_cleaner/logging/safe_browsing_reporter.cc index 6d5cd5c3..161e5aa 100644 --- a/chrome/chrome_cleaner/logging/safe_browsing_reporter.cc +++ b/chrome/chrome_cleaner/logging/safe_browsing_reporter.cc
@@ -19,7 +19,6 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/platform_thread.h"
diff --git a/chrome/chrome_cleaner/logging/safe_browsing_reporter_unittest.cc b/chrome/chrome_cleaner/logging/safe_browsing_reporter_unittest.cc index 055d0d6a..1e71cb5 100644 --- a/chrome/chrome_cleaner/logging/safe_browsing_reporter_unittest.cc +++ b/chrome/chrome_cleaner/logging/safe_browsing_reporter_unittest.cc
@@ -12,6 +12,7 @@ #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" +#include "base/time/time.h" #include "chrome/chrome_cleaner/http/mock_http_agent_factory.h" #include "chrome/chrome_cleaner/logging/test_utils.h" #include "components/chrome_cleaner/public/constants/result_codes.h"
diff --git a/chrome/chrome_cleaner/os/disk_util.cc b/chrome/chrome_cleaner/os/disk_util.cc index e0d47e83..4b688f5 100644 --- a/chrome/chrome_cleaner/os/disk_util.cc +++ b/chrome/chrome_cleaner/os/disk_util.cc
@@ -26,6 +26,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "base/win/current_module.h" #include "base/win/registry.h" #include "base/win/shortcut.h"
diff --git a/chrome/chrome_cleaner/os/process.h b/chrome/chrome_cleaner/os/process.h index 0bd087f..c8231711 100644 --- a/chrome/chrome_cleaner/os/process.h +++ b/chrome/chrome_cleaner/os/process.h
@@ -11,6 +11,7 @@ #include <string> #include "base/process/process_metrics_iocounters.h" +#include "base/time/time.h" namespace chrome_cleaner {
diff --git a/chrome/chrome_cleaner/parsers/shortcut_parser/broker/sandboxed_shortcut_parser.cc b/chrome/chrome_cleaner/parsers/shortcut_parser/broker/sandboxed_shortcut_parser.cc index c1df8097..0374a14 100644 --- a/chrome/chrome_cleaner/parsers/shortcut_parser/broker/sandboxed_shortcut_parser.cc +++ b/chrome/chrome_cleaner/parsers/shortcut_parser/broker/sandboxed_shortcut_parser.cc
@@ -14,7 +14,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/win/scoped_handle.h" #include "chrome/chrome_cleaner/mojom/parser_interface.mojom.h"
diff --git a/chrome/chrome_cleaner/settings/settings_unittest.cc b/chrome/chrome_cleaner/settings/settings_unittest.cc index 8297591..ddb1455 100644 --- a/chrome/chrome_cleaner/settings/settings_unittest.cc +++ b/chrome/chrome_cleaner/settings/settings_unittest.cc
@@ -10,6 +10,7 @@ #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "chrome/chrome_cleaner/constants/chrome_cleaner_switches.h" #include "chrome/chrome_cleaner/settings/engine_settings.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/chrome_cleaner/zip_archiver/test_zip_archiver_util.cc b/chrome/chrome_cleaner/zip_archiver/test_zip_archiver_util.cc index 96c4aa5..c02c674b 100644 --- a/chrome/chrome_cleaner/zip_archiver/test_zip_archiver_util.cc +++ b/chrome/chrome_cleaner/zip_archiver/test_zip_archiver_util.cc
@@ -7,6 +7,7 @@ #include <limits> #include <vector> +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/zlib/contrib/minizip/unzip.h"
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc index 961ddb578..7864da4 100644 --- a/chrome/common/chrome_features.cc +++ b/chrome/common/chrome_features.cc
@@ -281,6 +281,10 @@ #endif }; +// Whether to parse and enforce the WebAppSettings policy. +const base::Feature kDesktopPWAsEnforceWebAppSettingsPolicy{ + "DesktopPWAsEnforceWebAppSettingsPolicy", base::FEATURE_ENABLED_BY_DEFAULT}; + // Replaces the origin text flash and the icon in web app notifications with // the name of the app and the icon of the app. const base::Feature kDesktopPWAsNotificationIconAndTitle {
diff --git a/chrome/common/chrome_features.h b/chrome/common/chrome_features.h index a3da4bc2..2d7822e 100644 --- a/chrome/common/chrome_features.h +++ b/chrome/common/chrome_features.h
@@ -11,6 +11,7 @@ #include "base/component_export.h" #include "base/feature_list.h" #include "base/metrics/field_trial_params.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/buildflag.h" #include "build/chromeos_buildflags.h" @@ -201,6 +202,9 @@ extern const base::Feature kDesktopPWAsElidedExtensionsMenu; COMPONENT_EXPORT(CHROME_FEATURES) +extern const base::Feature kDesktopPWAsEnforceWebAppSettingsPolicy; + +COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kDesktopPWAsFlashAppNameInsteadOfOrigin; COMPONENT_EXPORT(CHROME_FEATURES)
diff --git a/chrome/common/conflicts/module_watcher_win.cc b/chrome/common/conflicts/module_watcher_win.cc index 6e1b334..9f6be770 100644 --- a/chrome/common/conflicts/module_watcher_win.cc +++ b/chrome/common/conflicts/module_watcher_win.cc
@@ -18,7 +18,6 @@ #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/common/notifications/notification_image_retainer.cc b/chrome/common/notifications/notification_image_retainer.cc index 6474365..1b79f2b 100644 --- a/chrome/common/notifications/notification_image_retainer.cc +++ b/chrome/common/notifications/notification_image_retainer.cc
@@ -14,7 +14,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/numerics/safe_conversions.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/default_tick_clock.h" #include "chrome/common/chrome_paths.h"
diff --git a/chrome/common/printing/printer_capabilities_unittest.cc b/chrome/common/printing/printer_capabilities_unittest.cc index 0f87f70..699eedb 100644 --- a/chrome/common/printing/printer_capabilities_unittest.cc +++ b/chrome/common/printing/printer_capabilities_unittest.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/credential_provider/extension/service_unittests.cc b/chrome/credential_provider/extension/service_unittests.cc index 7d1741d1..0a05bf9f 100644 --- a/chrome/credential_provider/extension/service_unittests.cc +++ b/chrome/credential_provider/extension/service_unittests.cc
@@ -6,6 +6,7 @@ #include "base/files/file_path.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chrome/credential_provider/extension/scoped_handle.h" #include "chrome/credential_provider/extension/service.h" #include "chrome/credential_provider/test/gcp_fakes.h"
diff --git a/chrome/credential_provider/extension/task_manager.cc b/chrome/credential_provider/extension/task_manager.cc index 980ec06e0..60c6eea 100644 --- a/chrome/credential_provider/extension/task_manager.cc +++ b/chrome/credential_provider/extension/task_manager.cc
@@ -10,6 +10,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/credential_provider/extension/extension_utils.h" #include "chrome/credential_provider/extension/user_context_enumerator.h" #include "chrome/credential_provider/gaiacp/logging.h"
diff --git a/chrome/credential_provider/extension/task_manager_unittests.cc b/chrome/credential_provider/extension/task_manager_unittests.cc index 89552b3..67763e0 100644 --- a/chrome/credential_provider/extension/task_manager_unittests.cc +++ b/chrome/credential_provider/extension/task_manager_unittests.cc
@@ -12,6 +12,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "chrome/credential_provider/extension/extension_utils.h" #include "chrome/credential_provider/extension/task.h" #include "chrome/credential_provider/extension/task_manager.h"
diff --git a/chrome/credential_provider/gaiacp/associated_user_validator_unittests.cc b/chrome/credential_provider/gaiacp/associated_user_validator_unittests.cc index 02ba92b..1456eb27 100644 --- a/chrome/credential_provider/gaiacp/associated_user_validator_unittests.cc +++ b/chrome/credential_provider/gaiacp/associated_user_validator_unittests.cc
@@ -10,6 +10,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_reg_util_win.h" +#include "base/time/time.h" #include "base/time/time_override.h" #include "chrome/credential_provider/common/gcp_strings.h" #include "chrome/credential_provider/gaiacp/associated_user_validator.h"
diff --git a/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc b/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc index 5686576b..a2de6427 100644 --- a/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc +++ b/chrome/credential_provider/gaiacp/gaia_credential_base_unittests.cc
@@ -22,6 +22,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_path_override.h" +#include "base/time/time.h" #include "base/time/time_override.h" #include "chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.h" #include "chrome/credential_provider/common/gcp_strings.h"
diff --git a/chrome/credential_provider/gaiacp/gcp_utils.h b/chrome/credential_provider/gaiacp/gcp_utils.h index 8cac541..a7125e62 100644 --- a/chrome/credential_provider/gaiacp/gcp_utils.h +++ b/chrome/credential_provider/gaiacp/gcp_utils.h
@@ -14,6 +14,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/values.h" #include "base/version.h" #include "base/win/scoped_handle.h"
diff --git a/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc b/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc index 4002dd25..17a6808 100644 --- a/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc +++ b/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc
@@ -7,6 +7,7 @@ #include <stdint.h> #include "base/test/test_reg_util_win.h" +#include "base/time/time.h" #include "chrome/install_static/test/scoped_install_details.h" #include "chrome/installer/gcapi/gcapi.h" #include "chrome/installer/util/google_update_constants.h"
diff --git a/chrome/installer/util/experiment_storage.cc b/chrome/installer/util/experiment_storage.cc index 9248514d..be6d9c40 100644 --- a/chrome/installer/util/experiment_storage.cc +++ b/chrome/installer/util/experiment_storage.cc
@@ -17,7 +17,6 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/time/time.h" #include "base/win/registry.h"
diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc index 8fc4fc9..769bd153 100644 --- a/chrome/renderer/chrome_render_thread_observer.cc +++ b/chrome/renderer/chrome_render_thread_observer.cc
@@ -22,7 +22,6 @@ #include "base/no_destructor.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/renderer/chromeos_delayed_callback_group.cc b/chrome/renderer/chromeos_delayed_callback_group.cc index 8ce4700..e074578 100644 --- a/chrome/renderer/chromeos_delayed_callback_group.cc +++ b/chrome/renderer/chromeos_delayed_callback_group.cc
@@ -6,7 +6,6 @@ #include <utility> -#include "base/task/post_task.h" #include "base/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/renderer/chromeos_delayed_callback_group_unittest.cc b/chrome/renderer/chromeos_delayed_callback_group_unittest.cc index 334f00fa..5c1dcec 100644 --- a/chrome/renderer/chromeos_delayed_callback_group_unittest.cc +++ b/chrome/renderer/chromeos_delayed_callback_group_unittest.cc
@@ -5,7 +5,6 @@ #include "chrome/renderer/chromeos_delayed_callback_group.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/chrome/renderer/media/webrtc_logging_agent_impl.h b/chrome/renderer/media/webrtc_logging_agent_impl.h index 78aa7dd7..9e5e437 100644 --- a/chrome/renderer/media/webrtc_logging_agent_impl.h +++ b/chrome/renderer/media/webrtc_logging_agent_impl.h
@@ -6,6 +6,7 @@ #define CHROME_RENDERER_MEDIA_WEBRTC_LOGGING_AGENT_IMPL_H_ #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chrome/common/media/webrtc_logging.mojom.h" #include "mojo/public/cpp/bindings/receiver_set.h"
diff --git a/chrome/renderer/sandbox_status_extension_android.cc b/chrome/renderer/sandbox_status_extension_android.cc index 83c53a7..baa8043 100644 --- a/chrome/renderer/sandbox_status_extension_android.cc +++ b/chrome/renderer/sandbox_status_extension_android.cc
@@ -9,7 +9,6 @@ #include "base/android/build_info.h" #include "base/bind.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chrome/common/url_constants.h" #include "content/public/renderer/chrome_object_extensions_utils.h"
diff --git a/chrome/services/cups_proxy/printer_installer.cc b/chrome/services/cups_proxy/printer_installer.cc index adcf3cb..7cf8963 100644 --- a/chrome/services/cups_proxy/printer_installer.cc +++ b/chrome/services/cups_proxy/printer_installer.cc
@@ -12,7 +12,6 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/services/cups_proxy/public/cpp/cups_util.h" #include "chromeos/printing/printer_configuration.h"
diff --git a/chrome/services/cups_proxy/proxy_manager.cc b/chrome/services/cups_proxy/proxy_manager.cc index 5e725e3..4705217 100644 --- a/chrome/services/cups_proxy/proxy_manager.cc +++ b/chrome/services/cups_proxy/proxy_manager.cc
@@ -15,7 +15,7 @@ #include "base/containers/ring_buffer.h" #include "base/feature_list.h" #include "base/logging.h" -#include "base/task/post_task.h" +#include "base/time/time.h" #include "chrome/services/cups_proxy/cups_proxy_service_delegate.h" #include "chrome/services/cups_proxy/ipp_validator.h" #include "chrome/services/cups_proxy/printer_installer.h"
diff --git a/chrome/services/cups_proxy/socket_manager.cc b/chrome/services/cups_proxy/socket_manager.cc index 48b66b01..5bd2ea92 100644 --- a/chrome/services/cups_proxy/socket_manager.cc +++ b/chrome/services/cups_proxy/socket_manager.cc
@@ -18,7 +18,6 @@ #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/threading/sequence_bound.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_checker.h"
diff --git a/chrome/services/file_util/public/cpp/zip_file_creator.cc b/chrome/services/file_util/public/cpp/zip_file_creator.cc index 9b4ecda..d097bf22a 100644 --- a/chrome/services/file_util/public/cpp/zip_file_creator.cc +++ b/chrome/services/file_util/public/cpp/zip_file_creator.cc
@@ -11,7 +11,6 @@ #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/services/filesystem/directory_impl.h" #include "components/services/filesystem/lock_table.h"
diff --git a/chrome/services/file_util/public/cpp/zip_file_creator.h b/chrome/services/file_util/public/cpp/zip_file_creator.h index 5eeabf0..1ca4f63 100644 --- a/chrome/services/file_util/public/cpp/zip_file_creator.h +++ b/chrome/services/file_util/public/cpp/zip_file_creator.h
@@ -11,7 +11,6 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "chrome/services/file_util/public/mojom/file_util_service.mojom.h" #include "chrome/services/file_util/public/mojom/zip_file_creator.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chrome/services/media_gallery_util/media_metadata_parser.h b/chrome/services/media_gallery_util/media_metadata_parser.h index b2cd108f..ce5924e 100644 --- a/chrome/services/media_gallery_util/media_metadata_parser.h +++ b/chrome/services/media_gallery_util/media_metadata_parser.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/callback.h" +#include "base/time/time.h" #include "chrome/common/media_galleries/metadata_types.h" #include "chrome/services/media_gallery_util/public/mojom/media_parser.mojom.h"
diff --git a/chrome/services/media_gallery_util/media_parser_android.cc b/chrome/services/media_gallery_util/media_parser_android.cc index dcd8bef..ea01b05 100644 --- a/chrome/services/media_gallery_util/media_parser_android.cc +++ b/chrome/services/media_gallery_util/media_parser_android.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "chrome/services/media_gallery_util/ipc_data_source.h" #include "chrome/services/media_gallery_util/video_thumbnail_parser.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/services/media_gallery_util/video_thumbnail_parser.cc b/chrome/services/media_gallery_util/video_thumbnail_parser.cc index 316ea51b..9ab60f4 100644 --- a/chrome/services/media_gallery_util/video_thumbnail_parser.cc +++ b/chrome/services/media_gallery_util/video_thumbnail_parser.cc
@@ -8,7 +8,6 @@ #include <vector> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/services/media_gallery_util/ipc_data_source.h"
diff --git a/chrome/services/sharing/nearby/nearby_connections.cc b/chrome/services/sharing/nearby/nearby_connections.cc index b0ef3b2bd..b59962a2 100644 --- a/chrome/services/sharing/nearby/nearby_connections.cc +++ b/chrome/services/sharing/nearby/nearby_connections.cc
@@ -12,7 +12,6 @@ #include "base/files/file_util.h" #include "base/metrics/histogram_functions.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/logging/logging.h"
diff --git a/chrome/services/sharing/nearby/nearby_connections.h b/chrome/services/sharing/nearby/nearby_connections.h index 3d4b602..71beeab0 100644 --- a/chrome/services/sharing/nearby/nearby_connections.h +++ b/chrome/services/sharing/nearby/nearby_connections.h
@@ -18,7 +18,6 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/thread_annotations.h"
diff --git a/chrome/services/sharing/nearby/platform/atomic_boolean_unittest.cc b/chrome/services/sharing/nearby/platform/atomic_boolean_unittest.cc index 1498dc8..79295ae 100644 --- a/chrome/services/sharing/nearby/platform/atomic_boolean_unittest.cc +++ b/chrome/services/sharing/nearby/platform/atomic_boolean_unittest.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/chrome/services/sharing/nearby/platform/atomic_uint32_unittest.cc b/chrome/services/sharing/nearby/platform/atomic_uint32_unittest.cc index 95fa826..6754d52 100644 --- a/chrome/services/sharing/nearby/platform/atomic_uint32_unittest.cc +++ b/chrome/services/sharing/nearby/platform/atomic_uint32_unittest.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/chrome/services/sharing/nearby/platform/condition_variable_unittest.cc b/chrome/services/sharing/nearby/platform/condition_variable_unittest.cc index ff389ecc..5729613 100644 --- a/chrome/services/sharing/nearby/platform/condition_variable_unittest.cc +++ b/chrome/services/sharing/nearby/platform/condition_variable_unittest.cc
@@ -8,7 +8,6 @@ #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/chrome/services/sharing/nearby/platform/count_down_latch_unittest.cc b/chrome/services/sharing/nearby/platform/count_down_latch_unittest.cc index cddfd5a..2cc2054 100644 --- a/chrome/services/sharing/nearby/platform/count_down_latch_unittest.cc +++ b/chrome/services/sharing/nearby/platform/count_down_latch_unittest.cc
@@ -11,7 +11,6 @@ #include "base/containers/flat_map.h" #include "base/run_loop.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/chrome/services/sharing/nearby/platform/mutex_unittest.cc b/chrome/services/sharing/nearby/platform/mutex_unittest.cc index 8de8d40..72d7802 100644 --- a/chrome/services/sharing/nearby/platform/mutex_unittest.cc +++ b/chrome/services/sharing/nearby/platform/mutex_unittest.cc
@@ -8,7 +8,6 @@ #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/chrome/services/sharing/nearby/platform/recursive_mutex_unittest.cc b/chrome/services/sharing/nearby/platform/recursive_mutex_unittest.cc index 01c8b7af..0076bb6 100644 --- a/chrome/services/sharing/nearby/platform/recursive_mutex_unittest.cc +++ b/chrome/services/sharing/nearby/platform/recursive_mutex_unittest.cc
@@ -8,7 +8,6 @@ #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/chrome/services/sharing/nearby/platform/scheduled_executor.h b/chrome/services/sharing/nearby/platform/scheduled_executor.h index 76941a2..9ef9d50 100644 --- a/chrome/services/sharing/nearby/platform/scheduled_executor.h +++ b/chrome/services/sharing/nearby/platform/scheduled_executor.h
@@ -11,7 +11,6 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/thread_annotations.h" #include "base/timer/timer.h" #include "base/unguessable_token.h"
diff --git a/chrome/services/sharing/nearby/platform/submittable_executor.cc b/chrome/services/sharing/nearby/platform/submittable_executor.cc index 71c8442..22eb91d 100644 --- a/chrome/services/sharing/nearby/platform/submittable_executor.cc +++ b/chrome/services/sharing/nearby/platform/submittable_executor.cc
@@ -5,7 +5,6 @@ #include "chrome/services/sharing/nearby/platform/submittable_executor.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/scoped_blocking_call.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/services/sharing/nearby/platform/webrtc.h b/chrome/services/sharing/nearby/platform/webrtc.h index 8ddbf50..a9297c0 100644 --- a/chrome/services/sharing/nearby/platform/webrtc.h +++ b/chrome/services/sharing/nearby/platform/webrtc.h
@@ -15,6 +15,7 @@ #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/shared_remote.h" #include "services/network/public/mojom/mdns_responder.mojom.h" #include "services/network/public/mojom/p2p.mojom.h"
diff --git a/chrome/services/speech/speech_recognition_recognizer_impl.h b/chrome/services/speech/speech_recognition_recognizer_impl.h index c3eea81..de74faa 100644 --- a/chrome/services/speech/speech_recognition_recognizer_impl.h +++ b/chrome/services/speech/speech_recognition_recognizer_impl.h
@@ -9,6 +9,7 @@ #include <string> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/soda/constants.h" #include "media/mojo/mojom/speech_recognition_service.mojom.h" #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 1c35721..244ed3f 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -4387,6 +4387,16 @@ "../browser/apps/platform_apps/platform_app_navigation_redirector_browsertest.cc", "../browser/apps/platform_apps/service_worker_browsertest.cc", "../browser/ui/startup/startup_browser_creator_browsertest.cc", + "../browser/ui/views/web_apps/deprecated_apps_dialog_view_browsertest.cc", + "../browser/ui/views/web_apps/force_installed_deprecated_apps_dialog_view_browsertest.cc", + "../browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_browsertest.cc", + "../browser/ui/views/web_apps/frame_toolbar/web_app_minimal_ui_test.cc", + "../browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc", + "../browser/ui/views/web_apps/web_app_confirmation_view_browsertest.cc", + "../browser/ui/views/web_apps/web_app_identity_update_confirmation_view_browsertest.cc", + "../browser/ui/views/web_apps/web_app_integration_browsertest.cc", + "../browser/ui/views/web_apps/web_app_protocol_handler_intent_picker_dialog_browsertest.cc", + "../browser/ui/views/web_apps/web_app_tab_strip_browsertest.cc", ] # Exclude tests which depend on native messaging. @@ -6980,8 +6990,6 @@ sources += [ "../browser/apps/app_discovery_service/app_discovery_service_unittest.cc", "../browser/apps/app_discovery_service/recommended_arc_app_fetcher_unittest.cc", - "../browser/apps/app_discovery_service/remote_url_search/remote_url_client_unittest.cc", - "../browser/apps/app_discovery_service/remote_url_search/remote_url_index_unittest.cc", "../browser/apps/app_service/file_utils_unittest.cc", "../browser/apps/app_service/intent_util_unittest.cc", "../browser/apps/app_service/metrics/app_platform_metrics_service_unittest.cc",
diff --git a/chrome/test/chromedriver/capabilities.h b/chrome/test/chromedriver/capabilities.h index 58922fbc..d0d6b8a74 100644 --- a/chrome/test/chromedriver/capabilities.h +++ b/chrome/test/chromedriver/capabilities.h
@@ -15,6 +15,7 @@ #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/test/chromedriver/chrome/device_metrics.h" #include "chrome/test/chromedriver/chrome/devtools_http_client.h"
diff --git a/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc b/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc index 0d26439..87b3661 100644 --- a/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc +++ b/chrome/test/chromedriver/chrome/devtools_client_impl_unittest.cc
@@ -14,6 +14,7 @@ #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/test/chromedriver/chrome/devtools_event_listener.h" #include "chrome/test/chromedriver/chrome/status.h"
diff --git a/chrome/test/chromedriver/net/net_util.cc b/chrome/test/chromedriver/net/net_util.cc index 9687baa..c8369ef 100644 --- a/chrome/test/chromedriver/net/net_util.cc +++ b/chrome/test/chromedriver/net/net_util.cc
@@ -13,7 +13,6 @@ #include "base/memory/raw_ptr.h" #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
diff --git a/chrome/test/chromedriver/net/net_util_unittest.cc b/chrome/test/chromedriver/net/net_util_unittest.cc index 3eba6d8..39689c7d 100644 --- a/chrome/test/chromedriver/net/net_util_unittest.cc +++ b/chrome/test/chromedriver/net/net_util_unittest.cc
@@ -19,6 +19,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chrome/test/chromedriver/net/url_request_context_getter.h" #include "mojo/core/embedder/embedder.h" #include "net/base/ip_endpoint.h"
diff --git a/chrome/test/chromedriver/net/test_http_server.h b/chrome/test/chromedriver/net/test_http_server.h index bc820553..d7ad228 100644 --- a/chrome/test/chromedriver/net/test_http_server.h +++ b/chrome/test/chromedriver/net/test_http_server.h
@@ -11,6 +11,7 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/server/http_server.h" #include "url/gurl.h"
diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc index 97cb31c..9ba28cfd 100644 --- a/chrome/test/chromedriver/session_commands.cc +++ b/chrome/test/chromedriver/session_commands.cc
@@ -19,6 +19,7 @@ #include "base/synchronization/waitable_event.h" #include "base/system/sys_info.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/values.h" #include "chrome/test/chromedriver/basic_types.h" #include "chrome/test/chromedriver/capabilities.h"
diff --git a/chrome/test/chromedriver/session_thread_map.h b/chrome/test/chromedriver/session_thread_map.h index 972b069d..96b0e35 100644 --- a/chrome/test/chromedriver/session_thread_map.h +++ b/chrome/test/chromedriver/session_thread_map.h
@@ -10,6 +10,7 @@ #include <string> #include "base/threading/thread.h" +#include "base/time/time.h" // Info related to session threads, one instance per session. This object should // only be accessed on the main thread.
diff --git a/chrome/test/data/webui/chromeos/os_feedback_ui/BUILD.gn b/chrome/test/data/webui/chromeos/os_feedback_ui/BUILD.gn index 52b8c16..507470ed 100644 --- a/chrome/test/data/webui/chromeos/os_feedback_ui/BUILD.gn +++ b/chrome/test/data/webui/chromeos/os_feedback_ui/BUILD.gn
@@ -82,6 +82,7 @@ deps = [ "../..:chai_assert", "../..:test_util", + "//ash/webui/os_feedback_ui/resources:feedback_flow", "//ash/webui/os_feedback_ui/resources:help_content", "//ash/webui/os_feedback_ui/resources:search_page", ]
diff --git a/chrome/test/data/webui/chromeos/os_feedback_ui/feedback_flow_test.js b/chrome/test/data/webui/chromeos/os_feedback_ui/feedback_flow_test.js index 58e3cfab..02fd24a18 100644 --- a/chrome/test/data/webui/chromeos/os_feedback_ui/feedback_flow_test.js +++ b/chrome/test/data/webui/chromeos/os_feedback_ui/feedback_flow_test.js
@@ -114,4 +114,34 @@ assertTrue(!!buttonNewReport); assertEquals('Send new report', buttonNewReport.textContent.trim()); }); + + // Test the navigation from search page to share data page. + test('NavigateFromSearchPageToShareDataPage', async () => { + await initializePage(); + + let activePage = page.shadowRoot.querySelector('.iron-selected'); + assertTrue(!!activePage); + assertEquals('searchPage', activePage.id); + + const inputElement = activePage.shadowRoot.querySelector('textarea'); + const continueButton = + activePage.shadowRoot.querySelector('#buttonContinue'); + + // Clear the description. + inputElement.value = ''; + continueButton.click(); + await flushTasks(); + // Should stay on search page when click the continue button. + activePage = page.shadowRoot.querySelector('.iron-selected'); + assertEquals('searchPage', activePage.id); + + // Enter some text. + inputElement.value = 'abc'; + continueButton.click(); + + await flushTasks(); + // Should move to share data page when click the continue button. + activePage = page.shadowRoot.querySelector('.iron-selected'); + assertEquals('shareDataPage', activePage.id); + }); }
diff --git a/chrome/test/data/webui/chromeos/os_feedback_ui/search_page_test.js b/chrome/test/data/webui/chromeos/os_feedback_ui/search_page_test.js index 123edd6cdb..66d28bf5 100644 --- a/chrome/test/data/webui/chromeos/os_feedback_ui/search_page_test.js +++ b/chrome/test/data/webui/chromeos/os_feedback_ui/search_page_test.js
@@ -4,7 +4,7 @@ import {fakeSearchResponse} from 'chrome://os-feedback/fake_data.js'; import {FakeHelpContentProvider} from 'chrome://os-feedback/fake_help_content_provider.js'; -import {HelpContentElement} from 'chrome://os-feedback/help_content.js'; +import {FeedbackFlowState} from 'chrome://os-feedback/feedback_flow.js'; import {setHelpContentProviderForTesting} from 'chrome://os-feedback/mojo_interface_provider.js'; import {OS_FEEDBACK_UNTRUSTED_ORIGIN, SearchPageElement} from 'chrome://os-feedback/search_page.js'; @@ -189,4 +189,29 @@ assertTrue(errorMsg.hidden); }); + + /** + * Test that when there are certain text entered and the continue button is + * clicked, an on-continue is fired. + */ + test('Continue', async () => { + await initializePage(); + + const textInput = page.shadowRoot.querySelector('#descriptionText'); + textInput.value = 'hello'; + + const clickPromise = eventToPromise('continue-click', page); + let actualCurrentState; + + page.addEventListener('continue-click', (event) => { + actualCurrentState = event.detail.currentState; + }); + + const buttonContinue = page.shadowRoot.querySelector('#buttonContinue'); + buttonContinue.click(); + + await clickPromise; + assertTrue(!!actualCurrentState); + assertEquals(FeedbackFlowState.SEARCH, actualCurrentState); + }); }
diff --git a/chrome/test/data/webui/chromeos/os_feedback_ui/share_data_page_test.js b/chrome/test/data/webui/chromeos/os_feedback_ui/share_data_page_test.js index 263bf3d..747d0ce9 100644 --- a/chrome/test/data/webui/chromeos/os_feedback_ui/share_data_page_test.js +++ b/chrome/test/data/webui/chromeos/os_feedback_ui/share_data_page_test.js
@@ -40,11 +40,11 @@ // Verify the back button is in the page. const buttonBack = page.shadowRoot.querySelector('#buttonBack'); assertTrue(!!buttonBack); - assertEquals('Back', buttonBack.textContent); + assertEquals('Back', buttonBack.textContent.trim()); // Verify the send button is in the page. const buttonSend = page.shadowRoot.querySelector('#buttonSend'); assertTrue(!!buttonSend); - assertEquals('Send', buttonSend.textContent); + assertEquals('Send', buttonSend.textContent.trim()); }); }
diff --git a/chrome/updater/app/server/mac/server.mm b/chrome/updater/app/server/mac/server.mm index 7f64b9b5..5bd5676e 100644 --- a/chrome/updater/app/server/mac/server.mm +++ b/chrome/updater/app/server/mac/server.mm
@@ -14,7 +14,6 @@ #include "base/mac/foundation_util.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h" #include "chrome/updater/app/app.h"
diff --git a/chrome/updater/check_for_updates_task.cc b/chrome/updater/check_for_updates_task.cc index 750e46f..8dee326 100644 --- a/chrome/updater/check_for_updates_task.cc +++ b/chrome/updater/check_for_updates_task.cc
@@ -11,7 +11,6 @@ #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h" #include "chrome/updater/configurator.h"
diff --git a/chrome/updater/installer.cc b/chrome/updater/installer.cc index 559c31a..335820a 100644 --- a/chrome/updater/installer.cc +++ b/chrome/updater/installer.cc
@@ -14,7 +14,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/values.h"
diff --git a/chrome/updater/mac/privileged_helper/server.mm b/chrome/updater/mac/privileged_helper/server.mm index 61b52214..41464b2 100644 --- a/chrome/updater/mac/privileged_helper/server.mm +++ b/chrome/updater/mac/privileged_helper/server.mm
@@ -9,7 +9,6 @@ #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h" #include "chrome/updater/updater_branding.h"
diff --git a/chrome/updater/mac/privileged_helper/service.mm b/chrome/updater/mac/privileged_helper/service.mm index 030995e..27da18a 100644 --- a/chrome/updater/mac/privileged_helper/service.mm +++ b/chrome/updater/mac/privileged_helper/service.mm
@@ -20,7 +20,6 @@ #include "base/process/launch.h" #include "base/strings/strcat.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/chrome/updater/remove_uninstalled_apps_task.cc b/chrome/updater/remove_uninstalled_apps_task.cc index a05f4bf..0a23ed8 100644 --- a/chrome/updater/remove_uninstalled_apps_task.cc +++ b/chrome/updater/remove_uninstalled_apps_task.cc
@@ -15,7 +15,6 @@ #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/version.h"
diff --git a/chrome/updater/test/integration_tests_impl.cc b/chrome/updater/test/integration_tests_impl.cc index 8786da1..22174d4 100644 --- a/chrome/updater/test/integration_tests_impl.cc +++ b/chrome/updater/test/integration_tests_impl.cc
@@ -30,7 +30,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner_thread_mode.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/updater/update_service_impl.cc b/chrome/updater/update_service_impl.cc index 35fb9e8..f661e4b 100644 --- a/chrome/updater/update_service_impl.cc +++ b/chrome/updater/update_service_impl.cc
@@ -20,7 +20,6 @@ #include "base/logging.h" #include "base/run_loop.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/updater/win/action_handler.cc b/chrome/updater/win/action_handler.cc index 70a90c4..879969c 100644 --- a/chrome/updater/win/action_handler.cc +++ b/chrome/updater/win/action_handler.cc
@@ -14,7 +14,6 @@ #include "base/memory/ref_counted.h" #include "base/process/launch.h" #include "base/process/process.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/updater/win/app_install_controller.cc b/chrome/updater/win/app_install_controller.cc index 4535dbb..5dda34c 100644 --- a/chrome/updater/win/app_install_controller.cc +++ b/chrome/updater/win/app_install_controller.cc
@@ -17,7 +17,6 @@ #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h"
diff --git a/chrome/utility/image_writer/disk_unmounter_mac.h b/chrome/utility/image_writer/disk_unmounter_mac.h index 0a90985..87bbe08e 100644 --- a/chrome/utility/image_writer/disk_unmounter_mac.h +++ b/chrome/utility/image_writer/disk_unmounter_mac.h
@@ -16,6 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" namespace image_writer {
diff --git a/chrome/utility/importer/bookmark_html_reader_unittest.cc b/chrome/utility/importer/bookmark_html_reader_unittest.cc index 57087e1..ebf3d224 100644 --- a/chrome/utility/importer/bookmark_html_reader_unittest.cc +++ b/chrome/utility/importer/bookmark_html_reader_unittest.cc
@@ -15,6 +15,7 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/importer/imported_bookmark_entry.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc index f1ff21b..f9ecc35 100644 --- a/chrome/utility/importer/firefox_importer.cc +++ b/chrome/utility/importer/firefox_importer.cc
@@ -12,6 +12,7 @@ #include "base/json/json_file_value_serializer.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chrome/common/importer/firefox_importer_utils.h" #include "chrome/common/importer/imported_bookmark_entry.h"
diff --git a/chrome/utility/importer/profile_import_impl.h b/chrome/utility/importer/profile_import_impl.h index 9e29cd2..636cced 100644 --- a/chrome/utility/importer/profile_import_impl.h +++ b/chrome/utility/importer/profile_import_impl.h
@@ -11,6 +11,7 @@ #include <string> #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "chrome/common/importer/profile_import.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chrome/utility/safe_browsing/mac/dmg_analyzer.cc b/chrome/utility/safe_browsing/mac/dmg_analyzer.cc index 788f8e4..1904d04 100644 --- a/chrome/utility/safe_browsing/mac/dmg_analyzer.cc +++ b/chrome/utility/safe_browsing/mac/dmg_analyzer.cc
@@ -10,6 +10,7 @@ #include <memory> #include <vector> +#include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" @@ -140,8 +141,12 @@ base::Time start_time = base::Time::Now(); results->success = false; - if (!iterator->Open()) + bool opened_iterator = iterator->Open(); + base::UmaHistogramBoolean("SBClientDownload.DmgIterationSuccess", + opened_iterator); + if (!opened_iterator) { return; + } MachOFeatureExtractor feature_extractor; @@ -199,6 +204,8 @@ } } + base::UmaHistogramBoolean("SBClientDownload.DmgAnalysisTimedOut", timeout); + if (!timeout) results->success = true; }
diff --git a/chrome/utility/safe_browsing/mac/dmg_iterator.cc b/chrome/utility/safe_browsing/mac/dmg_iterator.cc index 0e07455..234d5f09 100644 --- a/chrome/utility/safe_browsing/mac/dmg_iterator.cc +++ b/chrome/utility/safe_browsing/mac/dmg_iterator.cc
@@ -6,6 +6,7 @@ #include <memory> +#include "base/metrics/histogram_functions.h" #include "chrome/utility/safe_browsing/mac/hfs.h" #include "chrome/utility/safe_browsing/mac/read_stream.h" @@ -22,17 +23,25 @@ DMGIterator::~DMGIterator() {} bool DMGIterator::Open() { - if (!udif_.Parse()) + bool udif_success = udif_.Parse(); + base::UmaHistogramBoolean("SBClientDownload.DmgParsedUdif", udif_success); + if (!udif_success) return false; // Collect all the HFS partitions up-front. The data are accessed lazily, so // this is relatively inexpensive. + bool has_apfs = false; for (size_t i = 0; i < udif_.GetNumberOfPartitions(); ++i) { if (udif_.GetPartitionType(i) == "Apple_HFS" || udif_.GetPartitionType(i) == "Apple_HFSX") { partitions_.push_back(udif_.GetPartitionReadStream(i)); } + + if (udif_.GetPartitionType(i) == "Apple_APFS") { + has_apfs = true; + } } + base::UmaHistogramBoolean("SBClientDownload.DmgHasAPFS", has_apfs); return partitions_.size() > 0; }
diff --git a/chromecast/base/alarm_manager.h b/chromecast/base/alarm_manager.h index d55e69d..d64db16 100644 --- a/chromecast/base/alarm_manager.h +++ b/chromecast/base/alarm_manager.h
@@ -13,6 +13,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" namespace base {
diff --git a/chromecast/base/observer_unittest.cc b/chromecast/base/observer_unittest.cc index b92dc21..6003bce 100644 --- a/chromecast/base/observer_unittest.cc +++ b/chromecast/base/observer_unittest.cc
@@ -12,6 +12,7 @@ #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromecast/base/observer.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chromecast/browser/accessibility/touch_exploration_controller.h b/chromecast/browser/accessibility/touch_exploration_controller.h index f0d48f92..06101c3 100644 --- a/chromecast/browser/accessibility/touch_exploration_controller.h +++ b/chromecast/browser/accessibility/touch_exploration_controller.h
@@ -13,6 +13,7 @@ #include <vector> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromecast/browser/accessibility/accessibility_sound_player.h" #include "ui/accessibility/ax_enums.mojom.h"
diff --git a/chromecast/browser/audio_socket_broker_unittest.cc b/chromecast/browser/audio_socket_broker_unittest.cc index 20a10b0..b1797e0 100644 --- a/chromecast/browser/audio_socket_broker_unittest.cc +++ b/chromecast/browser/audio_socket_broker_unittest.cc
@@ -20,6 +20,7 @@ #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromecast/net/socket_util.h" #include "content/public/test/test_content_client_initializer.h" #include "content/public/test/test_renderer_host.h"
diff --git a/chromecast/browser/cast_content_browser_client.h b/chromecast/browser/cast_content_browser_client.h index ab33ec9..e3a83b0 100644 --- a/chromecast/browser/cast_content_browser_client.h +++ b/chromecast/browser/cast_content_browser_client.h
@@ -12,6 +12,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/buildflag.h" #include "chromecast/chromecast_buildflags.h"
diff --git a/chromecast/browser/cast_network_contexts.cc b/chromecast/browser/cast_network_contexts.cc index f0e3b71..76bc09d 100644 --- a/chromecast/browser/cast_network_contexts.cc +++ b/chromecast/browser/cast_network_contexts.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/values.h" #include "chromecast/base/cast_features.h"
diff --git a/chromecast/browser/service_connector.cc b/chromecast/browser/service_connector.cc index 140cbed..f2df6d644 100644 --- a/chromecast/browser/service_connector.cc +++ b/chromecast/browser/service_connector.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "chromecast/browser/system_connector.h" #include "chromecast/common/mojom/constants.mojom.h" #include "chromecast/common/mojom/multiroom.mojom.h"
diff --git a/chromecast/browser/service_manager_context.cc b/chromecast/browser/service_manager_context.cc index 5d69fbb..07b5228 100644 --- a/chromecast/browser/service_manager_context.cc +++ b/chromecast/browser/service_manager_context.cc
@@ -20,7 +20,6 @@ #include "base/process/process_handle.h" #include "base/strings/utf_string_conversions.h" #include "base/task/deferred_sequenced_task_runner.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "chromecast/browser/cast_content_browser_client.h"
diff --git a/chromecast/cast_core/grpc/grpc_server.cc b/chromecast/cast_core/grpc/grpc_server.cc index 9bcc73bb..7a42769 100644 --- a/chromecast/cast_core/grpc/grpc_server.cc +++ b/chromecast/cast_core/grpc/grpc_server.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/callback.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chromecast/cast_core/grpc/grpc_unary_test.cc b/chromecast/cast_core/grpc/grpc_unary_test.cc index 652e180..a412622e01 100644 --- a/chromecast/cast_core/grpc/grpc_unary_test.cc +++ b/chromecast/cast_core/grpc/grpc_unary_test.cc
@@ -8,7 +8,6 @@ #include "base/strings/strcat.h" #include "base/synchronization/waitable_event.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/chromecast/cast_core/runtime/browser/runtime_application_dispatcher.h b/chromecast/cast_core/runtime/browser/runtime_application_dispatcher.h index 7b783686..8b61a0a 100644 --- a/chromecast/cast_core/runtime/browser/runtime_application_dispatcher.h +++ b/chromecast/cast_core/runtime/browser/runtime_application_dispatcher.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromecast/cast_core/grpc/grpc_server.h" #include "chromecast/cast_core/runtime/browser/cast_runtime_action_recorder.h"
diff --git a/chromecast/crash/linux/dump_info_unittest.cc b/chromecast/crash/linux/dump_info_unittest.cc index 779ec02..d19f45cc 100644 --- a/chromecast/crash/linux/dump_info_unittest.cc +++ b/chromecast/crash/linux/dump_info_unittest.cc
@@ -4,6 +4,7 @@ #include <time.h> +#include "base/time/time.h" #include "base/values.h" #include "chromecast/crash/linux/crash_testing_utils.h" #include "chromecast/crash/linux/dump_info.h"
diff --git a/chromecast/device/bluetooth/le/gatt_client_manager_impl.cc b/chromecast/device/bluetooth/le/gatt_client_manager_impl.cc index d4194f0..80ba7e0 100644 --- a/chromecast/device/bluetooth/le/gatt_client_manager_impl.cc +++ b/chromecast/device/bluetooth/le/gatt_client_manager_impl.cc
@@ -11,6 +11,7 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "chromecast/base/bind_to_task_runner.h" #include "chromecast/device/bluetooth/bluetooth_util.h" #include "chromecast/device/bluetooth/le/remote_characteristic_impl.h"
diff --git a/chromecast/device/bluetooth/le/le_scan_manager_impl_test.cc b/chromecast/device/bluetooth/le/le_scan_manager_impl_test.cc index e427aaf..5ee4c5af 100644 --- a/chromecast/device/bluetooth/le/le_scan_manager_impl_test.cc +++ b/chromecast/device/bluetooth/le/le_scan_manager_impl_test.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h"
diff --git a/chromecast/device/bluetooth/le/remote_device_impl.cc b/chromecast/device/bluetooth/le/remote_device_impl.cc index 46632327..8e850aad 100644 --- a/chromecast/device/bluetooth/le/remote_device_impl.cc +++ b/chromecast/device/bluetooth/le/remote_device_impl.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/logging.h" +#include "base/time/time.h" #include "chromecast/base/bind_to_task_runner.h" #include "chromecast/device/bluetooth/bluetooth_util.h" #include "chromecast/device/bluetooth/le/gatt_client_manager_impl.h"
diff --git a/chromecast/external_mojo/broker_service/broker_service.h b/chromecast/external_mojo/broker_service/broker_service.h index 05ae42d0..b0306d40 100644 --- a/chromecast/external_mojo/broker_service/broker_service.h +++ b/chromecast/external_mojo/broker_service/broker_service.h
@@ -10,6 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/threading/sequence_bound.h" +#include "base/time/time.h" #include "chromecast/external_mojo/public/mojom/connector.mojom.h" #include "chromecast/mojo/interface_bundle.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chromecast/media/audio/audio_io_thread.h b/chromecast/media/audio/audio_io_thread.h index c09262a..5112afd2 100644 --- a/chromecast/media/audio/audio_io_thread.h +++ b/chromecast/media/audio/audio_io_thread.h
@@ -7,6 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/threading/thread.h" +#include "base/time/time.h" namespace base { class SequencedTaskRunner;
diff --git a/chromecast/media/audio/capture_service/capture_service_receiver_unittest.cc b/chromecast/media/audio/capture_service/capture_service_receiver_unittest.cc index 044d3a4..9bca8e0b 100644 --- a/chromecast/media/audio/capture_service/capture_service_receiver_unittest.cc +++ b/chromecast/media/audio/capture_service/capture_service_receiver_unittest.cc
@@ -10,7 +10,6 @@ #include "base/big_endian.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h" #include "chromecast/media/audio/capture_service/message_parsing_utils.h"
diff --git a/chromecast/media/audio/cast_audio_manager_alsa_unittest.cc b/chromecast/media/audio/cast_audio_manager_alsa_unittest.cc index ce162da..9f8be416 100644 --- a/chromecast/media/audio/cast_audio_manager_alsa_unittest.cc +++ b/chromecast/media/audio/cast_audio_manager_alsa_unittest.cc
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/test/test_message_loop.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "chromecast/common/mojom/service_connector.mojom.h" #include "chromecast/external_mojo/external_service_support/fake_external_connector.h" #include "chromecast/media/audio/mock_cast_audio_manager_helper_delegate.h"
diff --git a/chromecast/media/audio/cast_audio_manager_unittest.cc b/chromecast/media/audio/cast_audio_manager_unittest.cc index 010c119..7183659a 100644 --- a/chromecast/media/audio/cast_audio_manager_unittest.cc +++ b/chromecast/media/audio/cast_audio_manager_unittest.cc
@@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "build/build_config.h" #include "chromecast/chromecast_buildflags.h" #include "chromecast/common/mojom/constants.mojom.h"
diff --git a/chromecast/media/audio/cast_audio_output_stream.cc b/chromecast/media/audio/cast_audio_output_stream.cc index 6053a51..efb0e27c 100644 --- a/chromecast/media/audio/cast_audio_output_stream.cc +++ b/chromecast/media/audio/cast_audio_output_stream.cc
@@ -18,6 +18,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/bind_post_task.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "chromecast/base/bind_to_task_runner.h" #include "chromecast/base/metrics/cast_metrics_helper.h" #include "chromecast/common/mojom/constants.mojom.h"
diff --git a/chromecast/media/audio/net/audio_socket_service_uds_unittest.cc b/chromecast/media/audio/net/audio_socket_service_uds_unittest.cc index a1860c0..a5701d6 100644 --- a/chromecast/media/audio/net/audio_socket_service_uds_unittest.cc +++ b/chromecast/media/audio/net/audio_socket_service_uds_unittest.cc
@@ -16,6 +16,7 @@ #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromecast/net/socket_util.h" #include "net/base/net_errors.h" #include "net/socket/stream_socket.h"
diff --git a/chromecast/media/audio/playback_rate_shifter.cc b/chromecast/media/audio/playback_rate_shifter.cc index cff5b94..8e4c2ef2 100644 --- a/chromecast/media/audio/playback_rate_shifter.cc +++ b/chromecast/media/audio/playback_rate_shifter.cc
@@ -9,6 +9,7 @@ #include <utility> #include "base/check.h" +#include "base/time/time.h" #include "media/base/audio_buffer.h" #include "media/base/audio_bus.h" #include "media/base/audio_parameters.h"
diff --git a/chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.h b/chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.h index e8831c4..ec70d591 100644 --- a/chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.h +++ b/chromecast/media/cma/backend/android/audio_sink_android_audiotrack_impl.h
@@ -15,6 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromecast/media/cma/backend/android/audio_sink_android.h" #include "chromecast/media/cma/backend/android/media_pipeline_backend_android.h"
diff --git a/chromecast/media/cma/backend/android/volume_control_android.h b/chromecast/media/cma/backend/android/volume_control_android.h index 252a5d8..233bd0ee 100644 --- a/chromecast/media/cma/backend/android/volume_control_android.h +++ b/chromecast/media/cma/backend/android/volume_control_android.h
@@ -12,6 +12,7 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromecast/media/cma/backend/android/audio_sink_manager.h" #include "chromecast/media/cma/backend/android/volume_cache.h"
diff --git a/chromecast/media/cma/backend/cast_audio_json.cc b/chromecast/media/cma/backend/cast_audio_json.cc index 5ca5f4b8..d74714f6 100644 --- a/chromecast/media/cma/backend/cast_audio_json.cc +++ b/chromecast/media/cma/backend/cast_audio_json.cc
@@ -12,7 +12,6 @@ #include "base/json/json_reader.h" #include "base/location.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/chromecast/media/cma/backend/desktop/media_pipeline_backend_desktop.cc b/chromecast/media/cma/backend/desktop/media_pipeline_backend_desktop.cc index 8da7527..949c18f 100644 --- a/chromecast/media/cma/backend/desktop/media_pipeline_backend_desktop.cc +++ b/chromecast/media/cma/backend/desktop/media_pipeline_backend_desktop.cc
@@ -5,6 +5,7 @@ #include "chromecast/media/cma/backend/desktop/media_pipeline_backend_desktop.h" #include "base/check_op.h" +#include "base/time/time.h" #include "chromecast/media/cma/backend/desktop/audio_decoder_desktop.h" #include "chromecast/media/cma/backend/desktop/video_decoder_desktop.h" #include "media/base/timestamp_constants.h"
diff --git a/chromecast/media/cma/backend/desktop/media_sink_desktop.h b/chromecast/media/cma/backend/desktop/media_sink_desktop.h index cade97b..c765168d 100644 --- a/chromecast/media/cma/backend/desktop/media_sink_desktop.h +++ b/chromecast/media/cma/backend/desktop/media_sink_desktop.h
@@ -7,6 +7,7 @@ #include "base/cancelable_callback.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "chromecast/public/media/media_pipeline_backend.h" #include "media/base/time_delta_interpolator.h"
diff --git a/chromecast/media/cma/backend/desktop/volume_control_desktop.cc b/chromecast/media/cma/backend/desktop/volume_control_desktop.cc index a94ed58..dc2866a 100644 --- a/chromecast/media/cma/backend/desktop/volume_control_desktop.cc +++ b/chromecast/media/cma/backend/desktop/volume_control_desktop.cc
@@ -19,6 +19,7 @@ #include "base/notreached.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" +#include "base/time/time.h" namespace chromecast { namespace media {
diff --git a/chromecast/media/cma/backend/mixer/stream_mixer_unittest.cc b/chromecast/media/cma/backend/mixer/stream_mixer_unittest.cc index 7ade2c1..a15810b6 100644 --- a/chromecast/media/cma/backend/mixer/stream_mixer_unittest.cc +++ b/chromecast/media/cma/backend/mixer/stream_mixer_unittest.cc
@@ -15,6 +15,7 @@ #include "base/strings/stringprintf.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/values.h" #include "chromecast/media/audio/mixer_service/loopback_connection.h" #include "chromecast/media/audio/mixer_service/mixer_socket.h"
diff --git a/chromecast/media/cma/backend/proxy/media_pipeline_buffer_extension.cc b/chromecast/media/cma/backend/proxy/media_pipeline_buffer_extension.cc index 6e4b009..bd0a5255 100644 --- a/chromecast/media/cma/backend/proxy/media_pipeline_buffer_extension.cc +++ b/chromecast/media/cma/backend/proxy/media_pipeline_buffer_extension.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/callback.h" +#include "base/time/time.h" #include "chromecast/media/api/decoder_buffer_base.h" #include "chromecast/public/media/decoder_config.h" #include "chromecast/public/media/media_pipeline_device_params.h"
diff --git a/chromecast/media/cma/backend/volume_control.cc b/chromecast/media/cma/backend/volume_control.cc index 81fe34b..54631be 100644 --- a/chromecast/media/cma/backend/volume_control.cc +++ b/chromecast/media/cma/backend/volume_control.cc
@@ -27,6 +27,7 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/values.h" #include "chromecast/media/audio/mixer_service/control_connection.h" #include "chromecast/media/cma/backend/audio_buildflags.h"
diff --git a/chromecast/media/cma/pipeline/av_pipeline_impl.h b/chromecast/media/cma/pipeline/av_pipeline_impl.h index 40518b13d..544d33f 100644 --- a/chromecast/media/cma/pipeline/av_pipeline_impl.h +++ b/chromecast/media/cma/pipeline/av_pipeline_impl.h
@@ -16,6 +16,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "chromecast/media/api/cma_backend.h" #include "chromecast/media/cma/pipeline/av_pipeline_client.h" #include "chromecast/media/cma/pipeline/stream_decryptor.h"
diff --git a/chromecast/media/cma/test/frame_segmenter_for_test.cc b/chromecast/media/cma/test/frame_segmenter_for_test.cc index 9860073..a12b88bf 100644 --- a/chromecast/media/cma/test/frame_segmenter_for_test.cc +++ b/chromecast/media/cma/test/frame_segmenter_for_test.cc
@@ -11,6 +11,7 @@ #include "base/logging.h" #include "base/run_loop.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "chromecast/media/cma/base/decoder_buffer_adapter.h" #include "media/base/decoder_buffer.h" #include "media/base/demuxer.h"
diff --git a/chromecast/media/gpu/cast_gpu_factory_impl.cc b/chromecast/media/gpu/cast_gpu_factory_impl.cc index 3b1dc55..9ed2df03 100644 --- a/chromecast/media/gpu/cast_gpu_factory_impl.cc +++ b/chromecast/media/gpu/cast_gpu_factory_impl.cc
@@ -5,7 +5,6 @@ #include "chromecast/media/gpu/cast_gpu_factory_impl.h" #include "base/check.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chromecast/mojo/remote_interfaces.h"
diff --git a/chromecast/media/gpu/cast_gpu_factory_impl.h b/chromecast/media/gpu/cast_gpu_factory_impl.h index 1311af1..89e8a17 100644 --- a/chromecast/media/gpu/cast_gpu_factory_impl.h +++ b/chromecast/media/gpu/cast_gpu_factory_impl.h
@@ -8,6 +8,7 @@ #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromecast/media/gpu/cast_gpu_factory.h" #include "media/mojo/clients/mojo_video_decoder.h" #include "media/mojo/mojom/interface_factory.mojom.h"
diff --git a/chromecast/system/reboot/reboot_fuchsia_test.cc b/chromecast/system/reboot/reboot_fuchsia_test.cc index f7f92cf..c7a24613 100644 --- a/chromecast/system/reboot/reboot_fuchsia_test.cc +++ b/chromecast/system/reboot/reboot_fuchsia_test.cc
@@ -28,6 +28,7 @@ #include "base/test/task_environment.h" #include "base/threading/sequence_bound.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromecast/public/reboot_shlib.h" #include "chromecast/system/reboot/reboot_fuchsia.h" #include "chromecast/system/reboot/reboot_util.h"
diff --git a/chromeos/components/quick_answers/public/cpp/quick_answers_state.h b/chromeos/components/quick_answers/public/cpp/quick_answers_state.h index 1b74634..45eb5a0 100644 --- a/chromeos/components/quick_answers/public/cpp/quick_answers_state.h +++ b/chromeos/components/quick_answers/public/cpp/quick_answers_state.h
@@ -10,6 +10,7 @@ #include "base/observer_list.h" #include "base/observer_list_types.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h"
diff --git a/chromeos/components/quick_answers/quick_answers_client.h b/chromeos/components/quick_answers/quick_answers_client.h index ea1c0bb..ac66fcde 100644 --- a/chromeos/components/quick_answers/quick_answers_client.h +++ b/chromeos/components/quick_answers/quick_answers_client.h
@@ -10,6 +10,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "chromeos/components/quick_answers/result_loader.h" #include "chromeos/components/quick_answers/understanding/intent_generator.h"
diff --git a/chromeos/components/quick_answers/result_loader.h b/chromeos/components/quick_answers/result_loader.h index 899b5e79..71cdf013 100644 --- a/chromeos/components/quick_answers/result_loader.h +++ b/chromeos/components/quick_answers/result_loader.h
@@ -10,6 +10,7 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chromeos/components/quick_answers/quick_answers_model.h" #include "chromeos/components/quick_answers/search_result_parsers/search_response_parser.h"
diff --git a/chromeos/crosapi/DEPS b/chromeos/crosapi/DEPS index 40ec7f3..41e9e98 100644 --- a/chromeos/crosapi/DEPS +++ b/chromeos/crosapi/DEPS
@@ -7,7 +7,7 @@ ] specific_include_rules = { - "app_service_types_traits_unittest\.cc": [ + "app_service_types_mojom_traits_unittest\.cc": [ "+ui/gfx/image/image_unittest_util.h" ] }
diff --git a/chromeos/crosapi/mojom/BUILD.gn b/chromeos/crosapi/mojom/BUILD.gn index 9faacf2..9496d13 100644 --- a/chromeos/crosapi/mojom/BUILD.gn +++ b/chromeos/crosapi/mojom/BUILD.gn
@@ -185,6 +185,11 @@ mojom = "crosapi.mojom.WebAppUninstallResultCode" cpp = "::webapps::UninstallResultCode" }, + { + mojom = "crosapi.mojom.Shortcut" + cpp = "::apps::ShortcutPtr" + move_only = true + }, ] traits_headers = [ "//chromeos/crosapi/mojom/app_service_types_mojom_traits.h", @@ -215,7 +220,7 @@ source_set("unit_tests") { testonly = true sources = [ - "app_service_types_traits_unittest.cc", + "app_service_types_mojom_traits_unittest.cc", "sharesheet_mojom_traits_unittest.cc", ]
diff --git a/chromeos/crosapi/mojom/app_service_types.mojom b/chromeos/crosapi/mojom/app_service_types.mojom index 9879a238..e748694 100644 --- a/chromeos/crosapi/mojom/app_service_types.mojom +++ b/chromeos/crosapi/mojom/app_service_types.mojom
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // -// Next MinVersion: 18 +// Next MinVersion: 19 module crosapi.mojom; @@ -89,6 +89,15 @@ // kTrue if the app is able to handle intents and should be shown in intent // surfaces. OptionalBool handles_intents@26; + + [MinVersion=18] + // Shortcuts help users perform specific actions easily. + // This vector must be treated atomically, if there is a shortcut + // change, the publisher must send through the entire list of shortcuts. + // Should contain no duplicate IDs. + // If empty during updates, Subscriber can assume no changes. + // There is no guarantee that this is sorted by any criteria. + array<Shortcut>? shortcuts@27; }; // The types of apps available in the registry. @@ -458,3 +467,18 @@ IntentFilter intent_filter; string app_id; }; + +// Represents an app shortcut. +[Stable] +struct Shortcut { + // Represents a particular shortcut in an app. Needs to be unique within an + // app as calls will be made using both app_id and shortcut_id. + string shortcut_id@0; + + // Name of the shortcut. + string name@1; + + // "Position" of a shortcut, which is a non-negative, sequential + // value. If position is 0, no position was specified. + uint8 position@2; +};
diff --git a/chromeos/crosapi/mojom/app_service_types_mojom_traits.cc b/chromeos/crosapi/mojom/app_service_types_mojom_traits.cc index b00084c..9a55853 100644 --- a/chromeos/crosapi/mojom/app_service_types_mojom_traits.cc +++ b/chromeos/crosapi/mojom/app_service_types_mojom_traits.cc
@@ -8,6 +8,7 @@ #include <utility> #include "base/strings/string_util.h" +#include "base/time/time.h" namespace { @@ -225,6 +226,10 @@ if (!data.ReadHandlesIntents(&handles_intents)) return false; + apps::Shortcuts shortcuts; + if (!data.ReadShortcuts(&shortcuts)) + return false; + auto app = std::make_unique<apps::App>(app_type, app_id); app->readiness = readiness; app->name = name; @@ -256,6 +261,7 @@ ConvertMojomOptionalBoolToOptionalBool(allow_uninstall); app->handles_intents = ConvertMojomOptionalBoolToOptionalBool(handles_intents); + app->shortcuts = std::move(shortcuts); *out = std::move(app); return true; } @@ -1166,4 +1172,20 @@ return true; } +bool StructTraits<crosapi::mojom::ShortcutDataView, apps::ShortcutPtr>::Read( + crosapi::mojom::ShortcutDataView data, + apps::ShortcutPtr* out) { + std::string shortcut_id; + if (!data.ReadShortcutId(&shortcut_id)) + return false; + + std::string name; + if (!data.ReadName(&name)) + return false; + + *out = std::make_unique<apps::Shortcut>(shortcut_id, name, data.position()); + + return true; +} + } // namespace mojo
diff --git a/chromeos/crosapi/mojom/app_service_types_mojom_traits.h b/chromeos/crosapi/mojom/app_service_types_mojom_traits.h index fa02d8b..cf11b81 100644 --- a/chromeos/crosapi/mojom/app_service_types_mojom_traits.h +++ b/chromeos/crosapi/mojom/app_service_types_mojom_traits.h
@@ -104,6 +104,10 @@ static crosapi::mojom::OptionalBool handles_intents(const apps::AppPtr& r); + static const apps::Shortcuts& shortcuts(const apps::AppPtr& r) { + return r->shortcuts; + } + static bool Read(crosapi::mojom::AppDataView data, apps::AppPtr* out); }; @@ -373,6 +377,20 @@ apps::mojom::PreferredAppChangesPtr* out); }; +template <> +struct StructTraits<crosapi::mojom::ShortcutDataView, apps::ShortcutPtr> { + static const std::string& shortcut_id(const apps::ShortcutPtr& r) { + return r->shortcut_id; + } + + static const std::string& name(const apps::ShortcutPtr& r) { return r->name; } + + static uint8_t position(const apps::ShortcutPtr& r) { return r->position; } + + static bool Read(crosapi::mojom::ShortcutDataView data, + apps::ShortcutPtr* out); +}; + } // namespace mojo #endif // CHROMEOS_CROSAPI_MOJOM_APP_SERVICE_TYPES_MOJOM_TRAITS_H_
diff --git a/chromeos/crosapi/mojom/app_service_types_traits_unittest.cc b/chromeos/crosapi/mojom/app_service_types_mojom_traits_unittest.cc similarity index 92% rename from chromeos/crosapi/mojom/app_service_types_traits_unittest.cc rename to chromeos/crosapi/mojom/app_service_types_mojom_traits_unittest.cc index b845e31..b304d77c 100644 --- a/chromeos/crosapi/mojom/app_service_types_traits_unittest.cc +++ b/chromeos/crosapi/mojom/app_service_types_mojom_traits_unittest.cc
@@ -13,13 +13,14 @@ #include "components/services/app_service/public/cpp/intent_filter.h" #include "components/services/app_service/public/cpp/intent_filter_util.h" #include "components/services/app_service/public/cpp/permission.h" +#include "components/services/app_service/public/cpp/shortcut.h" #include "components/services/app_service/public/mojom/types.mojom.h" #include "mojo/public/cpp/test_support/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/image/image_unittest_util.h" // Test that every field in apps::App in correctly converted. -TEST(AppServiceTypesTraitsTest, RoundTrip) { +TEST(AppServiceTypesMojomTraitsTest, RoundTrip) { auto input = std::make_unique<apps::App>(apps::AppType::kWeb, "abcdefg"); input->readiness = apps::Readiness::kReady; input->name = "lacros test name"; @@ -60,6 +61,9 @@ input->allow_uninstall = true; input->handles_intents = true; + input->shortcuts.push_back( + std::make_unique<apps::Shortcut>("test_id", "test_name", /*position*/ 1)); + apps::AppPtr output; ASSERT_TRUE( mojo::test::SerializeAndDeserialize<crosapi::mojom::App>(input, output)); @@ -114,11 +118,17 @@ EXPECT_TRUE(output->allow_uninstall.value()); EXPECT_TRUE(output->handles_intents.value()); + + ASSERT_EQ(output->shortcuts.size(), 1U); + auto& shortcut = output->shortcuts[0]; + EXPECT_EQ(shortcut->shortcut_id, "test_id"); + EXPECT_EQ(shortcut->name, "test_name"); + EXPECT_EQ(shortcut->position, 1); } // Test that serialization and deserialization works with optional fields that // doesn't fill up. -TEST(AppServiceTypesTraitsTest, RoundTripNoOptional) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripNoOptional) { auto input = std::make_unique<apps::App>(apps::AppType::kWeb, "abcdefg"); input->readiness = apps::Readiness::kReady; input->additional_search_terms = {"1", "2"}; @@ -177,7 +187,7 @@ } // Test that serialization and deserialization works with updating app type. -TEST(AppServiceTypesTraitsTest, RoundTripAppType) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripAppType) { { auto input = std::make_unique<apps::App>(apps::AppType::kUnknown, "abcdefg"); @@ -215,7 +225,7 @@ } // Test that serialization and deserialization works with updating readiness. -TEST(AppServiceTypesTraitsTest, RoundTripReadiness) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripReadiness) { auto input = std::make_unique<apps::App>(apps::AppType::kArc, "abcdefg"); { input->readiness = apps::Readiness::kUnknown; @@ -285,7 +295,7 @@ // Test that serialization and deserialization works with updating install // reason. -TEST(AppServiceTypesTraitsTest, RoundTripInstallReason) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripInstallReason) { auto input = std::make_unique<apps::App>(apps::AppType::kArc, "abcdefg"); { input->install_reason = apps::InstallReason::kUnknown; @@ -340,7 +350,7 @@ // Test that serialization and deserialization works with updating // recommendable. -TEST(AppServiceTypesTraitsTest, RoundTripRecommendable) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripRecommendable) { auto input = std::make_unique<apps::App>(apps::AppType::kArc, "abcdefg"); { input->recommendable = absl::nullopt; @@ -366,7 +376,7 @@ } // Test that serialization and deserialization works with updating searchable. -TEST(AppServiceTypesTraitsTest, RoundTripSearchable) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripSearchable) { auto input = std::make_unique<apps::App>(apps::AppType::kArc, "abcdefg"); { input->searchable = absl::nullopt; @@ -393,7 +403,7 @@ // Test that serialization and deserialization works with updating // show_in_launcher. -TEST(AppServiceTypesTraitsTest, RoundTripShowInLauncher) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripShowInLauncher) { auto input = std::make_unique<apps::App>(apps::AppType::kArc, "abcdefg"); { input->show_in_launcher = absl::nullopt; @@ -420,7 +430,7 @@ // Test that serialization and deserialization works with updating // show_in_shelf. -TEST(AppServiceTypesTraitsTest, RoundTripShowInShelf) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripShowInShelf) { auto input = std::make_unique<apps::App>(apps::AppType::kArc, "abcdefg"); { input->show_in_shelf = absl::nullopt; @@ -447,7 +457,7 @@ // Test that serialization and deserialization works with updating // show_in_search. -TEST(AppServiceTypesTraitsTest, RoundTripShowInSearch) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripShowInSearch) { auto input = std::make_unique<apps::App>(apps::AppType::kArc, "abcdefg"); { input->show_in_search = absl::nullopt; @@ -474,7 +484,7 @@ // Test that serialization and deserialization works with updating // show_in_management. -TEST(AppServiceTypesTraitsTest, RoundTripShowInManagement) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripShowInManagement) { auto input = std::make_unique<apps::App>(apps::AppType::kArc, "abcdefg"); { input->show_in_management = absl::nullopt; @@ -500,7 +510,7 @@ } // Test that serialization and deserialization works with updating has_badge. -TEST(AppServiceTypesTraitsTest, RoundTripHasBadge) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripHasBadge) { auto input = std::make_unique<apps::App>(apps::AppType::kArc, "abcdefg"); { input->has_badge = absl::nullopt; @@ -526,7 +536,7 @@ } // Test that serialization and deserialization works with updating paused. -TEST(AppServiceTypesTraitsTest, RoundTripPaused) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripPaused) { auto input = std::make_unique<apps::App>(apps::AppType::kArc, "abcdefg"); { input->paused = absl::nullopt; @@ -553,7 +563,7 @@ // Test that serialization and deserialization works with updating // intent_filters. -TEST(AppServiceTypesTraitsTest, RoundTripIntentFilters) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripIntentFilters) { auto input = std::make_unique<apps::App>(apps::AppType::kArc, "abcdefg"); auto intent_filter = std::make_unique<apps::IntentFilter>(); intent_filter->AddSingleValueCondition(apps::ConditionType::kScheme, "1", @@ -648,7 +658,7 @@ } // Test that serialization and deserialization works with uninstall source. -TEST(AppServiceTypesTraitsTest, RoundTripUninstallSource) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripUninstallSource) { apps::mojom::UninstallSource input; { input = apps::mojom::UninstallSource::kUnknown; @@ -693,7 +703,7 @@ } // Test that serialization and deserialization works with icon type. -TEST(AppServiceTypesTraitsTest, RoundTripIconType) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripIconType) { apps::IconType input; { input = apps::IconType::kUnknown; @@ -726,7 +736,7 @@ } // Test that serialization and deserialization works with icon value. -TEST(AppServiceTypesTraitsTest, RoundTripIconValue) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripIconValue) { { auto input = std::make_unique<apps::IconValue>(); input->icon_type = apps::IconType::kUnknown; @@ -791,7 +801,7 @@ } // Test that serialization and deserialization works with window mode. -TEST(AppServiceTypesTraitsTest, RoundTripWindowMode) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripWindowMode) { apps::WindowMode input; { input = apps::WindowMode::kUnknown; @@ -824,7 +834,7 @@ } // Test that serialization and deserialization works with launch source. -TEST(AppServiceTypesTraitsTest, RoundTripLaunchSource) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripLaunchSource) { apps::mojom::LaunchSource input; { input = apps::mojom::LaunchSource::kUnknown; @@ -1012,7 +1022,7 @@ } } -TEST(AppServiceTypesTraitsTest, RoundTripPermissions) { +TEST(AppServiceTypesMojomTraitsTest, RoundTripPermissions) { { auto permission = std::make_unique<apps::Permission>( apps::PermissionType::kUnknown, @@ -1084,3 +1094,43 @@ EXPECT_EQ(*permission, *output); } } + +TEST(AppServiceTypesMojomTraitsTest, RoundTripShortcuts) { + { + auto shortcut = std::make_unique<apps::Shortcut>("test_id", "test_name", + /*position*/ 1); + apps::ShortcutPtr output; + ASSERT_TRUE(mojo::test::SerializeAndDeserialize<crosapi::mojom::Shortcut>( + shortcut, output)); + EXPECT_EQ(*shortcut, *output); + } + { + auto shortcut = std::make_unique<apps::Shortcut>("", "", /*position*/ 0); + apps::ShortcutPtr output; + ASSERT_TRUE(mojo::test::SerializeAndDeserialize<crosapi::mojom::Shortcut>( + shortcut, output)); + EXPECT_EQ(*shortcut, *output); + } + { + auto shortcut = + std::make_unique<apps::Shortcut>("A", "B", /*position*/ 100); + apps::ShortcutPtr output; + ASSERT_TRUE(mojo::test::SerializeAndDeserialize<crosapi::mojom::Shortcut>( + shortcut, output)); + EXPECT_EQ(*shortcut, *output); + } + { + auto shortcut = std::make_unique<apps::Shortcut>("", "B", /*position*/ 1); + apps::ShortcutPtr output; + ASSERT_TRUE(mojo::test::SerializeAndDeserialize<crosapi::mojom::Shortcut>( + shortcut, output)); + EXPECT_EQ(*shortcut, *output); + } + { + auto shortcut = std::make_unique<apps::Shortcut>("A", "", /*position*/ 1); + apps::ShortcutPtr output; + ASSERT_TRUE(mojo::test::SerializeAndDeserialize<crosapi::mojom::Shortcut>( + shortcut, output)); + EXPECT_EQ(*shortcut, *output); + } +}
diff --git a/chromeos/dbus/authpolicy/fake_authpolicy_client.cc b/chromeos/dbus/authpolicy/fake_authpolicy_client.cc index 2abfebf9..d9b1e2c 100644 --- a/chromeos/dbus/authpolicy/fake_authpolicy_client.cc +++ b/chromeos/dbus/authpolicy/fake_authpolicy_client.cc
@@ -14,7 +14,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_task_runner_handle.h" #include "chromeos/dbus/cryptohome/rpc.pb.h"
diff --git a/chromeos/dbus/cros_disks/fake_cros_disks_client.cc b/chromeos/dbus/cros_disks/fake_cros_disks_client.cc index 1fe1a9f..6ff747d 100644 --- a/chromeos/dbus/cros_disks/fake_cros_disks_client.cc +++ b/chromeos/dbus/cros_disks/fake_cros_disks_client.cc
@@ -10,7 +10,6 @@ #include "base/files/file_util.h" #include "base/location.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chromeos/dbus/debug_daemon/debug_daemon_client.cc b/chromeos/dbus/debug_daemon/debug_daemon_client.cc index 962cd72..9cb53e4 100644 --- a/chromeos/dbus/debug_daemon/debug_daemon_client.cc +++ b/chromeos/dbus/debug_daemon/debug_daemon_client.cc
@@ -27,7 +27,6 @@ #include "base/posix/eintr_wrapper.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/trace_config.h"
diff --git a/chromeos/dbus/debug_daemon/debug_daemon_client_provider.cc b/chromeos/dbus/debug_daemon/debug_daemon_client_provider.cc index 069679a..9baaf3f 100644 --- a/chromeos/dbus/debug_daemon/debug_daemon_client_provider.cc +++ b/chromeos/dbus/debug_daemon/debug_daemon_client_provider.cc
@@ -4,7 +4,6 @@ #include "chromeos/dbus/debug_daemon/debug_daemon_client_provider.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chromeos/dbus/debug_daemon/debug_daemon_client.h" #include "dbus/bus.h"
diff --git a/chromeos/dbus/init/dbus_thread_manager_base.h b/chromeos/dbus/init/dbus_thread_manager_base.h index 7819aa2..7653aac 100644 --- a/chromeos/dbus/init/dbus_thread_manager_base.h +++ b/chromeos/dbus/init/dbus_thread_manager_base.h
@@ -9,6 +9,7 @@ #include "base/component_export.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" namespace base { class Thread;
diff --git a/chromeos/dbus/lorgnette_manager/lorgnette_manager_client.cc b/chromeos/dbus/lorgnette_manager/lorgnette_manager_client.cc index c7f5f0fd..049e27e 100644 --- a/chromeos/dbus/lorgnette_manager/lorgnette_manager_client.cc +++ b/chromeos/dbus/lorgnette_manager/lorgnette_manager_client.cc
@@ -17,7 +17,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chromeos/dbus/oobe_config/fake_oobe_configuration_client.cc b/chromeos/dbus/oobe_config/fake_oobe_configuration_client.cc index 7fa6c50f..18c5647 100644 --- a/chromeos/dbus/oobe_config/fake_oobe_configuration_client.cc +++ b/chromeos/dbus/oobe_config/fake_oobe_configuration_client.cc
@@ -11,7 +11,6 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chromeos/dbus/constants/dbus_switches.h"
diff --git a/chromeos/dbus/permission_broker/fake_permission_broker_client.cc b/chromeos/dbus/permission_broker/fake_permission_broker_client.cc index d9b2c50..666f3b1 100644 --- a/chromeos/dbus/permission_broker/fake_permission_broker_client.cc +++ b/chromeos/dbus/permission_broker/fake_permission_broker_client.cc
@@ -14,7 +14,6 @@ #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chromeos/dbus/rmad/rmad_client.cc b/chromeos/dbus/rmad/rmad_client.cc index 79a0a3c..0edd1f0 100644 --- a/chromeos/dbus/rmad/rmad_client.cc +++ b/chromeos/dbus/rmad/rmad_client.cc
@@ -13,7 +13,6 @@ #include "base/logging.h" #include "base/observer_list.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "chromeos/dbus/constants/dbus_paths.h" #include "chromeos/dbus/rmad/fake_rmad_client.h"
diff --git a/chromeos/dbus/session_manager/fake_session_manager_client.cc b/chromeos/dbus/session_manager/fake_session_manager_client.cc index 8a9dcac..9a04086 100644 --- a/chromeos/dbus/session_manager/fake_session_manager_client.cc +++ b/chromeos/dbus/session_manager/fake_session_manager_client.cc
@@ -20,7 +20,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chromeos/dbus/shill/fake_shill_manager_client.h b/chromeos/dbus/shill/fake_shill_manager_client.h index 1a74f1a9..cecac2c 100644 --- a/chromeos/dbus/shill/fake_shill_manager_client.h +++ b/chromeos/dbus/shill/fake_shill_manager_client.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/component_export.h" +#include "base/time/time.h" #include "base/values.h" #include "chromeos/dbus/shill/shill_manager_client.h"
diff --git a/chromeos/dbus/update_engine/fake_update_engine_client.h b/chromeos/dbus/update_engine/fake_update_engine_client.h index fbd8913..e4e9c28 100644 --- a/chromeos/dbus/update_engine/fake_update_engine_client.h +++ b/chromeos/dbus/update_engine/fake_update_engine_client.h
@@ -12,6 +12,7 @@ #include "base/component_export.h" #include "base/containers/queue.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "chromeos/dbus/update_engine/update_engine_client.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chromeos/memory/pressure/system_memory_pressure_evaluator.h b/chromeos/memory/pressure/system_memory_pressure_evaluator.h index e1ed850..4edd6f76 100644 --- a/chromeos/memory/pressure/system_memory_pressure_evaluator.h +++ b/chromeos/memory/pressure/system_memory_pressure_evaluator.h
@@ -7,6 +7,7 @@ #include "base/component_export.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chromeos/dbus/resourced/resourced_client.h" #include "components/memory_pressure/memory_pressure_voter.h" #include "components/memory_pressure/system_memory_pressure_evaluator.h"
diff --git a/chromeos/memory/pressure/system_memory_pressure_evaluator_unittest.cc b/chromeos/memory/pressure/system_memory_pressure_evaluator_unittest.cc index 87081e6c6..a3d75e0 100644 --- a/chromeos/memory/pressure/system_memory_pressure_evaluator_unittest.cc +++ b/chromeos/memory/pressure/system_memory_pressure_evaluator_unittest.cc
@@ -13,7 +13,6 @@ #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h"
diff --git a/chromeos/memory/userspace_swap/swap_storage.cc b/chromeos/memory/userspace_swap/swap_storage.cc index 0a70dc1..6e7f9fa4 100644 --- a/chromeos/memory/userspace_swap/swap_storage.cc +++ b/chromeos/memory/userspace_swap/swap_storage.cc
@@ -24,7 +24,6 @@ #include "base/path_service.h" #include "base/posix/eintr_wrapper.h" #include "base/process/process_metrics.h" -#include "base/task/post_task.h" #include "base/threading/scoped_blocking_call.h" #include "crypto/aead.h" #include "crypto/random.h"
diff --git a/chromeos/memory/userspace_swap/userfaultfd.cc b/chromeos/memory/userspace_swap/userfaultfd.cc index e0db42a0fa..7382075 100644 --- a/chromeos/memory/userspace_swap/userfaultfd.cc +++ b/chromeos/memory/userspace_swap/userfaultfd.cc
@@ -21,7 +21,6 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/posix/eintr_wrapper.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/platform_thread.h"
diff --git a/chromeos/network/cellular_esim_uninstall_handler.h b/chromeos/network/cellular_esim_uninstall_handler.h index de5cf021..3bd4c6a 100644 --- a/chromeos/network/cellular_esim_uninstall_handler.h +++ b/chromeos/network/cellular_esim_uninstall_handler.h
@@ -12,6 +12,7 @@ #include "base/containers/flat_set.h" #include "base/containers/queue.h" #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "chromeos/dbus/hermes/hermes_response_status.h" #include "chromeos/network/cellular_esim_profile_handler.h" #include "chromeos/network/cellular_inhibitor.h"
diff --git a/chromeos/network/cellular_inhibitor.h b/chromeos/network/cellular_inhibitor.h index 06fa8ad8..5bf28bce 100644 --- a/chromeos/network/cellular_inhibitor.h +++ b/chromeos/network/cellular_inhibitor.h
@@ -11,6 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/observer_list_types.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromeos/network/network_handler_callbacks.h" #include "chromeos/network/network_state_handler_observer.h"
diff --git a/chromeos/network/cellular_metrics_logger.cc b/chromeos/network/cellular_metrics_logger.cc index 6618c27..8239ca37 100644 --- a/chromeos/network/cellular_metrics_logger.cc +++ b/chromeos/network/cellular_metrics_logger.cc
@@ -8,7 +8,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/time/tick_clock.h" #include "chromeos/components/feature_usage/feature_usage_metrics.h" #include "chromeos/dbus/hermes/hermes_manager_client.h"
diff --git a/chromeos/network/cellular_metrics_logger.h b/chromeos/network/cellular_metrics_logger.h index 15cda9b4..b96c33a 100644 --- a/chromeos/network/cellular_metrics_logger.h +++ b/chromeos/network/cellular_metrics_logger.h
@@ -8,6 +8,7 @@ #include "base/component_export.h" #include "base/containers/flat_map.h" #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "base/timer/timer.h" #include "chromeos/login/login_state/login_state.h"
diff --git a/chromeos/network/client_cert_resolver.cc b/chromeos/network/client_cert_resolver.cc index 45b0c40..06efe9cf 100644 --- a/chromeos/network/client_cert_resolver.cc +++ b/chromeos/network/client_cert_resolver.cc
@@ -17,7 +17,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/clock.h" #include "base/values.h"
diff --git a/chromeos/network/metrics/esim_policy_login_metrics_logger.cc b/chromeos/network/metrics/esim_policy_login_metrics_logger.cc index a476fea..c424e632 100644 --- a/chromeos/network/metrics/esim_policy_login_metrics_logger.cc +++ b/chromeos/network/metrics/esim_policy_login_metrics_logger.cc
@@ -5,7 +5,6 @@ #include "chromeos/network/metrics/esim_policy_login_metrics_logger.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "chromeos/network/managed_network_configuration_handler.h" #include "chromeos/network/network_event_log.h" #include "chromeos/network/network_state_handler.h"
diff --git a/chromeos/network/metrics/esim_policy_login_metrics_logger.h b/chromeos/network/metrics/esim_policy_login_metrics_logger.h index 7e66fd6..1ea2fd4 100644 --- a/chromeos/network/metrics/esim_policy_login_metrics_logger.h +++ b/chromeos/network/metrics/esim_policy_login_metrics_logger.h
@@ -7,6 +7,7 @@ #include "base/component_export.h" #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromeos/login/login_state/login_state.h" #include "chromeos/network/network_state_handler_observer.h"
diff --git a/chromeos/network/network_cert_loader.cc b/chromeos/network/network_cert_loader.cc index 9da5fec4..92152475b 100644 --- a/chromeos/network/network_cert_loader.cc +++ b/chromeos/network/network_cert_loader.cc
@@ -16,7 +16,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "chromeos/components/onc/certificate_scope.h" #include "chromeos/network/certificate_helper.h" #include "chromeos/network/policy_certificate_provider.h"
diff --git a/chromeos/printing/ppd_cache.cc b/chromeos/printing/ppd_cache.cc index 03ab9ee..0d120e8 100644 --- a/chromeos/printing/ppd_cache.cc +++ b/chromeos/printing/ppd_cache.cc
@@ -14,7 +14,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chromeos/printing/ppd_provider.cc b/chromeos/printing/ppd_provider.cc index 35df3274b..38a047c3 100644 --- a/chromeos/printing/ppd_provider.cc +++ b/chromeos/printing/ppd_provider.cc
@@ -15,7 +15,6 @@ #include "base/memory/scoped_refptr.h" #include "base/notreached.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chromeos/printing/printer_config_cache.cc b/chromeos/printing/printer_config_cache.cc index c8fa2f61..fdca588 100644 --- a/chromeos/printing/printer_config_cache.cc +++ b/chromeos/printing/printer_config_cache.cc
@@ -15,7 +15,6 @@ #include "base/sequence_checker.h" #include "base/strings/strcat.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/clock.h" #include "base/time/time.h"
diff --git a/chromeos/process_proxy/process_output_watcher_unittest.cc b/chromeos/process_proxy/process_output_watcher_unittest.cc index cb6c5f8..2bcab2f 100644 --- a/chromeos/process_proxy/process_output_watcher_unittest.cc +++ b/chromeos/process_proxy/process_output_watcher_unittest.cc
@@ -23,6 +23,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" namespace chromeos {
diff --git a/chromeos/process_proxy/process_proxy_registry.h b/chromeos/process_proxy/process_proxy_registry.h index 1982794..aa645b4 100644 --- a/chromeos/process_proxy/process_proxy_registry.h +++ b/chromeos/process_proxy/process_proxy_registry.h
@@ -17,6 +17,7 @@ #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromeos/process_proxy/process_proxy.h" namespace chromeos {
diff --git a/chromeos/services/assistant/assistant_host.h b/chromeos/services/assistant/assistant_host.h index e05381f..2c33009 100644 --- a/chromeos/services/assistant/assistant_host.h +++ b/chromeos/services/assistant/assistant_host.h
@@ -6,6 +6,7 @@ #define CHROMEOS_SERVICES_ASSISTANT_ASSISTANT_HOST_H_ #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromeos/services/libassistant/public/mojom/audio_input_controller.mojom.h" #include "chromeos/services/libassistant/public/mojom/conversation_controller.mojom.h" #include "chromeos/services/libassistant/public/mojom/display_controller.mojom.h"
diff --git a/chromeos/services/assistant/assistant_manager_service_impl.cc b/chromeos/services/assistant/assistant_manager_service_impl.cc index b65c3fd6..86109bb 100644 --- a/chromeos/services/assistant/assistant_manager_service_impl.cc +++ b/chromeos/services/assistant/assistant_manager_service_impl.cc
@@ -24,7 +24,6 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/unguessable_token.h" #include "chromeos/dbus/util/version_loader.h"
diff --git a/chromeos/services/assistant/assistant_manager_service_impl.h b/chromeos/services/assistant/assistant_manager_service_impl.h index a12c27c..bd08fae5 100644 --- a/chromeos/services/assistant/assistant_manager_service_impl.h +++ b/chromeos/services/assistant/assistant_manager_service_impl.h
@@ -17,6 +17,7 @@ #include "base/scoped_observation.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromeos/services/assistant/assistant_host.h" #include "chromeos/services/assistant/assistant_manager_service.h" #include "chromeos/services/assistant/assistant_settings_impl.h"
diff --git a/chromeos/services/assistant/audio_decoder/assistant_audio_decoder.h b/chromeos/services/assistant/audio_decoder/assistant_audio_decoder.h index b16533c..2c81f24 100644 --- a/chromeos/services/assistant/audio_decoder/assistant_audio_decoder.h +++ b/chromeos/services/assistant/audio_decoder/assistant_audio_decoder.h
@@ -9,6 +9,7 @@ #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromeos/services/assistant/public/mojom/assistant_audio_decoder.mojom.h" #include "media/filters/blocking_url_protocol.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chromeos/services/bluetooth_config/device_operation_handler_impl.h b/chromeos/services/bluetooth_config/device_operation_handler_impl.h index 74e8439..423f2be 100644 --- a/chromeos/services/bluetooth_config/device_operation_handler_impl.h +++ b/chromeos/services/bluetooth_config/device_operation_handler_impl.h
@@ -6,6 +6,7 @@ #define CHROMEOS_SERVICES_BLUETOOTH_CONFIG_DEVICE_OPERATION_HANDLER_IMPL_H_ #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "chromeos/services/bluetooth_config/adapter_state_controller.h" #include "chromeos/services/bluetooth_config/device_name_manager.h" #include "chromeos/services/bluetooth_config/device_operation_handler.h"
diff --git a/chromeos/services/bluetooth_config/discovered_devices_provider_impl.h b/chromeos/services/bluetooth_config/discovered_devices_provider_impl.h index bead84f..3245253 100644 --- a/chromeos/services/bluetooth_config/discovered_devices_provider_impl.h +++ b/chromeos/services/bluetooth_config/discovered_devices_provider_impl.h
@@ -9,6 +9,7 @@ #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromeos/services/bluetooth_config/device_cache.h"
diff --git a/chromeos/services/libassistant/audio/audio_input_impl.cc b/chromeos/services/libassistant/audio/audio_input_impl.cc index b123c23..21b00eab 100644 --- a/chromeos/services/libassistant/audio/audio_input_impl.cc +++ b/chromeos/services/libassistant/audio/audio_input_impl.cc
@@ -14,6 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "chromeos/assistant/internal/libassistant/shared_headers.h" #include "chromeos/services/assistant/public/cpp/assistant_browser_delegate.h"
diff --git a/chromeos/services/libassistant/audio/audio_output_provider_impl_unittest.cc b/chromeos/services/libassistant/audio/audio_output_provider_impl_unittest.cc index bbe19b8..7fb542d 100644 --- a/chromeos/services/libassistant/audio/audio_output_provider_impl_unittest.cc +++ b/chromeos/services/libassistant/audio/audio_output_provider_impl_unittest.cc
@@ -12,6 +12,7 @@ #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromeos/assistant/internal/libassistant/shared_headers.h" #include "media/base/audio_bus.h" #include "media/base/bind_to_current_loop.h"
diff --git a/chromeos/services/libassistant/chromium_http_connection.cc b/chromeos/services/libassistant/chromium_http_connection.cc index 9cd68aa..6b2e46eb 100644 --- a/chromeos/services/libassistant/chromium_http_connection.cc +++ b/chromeos/services/libassistant/chromium_http_connection.cc
@@ -11,7 +11,6 @@ #include <utility> #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "net/base/load_flags.h"
diff --git a/chromeos/services/libassistant/grpc/grpc_client_thread.h b/chromeos/services/libassistant/grpc/grpc_client_thread.h index 53c4d5b..2f7b4469 100644 --- a/chromeos/services/libassistant/grpc/grpc_client_thread.h +++ b/chromeos/services/libassistant/grpc/grpc_client_thread.h
@@ -11,6 +11,7 @@ #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "third_party/grpc/src/include/grpcpp/completion_queue.h" namespace chromeos {
diff --git a/chromeos/services/libassistant/grpc/services_initializer_base.h b/chromeos/services/libassistant/grpc/services_initializer_base.h index 3b47e96..38503e0 100644 --- a/chromeos/services/libassistant/grpc/services_initializer_base.h +++ b/chromeos/services/libassistant/grpc/services_initializer_base.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/threading/thread.h" +#include "base/time/time.h" #include "chromeos/services/libassistant/grpc/async_service_driver.h" #include "third_party/grpc/src/include/grpcpp/completion_queue.h" #include "third_party/grpc/src/include/grpcpp/server_builder.h"
diff --git a/chromeos/services/tts/tts_player.h b/chromeos/services/tts/tts_player.h index 64fcbca4..20a8d797 100644 --- a/chromeos/services/tts/tts_player.h +++ b/chromeos/services/tts/tts_player.h
@@ -9,6 +9,7 @@ #include "base/synchronization/lock.h" #include "base/thread_annotations.h" +#include "base/time/time.h" #include "chromeos/services/tts/public/mojom/tts_service.mojom.h" #include "media/base/audio_renderer_sink.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chromeos/system/cpu_temperature_reader.cc b/chromeos/system/cpu_temperature_reader.cc index b5e28bc24..bbc9255 100644 --- a/chromeos/system/cpu_temperature_reader.cc +++ b/chromeos/system/cpu_temperature_reader.cc
@@ -11,7 +11,6 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" namespace chromeos {
diff --git a/chromeos/system/statistics_provider.cc b/chromeos/system/statistics_provider.cc index 2dde521..185725a 100644 --- a/chromeos/system/statistics_provider.cc +++ b/chromeos/system/statistics_provider.cc
@@ -26,7 +26,6 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner.h" #include "base/task/task_traits.h"
diff --git a/chromeos/tast_control.gni b/chromeos/tast_control.gni index bc5edc6..1de48f5 100644 --- a/chromeos/tast_control.gni +++ b/chromeos/tast_control.gni
@@ -172,9 +172,6 @@ # https://crbug.com/1310619 "policy.AutoOpenAllowedForURLs.lacros", - # https://crbug.com/1309146 - "u2fd.WebauthnUsingPassword.tpm1", - # b/224969741 # "arc.Boot.vm", # Flaky, but also important. "arc.ChromeCrash.vm_logged_in",
diff --git a/components/account_manager_core/chromeos/account_manager.cc b/components/account_manager_core/chromeos/account_manager.cc index 5a1e7b9..db07823 100644 --- a/components/account_manager_core/chromeos/account_manager.cc +++ b/components/account_manager_core/chromeos/account_manager.cc
@@ -19,7 +19,6 @@ #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/components/accuracy_tips/accuracy_service_unittest.cc b/components/accuracy_tips/accuracy_service_unittest.cc index 66d94bb3..35ffdbc 100644 --- a/components/accuracy_tips/accuracy_service_unittest.cc +++ b/components/accuracy_tips/accuracy_service_unittest.cc
@@ -9,7 +9,6 @@ #include "base/memory/scoped_refptr.h" #include "base/metrics/field_trial_params.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/components/accuracy_tips/features.h b/components/accuracy_tips/features.h index 35184a2c..a37d9a8 100644 --- a/components/accuracy_tips/features.h +++ b/components/accuracy_tips/features.h
@@ -6,6 +6,7 @@ #define COMPONENTS_ACCURACY_TIPS_FEATURES_H_ #include "base/metrics/field_trial_params.h" +#include "base/time/time.h" namespace accuracy_tips { namespace features { @@ -49,4 +50,4 @@ } // namespace features } // namespace accuracy_tips -#endif // COMPONENTS_ACCURACY_TIPS_FEATURES_H_ \ No newline at end of file +#endif // COMPONENTS_ACCURACY_TIPS_FEATURES_H_
diff --git a/components/app_restore/arc_save_handler.h b/components/app_restore/arc_save_handler.h index d3cecc9..9c2c8a5 100644 --- a/components/app_restore/arc_save_handler.h +++ b/components/app_restore/arc_save_handler.h
@@ -13,6 +13,7 @@ #include "base/component_export.h" #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" namespace app_restore {
diff --git a/components/app_restore/full_restore_file_handler.cc b/components/app_restore/full_restore_file_handler.cc index b6cd051..5012ecd 100644 --- a/components/app_restore/full_restore_file_handler.cc +++ b/components/app_restore/full_restore_file_handler.cc
@@ -10,7 +10,6 @@ #include "base/files/important_file_writer.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "components/app_restore/restore_data.h"
diff --git a/components/app_restore/full_restore_read_handler.cc b/components/app_restore/full_restore_read_handler.cc index d6d89469..6e445410 100644 --- a/components/app_restore/full_restore_read_handler.cc +++ b/components/app_restore/full_restore_read_handler.cc
@@ -11,7 +11,6 @@ #include "ash/constants/app_types.h" #include "base/bind.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "components/app_constants/constants.h" #include "components/app_restore/app_launch_info.h"
diff --git a/components/app_restore/full_restore_read_handler.h b/components/app_restore/full_restore_read_handler.h index ec3607c..d84075e 100644 --- a/components/app_restore/full_restore_read_handler.h +++ b/components/app_restore/full_restore_read_handler.h
@@ -15,6 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/scoped_multi_source_observation.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "components/app_restore/app_restore_arc_info.h" #include "components/app_restore/arc_read_handler.h" #include "components/app_restore/full_restore_utils.h"
diff --git a/components/arc/common/intent_helper/activity_icon_loader.cc b/components/arc/common/intent_helper/activity_icon_loader.cc index d61aa05..86638c8c 100644 --- a/components/arc/common/intent_helper/activity_icon_loader.cc +++ b/components/arc/common/intent_helper/activity_icon_loader.cc
@@ -12,7 +12,6 @@ #include "base/base64.h" #include "base/bind.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/arc/common/intent_helper/adaptive_icon_delegate.h" #include "third_party/abseil-cpp/absl/types/variant.h"
diff --git a/components/assist_ranker/ranker_model_loader_impl.cc b/components/assist_ranker/ranker_model_loader_impl.cc index 65199d9c..441415da 100644 --- a/components/assist_ranker/ranker_model_loader_impl.cc +++ b/components/assist_ranker/ranker_model_loader_impl.cc
@@ -15,7 +15,6 @@ #include "base/files/important_file_writer.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/components/assist_ranker/ranker_model_loader_impl_unittest.cc b/components/assist_ranker/ranker_model_loader_impl_unittest.cc index 707be15..ab31e4d 100644 --- a/components/assist_ranker/ranker_model_loader_impl_unittest.cc +++ b/components/assist_ranker/ranker_model_loader_impl_unittest.cc
@@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "components/assist_ranker/proto/ranker_model.pb.h"
diff --git a/components/autofill/core/browser/address_normalizer_impl.cc b/components/autofill/core/browser/address_normalizer_impl.cc index dffc4f6..a0deef4 100644 --- a/components/autofill/core/browser/address_normalizer_impl.cc +++ b/components/autofill/core/browser/address_normalizer_impl.cc
@@ -14,7 +14,6 @@ #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h"
diff --git a/components/autofill/core/browser/autofill_download_manager_unittest.cc b/components/autofill/core/browser/autofill_download_manager_unittest.cc index d6174069..b1608590 100644 --- a/components/autofill/core/browser/autofill_download_manager_unittest.cc +++ b/components/autofill/core/browser/autofill_download_manager_unittest.cc
@@ -20,7 +20,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_command_line.h" #include "base/test/scoped_feature_list.h"
diff --git a/components/autofill/core/browser/browser_autofill_manager.cc b/components/autofill/core/browser/browser_autofill_manager.cc index 025f382..c8dd880 100644 --- a/components/autofill/core/browser/browser_autofill_manager.cc +++ b/components/autofill/core/browser/browser_autofill_manager.cc
@@ -40,7 +40,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h"
diff --git a/components/autofill/core/browser/data_model/test_data_creator.h b/components/autofill/core/browser/data_model/test_data_creator.h index bdbfed3..45cc6cbc8 100644 --- a/components/autofill/core/browser/data_model/test_data_creator.h +++ b/components/autofill/core/browser/data_model/test_data_creator.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/callback.h" +#include "base/time/time.h" #include "components/autofill/core/browser/data_model/autofill_profile.h" #include "components/autofill/core/browser/data_model/credit_card.h" @@ -49,4 +50,4 @@ } // namespace autofill -#endif // COMPONENTS_AUTOFILL_CORE_BROWSER_DATA_MODEL_TEST_DATA_CREATOR_H_ \ No newline at end of file +#endif // COMPONENTS_AUTOFILL_CORE_BROWSER_DATA_MODEL_TEST_DATA_CREATOR_H_
diff --git a/components/autofill/core/browser/form_parsing/credit_card_field_unittest.cc b/components/autofill/core/browser/form_parsing/credit_card_field_unittest.cc index d32bde7..12f12a0a 100644 --- a/components/autofill/core/browser/form_parsing/credit_card_field_unittest.cc +++ b/components/autofill/core/browser/form_parsing/credit_card_field_unittest.cc
@@ -12,6 +12,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "components/autofill/core/browser/autofill_field.h" #include "components/autofill/core/browser/field_types.h" #include "components/autofill/core/browser/form_parsing/autofill_scanner.h"
diff --git a/components/autofill/core/browser/geo/alternative_state_name_map_updater.cc b/components/autofill/core/browser/geo/alternative_state_name_map_updater.cc index a876472..9369fbd 100644 --- a/components/autofill/core/browser/geo/alternative_state_name_map_updater.cc +++ b/components/autofill/core/browser/geo/alternative_state_name_map_updater.cc
@@ -18,7 +18,6 @@ #include "base/ranges/algorithm.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/autofill/core/browser/payments/credit_card_access_manager.cc b/components/autofill/core/browser/payments/credit_card_access_manager.cc index b1661c2..c5529f8 100644 --- a/components/autofill/core/browser/payments/credit_card_access_manager.cc +++ b/components/autofill/core/browser/payments/credit_card_access_manager.cc
@@ -15,7 +15,6 @@ #include "base/guid.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/components/autofill/core/browser/payments/credit_card_access_manager.h b/components/autofill/core/browser/payments/credit_card_access_manager.h index 6b29217..fabe489f 100644 --- a/components/autofill/core/browser/payments/credit_card_access_manager.h +++ b/components/autofill/core/browser/payments/credit_card_access_manager.h
@@ -15,6 +15,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/task/cancelable_task_tracker.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/autofill_driver.h"
diff --git a/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc b/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc index 2b5eb02..9bd4752d 100644 --- a/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc +++ b/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc
@@ -24,7 +24,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h"
diff --git a/components/autofill/core/browser/payments/credit_card_otp_authenticator.h b/components/autofill/core/browser/payments/credit_card_otp_authenticator.h index 46ffdb63..c28d237 100644 --- a/components/autofill/core/browser/payments/credit_card_otp_authenticator.h +++ b/components/autofill/core/browser/payments/credit_card_otp_authenticator.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/data_model/credit_card.h" #include "components/autofill/core/browser/payments/otp_unmask_delegate.h"
diff --git a/components/autofill/core/browser/payments/virtual_card_enrollment_manager.h b/components/autofill/core/browser/payments/virtual_card_enrollment_manager.h index 36a677b..a2896dcd 100644 --- a/components/autofill/core/browser/payments/virtual_card_enrollment_manager.h +++ b/components/autofill/core/browser/payments/virtual_card_enrollment_manager.h
@@ -8,6 +8,7 @@ #include <string> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/payments/payments_client.h" #include "components/autofill/core/browser/payments/virtual_card_enrollment_flow.h"
diff --git a/components/autofill/core/browser/strike_database.cc b/components/autofill/core/browser/strike_database.cc index aee426c..c1babe02 100644 --- a/components/autofill/core/browser/strike_database.cc +++ b/components/autofill/core/browser/strike_database.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "components/autofill/core/browser/proto/strike_data.pb.h"
diff --git a/components/autofill/core/browser/strike_database_integrator_base.cc b/components/autofill/core/browser/strike_database_integrator_base.cc index a82a024..d7b3682 100644 --- a/components/autofill/core/browser/strike_database_integrator_base.cc +++ b/components/autofill/core/browser/strike_database_integrator_base.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "components/autofill/core/browser/proto/strike_data.pb.h" #include "components/autofill/core/common/autofill_clock.h"
diff --git a/components/autofill/core/browser/test_browser_autofill_manager.h b/components/autofill/core/browser/test_browser_autofill_manager.h index 178f477a..eb6abb9 100644 --- a/components/autofill/core/browser/test_browser_autofill_manager.h +++ b/components/autofill/core/browser/test_browser_autofill_manager.h
@@ -12,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "components/autofill/core/browser/browser_autofill_manager.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/components/autofill/core/browser/ui/payments/card_unmask_prompt_controller_impl.h b/components/autofill/core/browser/ui/payments/card_unmask_prompt_controller_impl.h index aa4e3333..efa1464c1 100644 --- a/components/autofill/core/browser/ui/payments/card_unmask_prompt_controller_impl.h +++ b/components/autofill/core/browser/ui/payments/card_unmask_prompt_controller_impl.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/autofill/core/browser/data_model/credit_card.h" #include "components/autofill/core/browser/metrics/autofill_metrics.h"
diff --git a/components/autofill/core/browser/webdata/autocomplete_sync_bridge.cc b/components/autofill/core/browser/webdata/autocomplete_sync_bridge.cc index aa15d0c..888ef391 100644 --- a/components/autofill/core/browser/webdata/autocomplete_sync_bridge.cc +++ b/components/autofill/core/browser/webdata/autocomplete_sync_bridge.cc
@@ -15,6 +15,7 @@ #include "base/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "components/autofill/core/browser/proto/autofill_sync.pb.h" #include "components/autofill/core/browser/webdata/autofill_table.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
diff --git a/components/autofill/core/browser/webdata/web_data_service_unittest.cc b/components/autofill/core/browser/webdata/web_data_service_unittest.cc index 0b3ff76..0b5bf84 100644 --- a/components/autofill/core/browser/webdata/web_data_service_unittest.cc +++ b/components/autofill/core/browser/webdata/web_data_service_unittest.cc
@@ -14,7 +14,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/task_environment.h"
diff --git a/components/autofill/ios/browser/fake_autofill_agent.mm b/components/autofill/ios/browser/fake_autofill_agent.mm index 01d17b6..8e431c5 100644 --- a/components/autofill/ios/browser/fake_autofill_agent.mm +++ b/components/autofill/ios/browser/fake_autofill_agent.mm
@@ -5,7 +5,6 @@ #import "components/autofill/ios/browser/fake_autofill_agent.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "ios/web/public/thread/web_task_traits.h" #include "ios/web/public/thread/web_thread.h"
diff --git a/components/autofill_assistant/browser/actions/action_delegate_util_unittest.cc b/components/autofill_assistant/browser/actions/action_delegate_util_unittest.cc index aa0ec92..7f12a2a 100644 --- a/components/autofill_assistant/browser/actions/action_delegate_util_unittest.cc +++ b/components/autofill_assistant/browser/actions/action_delegate_util_unittest.cc
@@ -289,8 +289,8 @@ auto element = std::make_unique<ElementFinder::Result>(); ElementFinder::Result option; - option.dom_object.object_data.object_id = "option"; - mock_action_delegate_.GetElementStore()->AddElement("o", option.dom_object); + option.SetObjectId("option"); + mock_action_delegate_.GetElementStore()->AddElement("o", option.dom_object()); EXPECT_CALL(*this, MockElementAction(EqualsElement(option), _, _)) .WillOnce(RunOnceCallback<2>(OkClientStatus()));
diff --git a/components/autofill_assistant/browser/actions/action_test_utils.cc b/components/autofill_assistant/browser/actions/action_test_utils.cc index fc2b02ed..819efd0 100644 --- a/components/autofill_assistant/browser/actions/action_test_utils.cc +++ b/components/autofill_assistant/browser/actions/action_test_utils.cc
@@ -32,14 +32,12 @@ .Times(times) .WillRepeatedly(WithArgs<1>([&selector](auto&& callback) { auto element_result = std::make_unique<ElementFinder::Result>(); - element_result->dom_object.object_data.object_id = - selector.proto.filters(0).css_selector(); + element_result->SetObjectId(selector.proto.filters(0).css_selector()); std::move(callback).Run(OkClientStatus(), std::move(element_result)); })); ElementFinder::Result expected_result; - expected_result.dom_object.object_data.object_id = - selector.proto.filters(0).css_selector(); + expected_result.SetObjectId(selector.proto.filters(0).css_selector()); return expected_result; } @@ -58,14 +56,12 @@ .Times(times) .WillRepeatedly(WithArgs<2>([&selector](auto&& callback) { auto element_result = std::make_unique<ElementFinder::Result>(); - element_result->dom_object.object_data.object_id = - selector.proto.filters(0).css_selector(); + element_result->SetObjectId(selector.proto.filters(0).css_selector()); std::move(callback).Run(OkClientStatus(), std::move(element_result)); })); ElementFinder::Result expected_result; - expected_result.dom_object.object_data.object_id = - selector.proto.filters(0).css_selector(); + expected_result.SetObjectId(selector.proto.filters(0).css_selector()); return expected_result; }
diff --git a/components/autofill_assistant/browser/actions/action_unittest.cc b/components/autofill_assistant/browser/actions/action_unittest.cc index da9b852..ed2dab70 100644 --- a/components/autofill_assistant/browser/actions/action_unittest.cc +++ b/components/autofill_assistant/browser/actions/action_unittest.cc
@@ -6,6 +6,7 @@ #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" +#include "base/time/time.h" #include "base/time/time_override.h" #include "components/autofill_assistant/browser/actions/action_test_utils.h" #include "components/autofill_assistant/browser/actions/mock_action_delegate.h"
diff --git a/components/autofill_assistant/browser/actions/check_element_tag_action_unittest.cc b/components/autofill_assistant/browser/actions/check_element_tag_action_unittest.cc index 63cc0d7..64e8c33 100644 --- a/components/autofill_assistant/browser/actions/check_element_tag_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/check_element_tag_action_unittest.cc
@@ -60,9 +60,9 @@ TEST_F(CheckElementTagActionTest, SucceedsForMatchingTagCaseInsensitive) { ElementFinder::Result element; - element.dom_object.object_data.object_id = "e"; + element.SetObjectId("e"); mock_action_delegate_.GetElementStore()->AddElement(kClientId, - element.dom_object); + element.dom_object()); EXPECT_CALL(mock_web_controller_, GetElementTag(EqualsElement(element), _)) .WillOnce(RunOnceCallback<1>(OkClientStatus(), "TAG")); @@ -78,9 +78,9 @@ TEST_F(CheckElementTagActionTest, FailsForNoMatchingTags) { ElementFinder::Result element; - element.dom_object.object_data.object_id = "e"; + element.SetObjectId("e"); mock_action_delegate_.GetElementStore()->AddElement(kClientId, - element.dom_object); + element.dom_object()); EXPECT_CALL(mock_web_controller_, GetElementTag(EqualsElement(element), _)) .WillOnce(RunOnceCallback<1>(OkClientStatus(), "TAG"));
diff --git a/components/autofill_assistant/browser/actions/check_option_element_action_unittest.cc b/components/autofill_assistant/browser/actions/check_option_element_action_unittest.cc index f18f4b9..b32ec91 100644 --- a/components/autofill_assistant/browser/actions/check_option_element_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/check_option_element_action_unittest.cc
@@ -63,7 +63,7 @@ TEST_F(CheckOptionElementActionTest, UnknownOptionElementFails) { ElementFinder::Result select; mock_action_delegate_.GetElementStore()->AddElement(kSelectId, - select.dom_object); + select.dom_object()); EXPECT_CALL(callback_, Run(Pointee(Property(&ProcessedActionProto::status, CLIENT_ID_RESOLUTION_FAILED)))); @@ -72,13 +72,13 @@ TEST_F(CheckOptionElementActionTest, SucceedsForMatchingOption) { ElementFinder::Result select; - select.dom_object.object_data.object_id = "select"; + select.SetObjectId("select"); mock_action_delegate_.GetElementStore()->AddElement(kSelectId, - select.dom_object); + select.dom_object()); ElementFinder::Result option; - option.dom_object.object_data.object_id = "option"; + option.SetObjectId("option"); mock_action_delegate_.GetElementStore()->AddElement(kOptionId, - option.dom_object); + option.dom_object()); EXPECT_CALL(mock_web_controller_, CheckSelectedOptionElement(EqualsElement(option), @@ -97,13 +97,13 @@ TEST_F(CheckOptionElementActionTest, DoesNotFailForMismatch) { ElementFinder::Result select; - select.dom_object.object_data.object_id = "select"; + select.SetObjectId("select"); mock_action_delegate_.GetElementStore()->AddElement(kSelectId, - select.dom_object); + select.dom_object()); ElementFinder::Result option; - option.dom_object.object_data.object_id = "option"; + option.SetObjectId("option"); mock_action_delegate_.GetElementStore()->AddElement(kOptionId, - option.dom_object); + option.dom_object()); EXPECT_CALL(mock_web_controller_, CheckSelectedOptionElement(EqualsElement(option), @@ -124,13 +124,13 @@ TEST_F(CheckOptionElementActionTest, FailsForMismatchIfSpecified) { ElementFinder::Result select; - select.dom_object.object_data.object_id = "select"; + select.SetObjectId("select"); mock_action_delegate_.GetElementStore()->AddElement(kSelectId, - select.dom_object); + select.dom_object()); ElementFinder::Result option; - option.dom_object.object_data.object_id = "option"; + option.SetObjectId("option"); mock_action_delegate_.GetElementStore()->AddElement(kOptionId, - option.dom_object); + option.dom_object()); EXPECT_CALL(mock_web_controller_, CheckSelectedOptionElement(EqualsElement(option),
diff --git a/components/autofill_assistant/browser/actions/execute_js_action_unittest.cc b/components/autofill_assistant/browser/actions/execute_js_action_unittest.cc index 2ae9f6f..433d577 100644 --- a/components/autofill_assistant/browser/actions/execute_js_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/execute_js_action_unittest.cc
@@ -76,9 +76,9 @@ TEST_F(ExecuteJsActionTest, ExecutesSnippetAndReturns) { ElementFinder::Result element; - element.dom_object.object_data.object_id = "id"; + element.SetObjectId("id"); mock_action_delegate_.GetElementStore()->AddElement(kClientId, - element.dom_object); + element.dom_object()); EXPECT_CALL(mock_web_controller_, ExecuteJS(kSnippet, EqualsElement(element), _)) @@ -94,9 +94,9 @@ TEST_F(ExecuteJsActionTest, TimesOut) { ElementFinder::Result element; - element.dom_object.object_data.object_id = "id"; + element.SetObjectId("id"); mock_action_delegate_.GetElementStore()->AddElement(kClientId, - element.dom_object); + element.dom_object()); // Swallow the call and don't return to let the timeout trigger. base::OnceCallback<void(const ClientStatus&)> captured_callback; @@ -125,9 +125,9 @@ TEST_F(ExecuteJsActionTest, DoesNotTimeOut) { ElementFinder::Result element; - element.dom_object.object_data.object_id = "id"; + element.SetObjectId("id"); mock_action_delegate_.GetElementStore()->AddElement(kClientId, - element.dom_object); + element.dom_object()); EXPECT_CALL(mock_web_controller_, ExecuteJS(kSnippet, EqualsElement(element), _))
diff --git a/components/autofill_assistant/browser/actions/get_element_status_action_unittest.cc b/components/autofill_assistant/browser/actions/get_element_status_action_unittest.cc index 0eaed9fc..fe23f94 100644 --- a/components/autofill_assistant/browser/actions/get_element_status_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/get_element_status_action_unittest.cc
@@ -151,7 +151,7 @@ TEST_F(GetElementStatusActionTest, ActionReportsAllVariationsForClientId) { ElementFinder::Result element; mock_action_delegate_.GetElementStore()->AddElement("element", - element.dom_object); + element.dom_object()); proto_.mutable_client_id()->set_identifier("element"); proto_.mutable_expected_value_match() ->mutable_text_match()
diff --git a/components/autofill_assistant/browser/actions/perform_on_single_element_action_unittest.cc b/components/autofill_assistant/browser/actions/perform_on_single_element_action_unittest.cc index 526bf30..ca4f1d23 100644 --- a/components/autofill_assistant/browser/actions/perform_on_single_element_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/perform_on_single_element_action_unittest.cc
@@ -95,9 +95,9 @@ TEST_F(PerformOnSingleElementActionTest, PerformsAndEnds) { ElementFinder::Result element; - element.dom_object.object_data.object_id = "id"; + element.SetObjectId("id"); mock_action_delegate_.GetElementStore()->AddElement(kClientId, - element.dom_object); + element.dom_object()); EXPECT_CALL( callback_, @@ -112,9 +112,9 @@ TEST_F(PerformOnSingleElementActionTest, PerformsTimedAndEnds) { ElementFinder::Result element; - element.dom_object.object_data.object_id = "id"; + element.SetObjectId("id"); mock_action_delegate_.GetElementStore()->AddElement(kClientId, - element.dom_object); + element.dom_object()); ProcessedActionProto capture; EXPECT_CALL(callback_, Run).WillOnce(testing::SaveArgPointee<0>(&capture));
diff --git a/components/autofill_assistant/browser/actions/prompt_action_unittest.cc b/components/autofill_assistant/browser/actions/prompt_action_unittest.cc index f8ba70d..f399795 100644 --- a/components/autofill_assistant/browser/actions/prompt_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/prompt_action_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/autofill_assistant/browser/actions/mock_action_delegate.h" #include "components/autofill_assistant/browser/wait_for_dom_observer.h"
diff --git a/components/autofill_assistant/browser/actions/release_elements_action_unittest.cc b/components/autofill_assistant/browser/actions/release_elements_action_unittest.cc index 7573af9..acf0180 100644 --- a/components/autofill_assistant/browser/actions/release_elements_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/release_elements_action_unittest.cc
@@ -46,9 +46,9 @@ TEST_F(ReleaseElementsActionTest, ReleasesSingleElement) { ElementFinder::Result element; - element.dom_object.object_data.object_id = "id"; + element.SetObjectId("id"); mock_action_delegate_.GetElementStore()->AddElement(kClientId, - element.dom_object); + element.dom_object()); EXPECT_TRUE(mock_action_delegate_.GetElementStore()->HasElement(kClientId)); @@ -67,11 +67,11 @@ *proto_.add_client_ids() = client_id_2; ElementFinder::Result element; - element.dom_object.object_data.object_id = "id"; + element.SetObjectId("id"); mock_action_delegate_.GetElementStore()->AddElement(kClientId, - element.dom_object); + element.dom_object()); mock_action_delegate_.GetElementStore()->AddElement(kOtherClientId, - element.dom_object); + element.dom_object()); EXPECT_TRUE(mock_action_delegate_.GetElementStore()->HasElement(kClientId)); EXPECT_TRUE(
diff --git a/components/autofill_assistant/browser/actions/send_keystroke_events_action_unittest.cc b/components/autofill_assistant/browser/actions/send_keystroke_events_action_unittest.cc index 0779f1cf..756b9bf 100644 --- a/components/autofill_assistant/browser/actions/send_keystroke_events_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/send_keystroke_events_action_unittest.cc
@@ -92,8 +92,9 @@ TEST_F(SendKeystrokeEventsActionTest, SendsText) { ElementFinder::Result element; - element.dom_object.object_data.object_id = "id"; - mock_action_delegate_.GetElementStore()->AddElement("e", element.dom_object); + element.SetObjectId("id"); + mock_action_delegate_.GetElementStore()->AddElement("e", + element.dom_object()); EXPECT_CALL(mock_web_controller_, SendTextInput(20, "Hello", EqualsElement(element), _)) @@ -118,9 +119,10 @@ // to set the matching origin. content::WebContentsTester::For(web_contents_.get()) ->NavigateAndCommit(GURL(kUrl)); - element.dom_object.object_data.object_id = "id"; + element.SetObjectId("id"); element.SetRenderFrameHost(web_contents_->GetMainFrame()); - mock_action_delegate_.GetElementStore()->AddElement("e", element.dom_object); + mock_action_delegate_.GetElementStore()->AddElement("e", + element.dom_object()); EXPECT_CALL(mock_web_controller_, SendTextInput(0, "password", EqualsElement(element), _)) @@ -158,9 +160,10 @@ // to set the matching origin. content::WebContentsTester::For(web_contents_.get()) ->NavigateAndCommit(GURL(kUrl)); - element.dom_object.object_data.object_id = "id"; + element.SetObjectId("id"); element.SetRenderFrameHost(web_contents_->GetMainFrame()); - mock_action_delegate_.GetElementStore()->AddElement("e", element.dom_object); + mock_action_delegate_.GetElementStore()->AddElement("e", + element.dom_object()); EXPECT_CALL(mock_web_controller_, SendTextInput(0, "password", EqualsElement(element), _))
diff --git a/components/autofill_assistant/browser/actions/show_generic_ui_action.h b/components/autofill_assistant/browser/actions/show_generic_ui_action.h index 3c57652..4cf702fc 100644 --- a/components/autofill_assistant/browser/actions/show_generic_ui_action.h +++ b/components/autofill_assistant/browser/actions/show_generic_ui_action.h
@@ -8,6 +8,7 @@ #include "base/callback.h" #include "base/containers/flat_map.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/autofill_assistant/browser/actions/action.h" #include "components/autofill_assistant/browser/batch_element_checker.h" #include "components/autofill_assistant/browser/wait_for_dom_observer.h"
diff --git a/components/autofill_assistant/browser/actions/stopwatch_unittest.cc b/components/autofill_assistant/browser/actions/stopwatch_unittest.cc index b369ca1..af08d5c 100644 --- a/components/autofill_assistant/browser/actions/stopwatch_unittest.cc +++ b/components/autofill_assistant/browser/actions/stopwatch_unittest.cc
@@ -5,6 +5,7 @@ #include "components/autofill_assistant/browser/actions/stopwatch.h" #include "base/logging.h" +#include "base/time/time.h" #include "base/time/time_override.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/components/autofill_assistant/browser/actions/upload_dom_action_unittest.cc b/components/autofill_assistant/browser/actions/upload_dom_action_unittest.cc index cd0190ee..d1658ec 100644 --- a/components/autofill_assistant/browser/actions/upload_dom_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/upload_dom_action_unittest.cc
@@ -168,12 +168,12 @@ EXPECT_CALL(mock_action_delegate_, FindAllElements(selector, _)) .WillOnce(testing::WithArgs<1>([](auto&& callback) { auto element_result = std::make_unique<ElementFinder::Result>(); - element_result->dom_object.object_data.object_id = "fake_object_id"; + element_result->SetObjectId("fake_object_id"); std::move(callback).Run(OkClientStatus(), std::move(element_result)); })); ElementFinder::Result expected_result; - expected_result.dom_object.object_data.object_id = "fake_object_id"; + expected_result.SetObjectId("fake_object_id"); std::vector<std::string> fake_htmls{"<div></div>", "<span></span>"}; EXPECT_CALL(mock_web_controller_, @@ -203,12 +203,12 @@ EXPECT_CALL(mock_action_delegate_, FindAllElements(selector, _)) .WillOnce(testing::WithArgs<1>([](auto&& callback) { auto element_result = std::make_unique<ElementFinder::Result>(); - element_result->dom_object.object_data.object_id = "fake_object_id"; + element_result->SetObjectId("fake_object_id"); std::move(callback).Run(OkClientStatus(), std::move(element_result)); })); ElementFinder::Result expected_result; - expected_result.dom_object.object_data.object_id = "fake_object_id"; + expected_result.SetObjectId("fake_object_id"); std::vector<std::string> fake_htmls{"<div></div>", "<span></span>"};
diff --git a/components/autofill_assistant/browser/actions/wait_for_dom_action_unittest.cc b/components/autofill_assistant/browser/actions/wait_for_dom_action_unittest.cc index df08932..045ed07 100644 --- a/components/autofill_assistant/browser/actions/wait_for_dom_action_unittest.cc +++ b/components/autofill_assistant/browser/actions/wait_for_dom_action_unittest.cc
@@ -218,8 +218,8 @@ FindElement(expected_selector, /* strict= */ false, _)) .WillOnce(WithArgs<2>([&expected_selector](auto&& callback) { auto element_result = std::make_unique<ElementFinder::Result>(); - element_result->dom_object.object_data.object_id = - expected_selector.proto.filters(0).css_selector(); + element_result->SetObjectId( + expected_selector.proto.filters(0).css_selector()); std::move(callback).Run(OkClientStatus(), std::move(element_result)); })); @@ -240,8 +240,8 @@ FindElement(expected_selector, /* strict= */ true, _)) .WillOnce(WithArgs<2>([&expected_selector](auto&& callback) { auto element_result = std::make_unique<ElementFinder::Result>(); - element_result->dom_object.object_data.object_id = - expected_selector.proto.filters(0).css_selector(); + element_result->SetObjectId( + expected_selector.proto.filters(0).css_selector()); std::move(callback).Run(OkClientStatus(), std::move(element_result)); }));
diff --git a/components/autofill_assistant/browser/android/ui_controller_android.cc b/components/autofill_assistant/browser/android/ui_controller_android.cc index 7512e3f..31e27f56 100644 --- a/components/autofill_assistant/browser/android/ui_controller_android.cc +++ b/components/autofill_assistant/browser/android/ui_controller_android.cc
@@ -15,7 +15,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/metrics/field_trial_params.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "components/autofill/core/browser/data_model/autofill_profile.h" #include "components/autofill/core/browser/data_model/credit_card.h"
diff --git a/components/autofill_assistant/browser/basic_interactions.cc b/components/autofill_assistant/browser/basic_interactions.cc index fb5f1890..5f6d8ab 100644 --- a/components/autofill_assistant/browser/basic_interactions.cc +++ b/components/autofill_assistant/browser/basic_interactions.cc
@@ -8,6 +8,7 @@ #include "base/i18n/time_formatting.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "components/autofill/core/browser/autofill_data_util.h" #include "components/autofill_assistant/browser/field_formatter.h" #include "components/autofill_assistant/browser/script_executor_delegate.h"
diff --git a/components/autofill_assistant/browser/batch_element_checker.cc b/components/autofill_assistant/browser/batch_element_checker.cc index 2821f812..500b0c5 100644 --- a/components/autofill_assistant/browser/batch_element_checker.cc +++ b/components/autofill_assistant/browser/batch_element_checker.cc
@@ -291,7 +291,7 @@ // TODO(szermatt): Consider reporting element_status as an unexpected error // right away if it is neither success nor ELEMENT_RESOLUTION_FAILED. if (element_status.ok() && result.client_id.has_value()) { - condition.elements[*result.client_id] = element_result->dom_object; + condition.elements[*result.client_id] = element_result->dom_object(); } } CheckDone();
diff --git a/components/autofill_assistant/browser/batch_element_checker.h b/components/autofill_assistant/browser/batch_element_checker.h index 82b504d..ccf62130 100644 --- a/components/autofill_assistant/browser/batch_element_checker.h +++ b/components/autofill_assistant/browser/batch_element_checker.h
@@ -15,6 +15,7 @@ #include "base/callback_helpers.h" #include "base/containers/flat_map.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/autofill_assistant/browser/client_status.h" #include "components/autofill_assistant/browser/selector.h" #include "components/autofill_assistant/browser/service.pb.h"
diff --git a/components/autofill_assistant/browser/controller.h b/components/autofill_assistant/browser/controller.h index ff77ecd2..17f79ef 100644 --- a/components/autofill_assistant/browser/controller.h +++ b/components/autofill_assistant/browser/controller.h
@@ -11,6 +11,7 @@ #include "base/callback_helpers.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "components/autofill_assistant/browser/client.h" #include "components/autofill_assistant/browser/client_settings.h" #include "components/autofill_assistant/browser/element_area.h"
diff --git a/components/autofill_assistant/browser/controller_unittest.cc b/components/autofill_assistant/browser/controller_unittest.cc index b11e4bb3..04ef9b8a 100644 --- a/components/autofill_assistant/browser/controller_unittest.cc +++ b/components/autofill_assistant/browser/controller_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/autofill/core/browser/autofill_test_utils.h" #include "components/autofill/core/browser/field_types.h" #include "components/autofill_assistant/browser/cud_condition.pb.h"
diff --git a/components/autofill_assistant/browser/script_executor.cc b/components/autofill_assistant/browser/script_executor.cc index 5f7800d..7a61783 100644 --- a/components/autofill_assistant/browser/script_executor.cc +++ b/components/autofill_assistant/browser/script_executor.cc
@@ -481,7 +481,7 @@ void ScriptExecutor::StoreScrolledToElement( const ElementFinder::Result& element) { - last_focused_element_ = element.dom_object; + last_focused_element_ = element.dom_object(); } void ScriptExecutor::SetTouchableElementArea(
diff --git a/components/autofill_assistant/browser/script_executor.h b/components/autofill_assistant/browser/script_executor.h index 3753b7c..ebcccdc 100644 --- a/components/autofill_assistant/browser/script_executor.h +++ b/components/autofill_assistant/browser/script_executor.h
@@ -16,6 +16,7 @@ #include "base/containers/flat_map.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/autofill_assistant/browser/actions/action.h" #include "components/autofill_assistant/browser/actions/action_delegate.h" #include "components/autofill_assistant/browser/client_settings.h"
diff --git a/components/autofill_assistant/browser/web/element_action_util_unittest.cc b/components/autofill_assistant/browser/web/element_action_util_unittest.cc index 3d61931..c7f12c9 100644 --- a/components/autofill_assistant/browser/web/element_action_util_unittest.cc +++ b/components/autofill_assistant/browser/web/element_action_util_unittest.cc
@@ -26,9 +26,7 @@ public: ElementActionUtilTest() {} - void SetUp() override { - element_.dom_object.object_data.object_id = "element"; - } + void SetUp() override { element_.SetObjectId("element"); } MOCK_METHOD2(MockAction, void(const ElementFinder::Result& element,
diff --git a/components/autofill_assistant/browser/web/element_finder.cc b/components/autofill_assistant/browser/web/element_finder.cc index 3448e7b..ed83679bf 100644 --- a/components/autofill_assistant/browser/web/element_finder.cc +++ b/components/autofill_assistant/browser/web/element_finder.cc
@@ -222,42 +222,24 @@ std::make_unique<Result>(result)); } -void ElementFinder::SendCollectedResultIfAny() { - if (!callback_) { - return; - } - SendResult(result_status_, result_); -} - void ElementFinder::GiveUpElementResolutionWithError( const ClientStatus& status) { DCHECK(!status.ok()); - if (!callback_) - return; - - result_status_ = status; - SendCollectedResultIfAny(); + SendResult(status, Result::EmptyResult()); } void ElementFinder::ResultFound(const std::string& object_id) { if (!callback_) return; - result_status_ = OkClientStatus(); - // Fill in result. - result_ = BuildResult(object_id); - result_.dom_object.frame_stack = frame_stack_; - - SendCollectedResultIfAny(); -} - -ElementFinder::Result ElementFinder::BuildResult(const std::string& object_id) { Result result; result.SetRenderFrameHost(current_frame_); - result.dom_object.object_data.object_id = object_id; - result.dom_object.object_data.node_frame_id = current_frame_id_; - return result; + result.SetObjectId(object_id); + result.SetNodeFrameId(current_frame_id_); + result.SetFrameStack(frame_stack_); + + SendResult(OkClientStatus(), result); } void ElementFinder::RunAnnotateDomModel() { @@ -356,8 +338,7 @@ ResultFound(result->GetObject()->GetObjectId()); return; } - result_status_ = ClientStatus(ELEMENT_RESOLUTION_FAILED); - SendCollectedResultIfAny(); + SendResult(ClientStatus(ELEMENT_RESOLUTION_FAILED), Result::EmptyResult()); } void ElementFinder::ExecuteNextTask() {
diff --git a/components/autofill_assistant/browser/web/element_finder.h b/components/autofill_assistant/browser/web/element_finder.h index 2bf03ce5c..7fb5ffb 100644 --- a/components/autofill_assistant/browser/web/element_finder.h +++ b/components/autofill_assistant/browser/web/element_finder.h
@@ -71,7 +71,7 @@ // optional Elements (e.g. optional an frame). static Result EmptyResult(); - DomObjectFrameStack dom_object; + const DomObjectFrameStack& dom_object() const { return dom_object_; } content::RenderFrameHost* render_frame_host() const { if (!render_frame_id_) { @@ -81,15 +81,15 @@ } const std::string& object_id() const { - return dom_object.object_data.object_id; + return dom_object_.object_data.object_id; } const std::string& node_frame_id() const { - return dom_object.object_data.node_frame_id; + return dom_object_.object_data.node_frame_id; } const std::vector<JsObjectIdentifier>& frame_stack() const { - return dom_object.frame_stack; + return dom_object_.frame_stack; } bool IsEmpty() const { @@ -103,7 +103,21 @@ render_frame_id_ = render_frame_host->GetGlobalId(); } + void SetObjectId(const std::string& object_id) { + dom_object_.object_data.object_id = object_id; + } + + void SetNodeFrameId(const std::string& node_frame_id) { + dom_object_.object_data.node_frame_id = node_frame_id; + } + + void SetFrameStack(const std::vector<JsObjectIdentifier>& frame_stack) { + dom_object_.frame_stack = frame_stack; + } + private: + DomObjectFrameStack dom_object_; + // The id of the render frame host that contains the element. absl::optional<content::GlobalRenderFrameHostId> render_frame_id_; }; @@ -142,15 +156,6 @@ // Call |callback_| with the |status| and |result|. void SendResult(const ClientStatus& status, const Result& result); - // Calls |SendResult| with a the |result_status_| and |result_| if all tasks - // are complete. This includes waiting for the CSS selector resolution and - // the annotate DOM model inference (if applicable). - void SendCollectedResultIfAny(); - - // Report |object_id| as result in |result| and initialize the frame-related - // fields of |result| from the current state. Leaves the frame stack empty. - Result BuildResult(const std::string& object_id); - // Figures out what to do next given the current state. // // Most background operations in this worker end by updating the state and @@ -349,14 +354,6 @@ std::vector<JsObjectIdentifier> frame_stack_; - // The status of finding the element. - ClientStatus result_status_; - - // The successful result when the element has been found. In the case where - // |selector_| contains |SemanticInformation| this is only filled once the - // backend node id has been resolved. - Result result_ = Result::EmptyResult(); - // Elements gathered through all frames. Unused if the |selector_| does not // contain |SemanticInformation|. std::vector<GlobalBackendNodeId> semantic_node_results_;
diff --git a/components/autofill_assistant/browser/web/element_position_getter.h b/components/autofill_assistant/browser/web/element_position_getter.h index 8c8edb2..170f007 100644 --- a/components/autofill_assistant/browser/web/element_position_getter.h +++ b/components/autofill_assistant/browser/web/element_position_getter.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/autofill_assistant/browser/devtools/devtools/domains/types_dom.h" #include "components/autofill_assistant/browser/devtools/devtools/domains/types_runtime.h" #include "components/autofill_assistant/browser/devtools/devtools_client.h"
diff --git a/components/autofill_assistant/browser/web/element_store.cc b/components/autofill_assistant/browser/web/element_store.cc index edbfebd..7d213ae6c1 100644 --- a/components/autofill_assistant/browser/web/element_store.cc +++ b/components/autofill_assistant/browser/web/element_store.cc
@@ -37,7 +37,9 @@ ClientStatus ElementStore::RestoreElement( const DomObjectFrameStack& object, ElementFinder::Result* out_element) const { - out_element->dom_object = object; + out_element->SetObjectId(object.object_data.object_id); + out_element->SetNodeFrameId(object.object_data.node_frame_id); + out_element->SetFrameStack(object.frame_stack); auto* frame = FindCorrespondingRenderFrameHost( object.object_data.node_frame_id, web_contents_); if (frame == nullptr) {
diff --git a/components/autofill_assistant/browser/web/element_store_unittest.cc b/components/autofill_assistant/browser/web/element_store_unittest.cc index 9888072..94a6d176 100644 --- a/components/autofill_assistant/browser/web/element_store_unittest.cc +++ b/components/autofill_assistant/browser/web/element_store_unittest.cc
@@ -30,9 +30,9 @@ std::unique_ptr<ElementFinder::Result> CreateElement( const std::string& object_id) { auto element = std::make_unique<ElementFinder::Result>(); - element->dom_object.object_data.object_id = object_id; - element->dom_object.object_data.node_frame_id = - web_contents_->GetMainFrame()->GetDevToolsFrameToken().ToString(); + element->SetObjectId(object_id); + element->SetNodeFrameId( + web_contents_->GetMainFrame()->GetDevToolsFrameToken().ToString()); return element; } @@ -40,7 +40,7 @@ // result going out of life. void AddElement(const std::string& client_id, std::unique_ptr<ElementFinder::Result> element) { - element_store_->AddElement(client_id, element->dom_object); + element_store_->AddElement(client_id, element->dom_object()); } content::BrowserTaskEnvironment task_environment_; @@ -70,8 +70,8 @@ TEST_F(ElementStoreTest, GetElementFromStoreWithBadFrameHost) { auto element = std::make_unique<ElementFinder::Result>(); - element->dom_object.object_data.object_id = "1"; - element->dom_object.object_data.node_frame_id = "unknown"; + element->SetObjectId("1"); + element->SetNodeFrameId("unknown"); AddElement("1", std::move(element)); ElementFinder::Result result; @@ -81,7 +81,7 @@ TEST_F(ElementStoreTest, GetElementFromStoreWithNoFrameId) { auto element = std::make_unique<ElementFinder::Result>(); - element->dom_object.object_data.object_id = "1"; + element->SetObjectId("1"); AddElement("1", std::move(element)); ElementFinder::Result result;
diff --git a/components/autofill_assistant/browser/web/fake_element_store.cc b/components/autofill_assistant/browser/web/fake_element_store.cc index 2718171..b3e212bd 100644 --- a/components/autofill_assistant/browser/web/fake_element_store.cc +++ b/components/autofill_assistant/browser/web/fake_element_store.cc
@@ -23,7 +23,9 @@ return ClientStatus(CLIENT_ID_RESOLUTION_FAILED); } - out_element->dom_object = it->second; + out_element->SetObjectId(it->second.object_data.object_id); + out_element->SetNodeFrameId(it->second.object_data.node_frame_id); + out_element->SetFrameStack(it->second.frame_stack); if (web_contents_ != nullptr) { out_element->SetRenderFrameHost(web_contents_->GetMainFrame()); }
diff --git a/components/autofill_assistant/browser/web/web_controller_browsertest.cc b/components/autofill_assistant/browser/web/web_controller_browsertest.cc index ce30dba..5eab06d3 100644 --- a/components/autofill_assistant/browser/web/web_controller_browsertest.cc +++ b/components/autofill_assistant/browser/web/web_controller_browsertest.cc
@@ -2235,7 +2235,7 @@ // case where SendKeyboardInput ends prematurely with 0 delay doesn't cause // issues. ElementFinder::Result bad_element; - bad_element.dom_object.object_data.node_frame_id = "doesnotexist"; + bad_element.SetNodeFrameId("doesnotexist"); ClientStatus status; base::RunLoop run_loop; @@ -2424,7 +2424,7 @@ // This makes the devtools action fail. ElementFinder::Result bad_element; - bad_element.dom_object.object_data.node_frame_id = "doesnotexist"; + bad_element.SetNodeFrameId("doesnotexist"); DocumentReadyState end_state; base::RunLoop run_loop; @@ -2758,7 +2758,7 @@ WaitForElementToBecomeStableDevtoolsFailure) { // This makes the devtools action fail. ElementFinder::Result element; - element.dom_object.object_data.node_frame_id = "doesnotexist"; + element.SetNodeFrameId("doesnotexist"); element.SetRenderFrameHost(web_contents()->GetMainFrame()); EXPECT_EQ(ELEMENT_POSITION_NOT_FOUND, @@ -3252,8 +3252,8 @@ // Create fake element without object id and frame information only. ElementFinder::Result fake_frame_element; fake_frame_element.SetRenderFrameHost(frame_element.render_frame_host()); - fake_frame_element.dom_object.object_data.node_frame_id = - frame_element.render_frame_host()->GetDevToolsFrameToken().ToString(); + fake_frame_element.SetNodeFrameId( + frame_element.render_frame_host()->GetDevToolsFrameToken().ToString()); ClientStatus button_status; ElementFinder::Result button_element;
diff --git a/components/autofill_assistant/content/browser/annotate_dom_model_service.cc b/components/autofill_assistant/content/browser/annotate_dom_model_service.cc index 4d6c0a9..cc501a400 100644 --- a/components/autofill_assistant/content/browser/annotate_dom_model_service.cc +++ b/components/autofill_assistant/content/browser/annotate_dom_model_service.cc
@@ -8,7 +8,6 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "components/optimization_guide/core/optimization_guide_model_provider.h" #include "components/optimization_guide/proto/models.pb.h" #include "content/public/browser/browser_thread.h"
diff --git a/components/background_fetch/background_fetch_delegate_base.cc b/components/background_fetch/background_fetch_delegate_base.cc index 98d8977f..5f88192e 100644 --- a/components/background_fetch/background_fetch_delegate_base.cc +++ b/components/background_fetch/background_fetch_delegate_base.cc
@@ -10,7 +10,6 @@ #include "base/callback_helpers.h" #include "base/check_op.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "components/background_fetch/job_details.h" #include "components/content_settings/core/common/content_settings_types.h"
diff --git a/components/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc b/components/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc index 158c55ac..213248b 100644 --- a/components/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc +++ b/components/blocked_content/safe_browsing_triggered_popup_blocker_unittest.cc
@@ -11,7 +11,6 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "components/blocked_content/popup_blocker.h"
diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc index 97be25d..4d86a9e94 100644 --- a/components/bookmarks/browser/bookmark_codec.cc +++ b/components/bookmarks/browser/bookmark_codec.cc
@@ -18,6 +18,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "base/values.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/strings/grit/components_strings.h"
diff --git a/components/breadcrumbs/core/breadcrumb_persistent_storage_manager.cc b/components/breadcrumbs/core/breadcrumb_persistent_storage_manager.cc index 4282aca..ebbe405c 100644 --- a/components/breadcrumbs/core/breadcrumb_persistent_storage_manager.cc +++ b/components/breadcrumbs/core/breadcrumb_persistent_storage_manager.cc
@@ -15,7 +15,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "components/breadcrumbs/core/breadcrumb_manager.h"
diff --git a/components/breadcrumbs/core/breadcrumb_persistent_storage_manager.h b/components/breadcrumbs/core/breadcrumb_persistent_storage_manager.h index b2a470e..6653f21f 100644 --- a/components/breadcrumbs/core/breadcrumb_persistent_storage_manager.h +++ b/components/breadcrumbs/core/breadcrumb_persistent_storage_manager.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/files/file_path.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/breadcrumbs/core/breadcrumb_manager_observer.h" #include "components/breadcrumbs/core/crash_reporter_breadcrumb_constants.h"
diff --git a/components/browser_watcher/exit_code_watcher_win.h b/components/browser_watcher/exit_code_watcher_win.h index 83b967b..e5093cf 100644 --- a/components/browser_watcher/exit_code_watcher_win.h +++ b/components/browser_watcher/exit_code_watcher_win.h
@@ -6,6 +6,7 @@ #include "base/process/process.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/win/scoped_handle.h" namespace browser_watcher {
diff --git a/components/browsing_data/content/database_helper.cc b/components/browsing_data/content/database_helper.cc index b405875..547c346 100644 --- a/components/browsing_data/content/database_helper.cc +++ b/components/browsing_data/content/database_helper.cc
@@ -15,7 +15,6 @@ #include "base/files/file_util.h" #include "base/location.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "components/browsing_data/content/browsing_data_helper.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/components/browsing_data/core/counters/browsing_data_counter.h b/components/browsing_data/core/counters/browsing_data_counter.h index ede6e499..9f5cd3159 100644 --- a/components/browsing_data/core/counters/browsing_data_counter.h +++ b/components/browsing_data/core/counters/browsing_data_counter.h
@@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/browsing_data/core/clear_browsing_data_tab.h" #include "components/prefs/pref_member.h"
diff --git a/components/browsing_data/core/counters/passwords_counter.cc b/components/browsing_data/core/counters/passwords_counter.cc index 96764b8..a33d867d 100644 --- a/components/browsing_data/core/counters/passwords_counter.cc +++ b/components/browsing_data/core/counters/passwords_counter.cc
@@ -9,6 +9,7 @@ #include <utility> #include "base/bind.h" +#include "base/time/time.h" #include "components/browsing_data/core/pref_names.h" #include "components/password_manager/core/browser/password_manager_util.h" #include "components/password_manager/core/browser/password_store_change.h"
diff --git a/components/browsing_topics/browsing_topics_calculator.h b/components/browsing_topics/browsing_topics_calculator.h index 06e688e8..5a3b85f 100644 --- a/components/browsing_topics/browsing_topics_calculator.h +++ b/components/browsing_topics/browsing_topics_calculator.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/task/cancelable_task_tracker.h" +#include "base/time/time.h" #include "components/browsing_topics/common/common_types.h" #include "components/browsing_topics/epoch_topics.h" #include "components/history/core/browser/history_types.h"
diff --git a/components/browsing_topics/browsing_topics_service_impl.cc b/components/browsing_topics/browsing_topics_service_impl.cc index 94fb8b8..18605ba6 100644 --- a/components/browsing_topics/browsing_topics_service_impl.cc +++ b/components/browsing_topics/browsing_topics_service_impl.cc
@@ -7,6 +7,7 @@ #include <random> #include "base/rand_util.h" +#include "base/time/time.h" #include "components/browsing_topics/browsing_topics_calculator.h" #include "components/browsing_topics/browsing_topics_page_load_data_tracker.h" #include "components/browsing_topics/util.h"
diff --git a/components/browsing_topics/browsing_topics_service_impl_unittest.cc b/components/browsing_topics/browsing_topics_service_impl_unittest.cc index c9a6fa21..7526774 100644 --- a/components/browsing_topics/browsing_topics_service_impl_unittest.cc +++ b/components/browsing_topics/browsing_topics_service_impl_unittest.cc
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "components/browsing_topics/test_util.h" #include "components/browsing_topics/util.h" #include "components/content_settings/core/browser/cookie_settings.h"
diff --git a/components/browsing_topics/browsing_topics_state.cc b/components/browsing_topics/browsing_topics_state.cc index b0729b9..b26b14f2 100644 --- a/components/browsing_topics/browsing_topics_state.cc +++ b/components/browsing_topics/browsing_topics_state.cc
@@ -11,7 +11,6 @@ #include "base/json/json_string_value_serializer.h" #include "base/json/values_util.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/browsing_topics/browsing_topics_state.h b/components/browsing_topics/browsing_topics_state.h index 3d3109f..53bd0300 100644 --- a/components/browsing_topics/browsing_topics_state.h +++ b/components/browsing_topics/browsing_topics_state.h
@@ -7,7 +7,6 @@ #include "base/containers/queue.h" #include "base/files/important_file_writer.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "components/browsing_topics/common/common_types.h" #include "components/browsing_topics/epoch_topics.h"
diff --git a/components/browsing_topics/test_util.h b/components/browsing_topics/test_util.h index f67346c..6bc6922 100644 --- a/components/browsing_topics/test_util.h +++ b/components/browsing_topics/test_util.h
@@ -8,6 +8,7 @@ #include "base/containers/queue.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/browsing_topics/browsing_topics_calculator.h" #include "components/browsing_topics/browsing_topics_service.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/components/captive_portal/content/captive_portal_service_unittest.cc b/components/captive_portal/content/captive_portal_service_unittest.cc index 1b1a1eb..0b36d75c 100644 --- a/components/captive_portal/content/captive_portal_service_unittest.cc +++ b/components/captive_portal/content/captive_portal_service_unittest.cc
@@ -12,6 +12,7 @@ #include "base/run_loop.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_timeouts.h" +#include "base/time/time.h" #include "components/captive_portal/content/captive_portal_service.h" #include "components/captive_portal/core/captive_portal_testing_utils.h" #include "components/captive_portal/core/captive_portal_types.h"
diff --git a/components/cast_certificate/cast_cert_validator_unittest.cc b/components/cast_certificate/cast_cert_validator_unittest.cc index 858695b..96941c6 100644 --- a/components/cast_certificate/cast_cert_validator_unittest.cc +++ b/components/cast_certificate/cast_cert_validator_unittest.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/cast_certificate/cast_cert_reader.h" #include "components/cast_certificate/cast_cert_test_helpers.h" #include "net/cert/internal/cert_errors.h"
diff --git a/components/cast_channel/cast_socket.h b/components/cast_channel/cast_socket.h index 49d5615..f3d0c88a 100644 --- a/components/cast_channel/cast_socket.h +++ b/components/cast_channel/cast_socket.h
@@ -16,6 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/cast_channel/cast_auth_util.h" #include "components/cast_channel/cast_channel_enum.h"
diff --git a/components/cast_channel/keep_alive_handler.h b/components/cast_channel/keep_alive_handler.h index d0451e1..37a5cea 100644 --- a/components/cast_channel/keep_alive_handler.h +++ b/components/cast_channel/keep_alive_handler.h
@@ -8,6 +8,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/cast_channel/cast_channel_enum.h" #include "components/cast_channel/cast_message_util.h"
diff --git a/components/cast_channel/libcast_socket_service.h b/components/cast_channel/libcast_socket_service.h index c41bcf1..7637723a 100644 --- a/components/cast_channel/libcast_socket_service.h +++ b/components/cast_channel/libcast_socket_service.h
@@ -11,6 +11,7 @@ #include "base/observer_list.h" #include "base/sequence_checker.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "components/cast_channel/cast_socket.h" #include "components/cast_channel/cast_socket_service.h" #include "components/openscreen_platform/task_runner.h"
diff --git a/components/cdm/browser/cdm_message_filter_android.cc b/components/cdm/browser/cdm_message_filter_android.cc index c61eacfd..a02a4c6a 100644 --- a/components/cdm/browser/cdm_message_filter_android.cc +++ b/components/cdm/browser/cdm_message_filter_android.cc
@@ -11,7 +11,6 @@ #include "base/android/build_info.h" #include "base/feature_list.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/cdm/common/cdm_messages_android.h" #include "content/public/browser/android/android_overlay_provider.h"
diff --git a/components/chromeos_camera/common/mjpeg_decode_accelerator_mojom_traits.cc b/components/chromeos_camera/common/mjpeg_decode_accelerator_mojom_traits.cc index fab2b68f..393200a 100644 --- a/components/chromeos_camera/common/mjpeg_decode_accelerator_mojom_traits.cc +++ b/components/chromeos_camera/common/mjpeg_decode_accelerator_mojom_traits.cc
@@ -6,6 +6,7 @@ #include "base/check.h" #include "base/notreached.h" +#include "base/time/time.h" #include "media/base/ipc/media_param_traits_macros.h" #include "mojo/public/cpp/base/time_mojom_traits.h" #include "mojo/public/cpp/system/platform_handle.h"
diff --git a/components/chromeos_camera/fake_mjpeg_decode_accelerator.h b/components/chromeos_camera/fake_mjpeg_decode_accelerator.h index 25f155f1..c55958d 100644 --- a/components/chromeos_camera/fake_mjpeg_decode_accelerator.h +++ b/components/chromeos_camera/fake_mjpeg_decode_accelerator.h
@@ -11,6 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "components/chromeos_camera/mjpeg_decode_accelerator.h" #include "media/base/bitstream_buffer.h"
diff --git a/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc b/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc index 4869248..59fe201 100644 --- a/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc +++ b/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc
@@ -24,6 +24,7 @@ #include "base/test/test_timeouts.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/chromeos_camera/gpu_jpeg_encode_accelerator_factory.h" #include "components/chromeos_camera/jpeg_encode_accelerator.h"
diff --git a/components/commerce/core/commerce_feature_list.h b/components/commerce/core/commerce_feature_list.h index 10a5bd4..b618882 100644 --- a/components/commerce/core/commerce_feature_list.h +++ b/components/commerce/core/commerce_feature_list.h
@@ -7,6 +7,7 @@ #include "base/feature_list.h" #include "base/metrics/field_trial_params.h" +#include "base/time/time.h" #include "components/flags_ui/feature_entry.h" #include "components/search/ntp_features.h" #include "url/gurl.h"
diff --git a/components/component_updater/android/component_loader_policy.cc b/components/component_updater/android/component_loader_policy.cc index 4a14513..4ac6b1a 100644 --- a/components/component_updater/android/component_loader_policy.cc +++ b/components/component_updater/android/component_loader_policy.cc
@@ -31,7 +31,6 @@ #include "base/sequence_checker.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/components/component_updater/component_installer.cc b/components/component_updater/component_installer.cc index e9ceaec..6dbbc5e 100644 --- a/components/component_updater/component_installer.cc +++ b/components/component_updater/component_installer.cc
@@ -20,7 +20,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h"
diff --git a/components/component_updater/component_installer_unittest.cc b/components/component_updater/component_installer_unittest.cc index 5d5d372..69cf6a5 100644 --- a/components/component_updater/component_installer_unittest.cc +++ b/components/component_updater/component_installer_unittest.cc
@@ -18,7 +18,6 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_path_override.h" #include "base/test/task_environment.h"
diff --git a/components/component_updater/component_updater_service_unittest.cc b/components/component_updater/component_updater_service_unittest.cc index c400126..d77bc9c 100644 --- a/components/component_updater/component_updater_service_unittest.cc +++ b/components/component_updater/component_updater_service_unittest.cc
@@ -18,7 +18,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/component_updater/crl_set_remover.cc b/components/component_updater/crl_set_remover.cc index 3d5713e0..cc913e3 100644 --- a/components/component_updater/crl_set_remover.cc +++ b/components/component_updater/crl_set_remover.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" namespace component_updater {
diff --git a/components/component_updater/installer_policies/autofill_states_component_installer.cc b/components/component_updater/installer_policies/autofill_states_component_installer.cc index f449785..aa6da96 100644 --- a/components/component_updater/installer_policies/autofill_states_component_installer.cc +++ b/components/component_updater/installer_policies/autofill_states_component_installer.cc
@@ -9,7 +9,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/ranges/algorithm.h" -#include "base/task/post_task.h" #include "components/autofill/core/browser/geo/country_data.h" #include "components/autofill/core/common/autofill_prefs.h" #include "components/component_updater/component_updater_service.h"
diff --git a/components/component_updater/installer_policies/optimization_hints_component_installer.cc b/components/component_updater/installer_policies/optimization_hints_component_installer.cc index 38050bf5..4544402 100644 --- a/components/component_updater/installer_policies/optimization_hints_component_installer.cc +++ b/components/component_updater/installer_policies/optimization_hints_component_installer.cc
@@ -12,7 +12,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/version.h" #include "components/component_updater/component_updater_paths.h" #include "components/optimization_guide/core/optimization_guide_constants.h"
diff --git a/components/component_updater/installer_policies/safety_tips_component_installer.cc b/components/component_updater/installer_policies/safety_tips_component_installer.cc index 3cd8afb..e9530d54 100644 --- a/components/component_updater/installer_policies/safety_tips_component_installer.cc +++ b/components/component_updater/installer_policies/safety_tips_component_installer.cc
@@ -12,7 +12,6 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/reputation/core/safety_tips.pb.h" #include "components/reputation/core/safety_tips_config.h"
diff --git a/components/component_updater/installer_policies/trust_token_key_commitments_component_installer_policy.cc b/components/component_updater/installer_policies/trust_token_key_commitments_component_installer_policy.cc index b10900ae..888c6dd 100644 --- a/components/component_updater/installer_policies/trust_token_key_commitments_component_installer_policy.cc +++ b/components/component_updater/installer_policies/trust_token_key_commitments_component_installer_policy.cc
@@ -17,7 +17,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/version.h" #include "components/component_updater/component_updater_paths.h"
diff --git a/components/consent_auditor/consent_auditor_impl_unittest.cc b/components/consent_auditor/consent_auditor_impl_unittest.cc index 0a48200..d9a8cce7 100644 --- a/components/consent_auditor/consent_auditor_impl_unittest.cc +++ b/components/consent_auditor/consent_auditor_impl_unittest.cc
@@ -13,6 +13,7 @@ #include "base/memory/weak_ptr.h" #include "base/test/simple_test_clock.h" #include "base/time/default_clock.h" +#include "base/time/time.h" #include "components/consent_auditor/pref_names.h" #include "components/prefs/testing_pref_service.h" #include "components/sync/protocol/user_consent_specifics.pb.h"
diff --git a/components/content_capture/browser/content_capture_receiver.cc b/components/content_capture/browser/content_capture_receiver.cc index fc5d965..7c82d61 100644 --- a/components/content_capture/browser/content_capture_receiver.cc +++ b/components/content_capture/browser/content_capture_receiver.cc
@@ -8,7 +8,6 @@ #include "base/json/json_writer.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/values.h" #include "components/content_capture/browser/onscreen_content_provider.h"
diff --git a/components/content_creation/notes/core/templates/template_store.cc b/components/content_creation/notes/core/templates/template_store.cc index a717950..53ba792 100644 --- a/components/content_creation/notes/core/templates/template_store.cc +++ b/components/content_creation/notes/core/templates/template_store.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/containers/flat_map.h" #include "base/rand_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/content_creation/notes/core/templates/template_store_unittest.cc b/components/content_creation/notes/core/templates/template_store_unittest.cc index 8f7eb19..0dca108 100644 --- a/components/content_creation/notes/core/templates/template_store_unittest.cc +++ b/components/content_creation/notes/core/templates/template_store_unittest.cc
@@ -11,6 +11,7 @@ #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/content_creation/notes/core/note_features.h" #include "components/content_creation/notes/core/templates/note_template.h" #include "components/content_creation/notes/core/templates/template_storage.pb.h"
diff --git a/components/content_settings/core/browser/content_settings_rule.h b/components/content_settings/core/browser/content_settings_rule.h index be88530..af18dc1 100644 --- a/components/content_settings/core/browser/content_settings_rule.h +++ b/components/content_settings/core/browser/content_settings_rule.h
@@ -12,6 +12,7 @@ #include "base/compiler_specific.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "base/values.h" #include "components/content_settings/core/common/content_settings_constraints.h" #include "components/content_settings/core/common/content_settings_pattern.h"
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc index b3b5daf..71000d9 100644 --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -20,6 +20,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/components/crash/content/browser/child_process_crash_observer_android.cc b/components/crash/content/browser/child_process_crash_observer_android.cc index 7db457f0..c2df50f 100644 --- a/components/crash/content/browser/child_process_crash_observer_android.cc +++ b/components/crash/content/browser/child_process_crash_observer_android.cc
@@ -6,7 +6,6 @@ #include "base/android/jni_android.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/components/crash/content/browser/crash_handler_host_linux.h b/components/crash/content/browser/crash_handler_host_linux.h index 7490a47e..ba9a20a9 100644 --- a/components/crash/content/browser/crash_handler_host_linux.h +++ b/components/crash/content/browser/crash_handler_host_linux.h
@@ -18,6 +18,7 @@ #include "base/synchronization/atomic_flag.h" #include "base/synchronization/lock.h" #include "base/task/current_thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/components/crash/content/browser/crash_metrics_reporter_android_unittest.cc b/components/crash/content/browser/crash_metrics_reporter_android_unittest.cc index 4c93d035..add54a9 100644 --- a/components/crash/content/browser/crash_metrics_reporter_android_unittest.cc +++ b/components/crash/content/browser/crash_metrics_reporter_android_unittest.cc
@@ -9,7 +9,6 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/cronet/cronet_global_state_stubs.cc b/components/cronet/cronet_global_state_stubs.cc index 9ff771b..a44ca10 100644 --- a/components/cronet/cronet_global_state_stubs.cc +++ b/components/cronet/cronet_global_state_stubs.cc
@@ -8,7 +8,6 @@ #include "base/at_exit.h" #include "base/feature_list.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "net/proxy_resolution/configured_proxy_resolution_service.h"
diff --git a/components/custom_handlers/protocol_handler_registry_unittest.cc b/components/custom_handlers/protocol_handler_registry_unittest.cc index 1b35bdd..58703a4 100644 --- a/components/custom_handlers/protocol_handler_registry_unittest.cc +++ b/components/custom_handlers/protocol_handler_registry_unittest.cc
@@ -14,7 +14,6 @@ #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "components/custom_handlers/pref_names.h" #include "components/custom_handlers/protocol_handler.h"
diff --git a/components/desks_storage/core/local_desk_data_manager.cc b/components/desks_storage/core/local_desk_data_manager.cc index 3eb40c0e..028baf0 100644 --- a/components/desks_storage/core/local_desk_data_manager.cc +++ b/components/desks_storage/core/local_desk_data_manager.cc
@@ -12,7 +12,6 @@ #include "base/json/values_util.h" #include "base/logging.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/values.h"
diff --git a/components/desks_storage/core/local_desks_data_manager_unittests.cc b/components/desks_storage/core/local_desks_data_manager_unittests.cc index 616390c..8a60ba00 100644 --- a/components/desks_storage/core/local_desks_data_manager_unittests.cc +++ b/components/desks_storage/core/local_desks_data_manager_unittests.cc
@@ -13,7 +13,6 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/components/device_event_log/device_event_log_impl_unittest.cc b/components/device_event_log/device_event_log_impl_unittest.cc index cbc700e..4551b242 100644 --- a/components/device_event_log/device_event_log_impl_unittest.cc +++ b/components/device_event_log/device_event_log_impl_unittest.cc
@@ -16,6 +16,7 @@ #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "base/test/test_simple_task_runner.h" +#include "base/time/time.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/discardable_memory/client/client_discardable_shared_memory_manager.cc b/components/discardable_memory/client/client_discardable_shared_memory_manager.cc index cb84090..0d90663f 100644 --- a/components/discardable_memory/client/client_discardable_shared_memory_manager.cc +++ b/components/discardable_memory/client/client_discardable_shared_memory_manager.cc
@@ -20,6 +20,7 @@ #include "base/synchronization/waitable_event.h" #include "base/system/sys_info.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h"
diff --git a/components/discardable_memory/common/discardable_shared_memory_heap_perftest.cc b/components/discardable_memory/common/discardable_shared_memory_heap_perftest.cc index 24c0c25..752d157 100644 --- a/components/discardable_memory/common/discardable_shared_memory_heap_perftest.cc +++ b/components/discardable_memory/common/discardable_shared_memory_heap_perftest.cc
@@ -15,6 +15,7 @@ #include "base/callback_helpers.h" #include "base/memory/discardable_shared_memory.h" #include "base/memory/page_size.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/perf/perf_result_reporter.h"
diff --git a/components/discardable_memory/service/discardable_shared_memory_manager_unittest.cc b/components/discardable_memory/service/discardable_shared_memory_manager_unittest.cc index 6b5cd54e..9f5331a 100644 --- a/components/discardable_memory/service/discardable_shared_memory_manager_unittest.cc +++ b/components/discardable_memory/service/discardable_shared_memory_manager_unittest.cc
@@ -12,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" #include "base/threading/simple_thread.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace discardable_memory {
diff --git a/components/dom_distiller/standalone/content_extractor_browsertest.cc b/components/dom_distiller/standalone/content_extractor_browsertest.cc index bfb0595..116fc6f6 100644 --- a/components/dom_distiller/standalone/content_extractor_browsertest.cc +++ b/components/dom_distiller/standalone/content_extractor_browsertest.cc
@@ -19,7 +19,6 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/domain_reliability/context_unittest.cc b/components/domain_reliability/context_unittest.cc index 49f4028..c9cd3a2 100644 --- a/components/domain_reliability/context_unittest.cc +++ b/components/domain_reliability/context_unittest.cc
@@ -16,6 +16,7 @@ #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "base/test/metrics/histogram_tester.h" +#include "base/time/time.h" #include "components/domain_reliability/beacon.h" #include "components/domain_reliability/dispatcher.h" #include "components/domain_reliability/scheduler.h"
diff --git a/components/domain_reliability/test_util.h b/components/domain_reliability/test_util.h index 988f079..770382d0 100644 --- a/components/domain_reliability/test_util.h +++ b/components/domain_reliability/test_util.h
@@ -10,6 +10,7 @@ #include "base/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "components/domain_reliability/config.h" #include "components/domain_reliability/scheduler.h" #include "components/domain_reliability/uploader.h"
diff --git a/components/domain_reliability/util_unittest.cc b/components/domain_reliability/util_unittest.cc index 1a9e99ec..e583fc3 100644 --- a/components/domain_reliability/util_unittest.cc +++ b/components/domain_reliability/util_unittest.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/location.h" +#include "base/time/time.h" #include "components/domain_reliability/test_util.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/download/database/download_db_conversions.cc b/components/download/database/download_db_conversions.cc index 0cebdf3..fb15060 100644 --- a/components/download/database/download_db_conversions.cc +++ b/components/download/database/download_db_conversions.cc
@@ -8,6 +8,7 @@ #include "base/notreached.h" #include "base/pickle.h" +#include "base/time/time.h" #include "components/download/public/common/download_features.h" #include "services/network/public/mojom/fetch_api.mojom-shared.h"
diff --git a/components/download/database/download_db_conversions_unittest.cc b/components/download/database/download_db_conversions_unittest.cc index 3257f196..836f0f94 100644 --- a/components/download/database/download_db_conversions_unittest.cc +++ b/components/download/database/download_db_conversions_unittest.cc
@@ -5,6 +5,7 @@ #include "components/download/database/download_db_conversions.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "components/download/public/common/download_features.h" #include "components/download/public/common/download_schedule.h" #include "components/download/public/common/download_url_parameters.h"
diff --git a/components/download/database/download_db_impl.cc b/components/download/database/download_db_impl.cc index 45ea539..9997bfc 100644 --- a/components/download/database/download_db_impl.cc +++ b/components/download/database/download_db_impl.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/download/database/download_db_conversions.h" #include "components/download/database/download_db_entry.h"
diff --git a/components/download/database/in_progress/in_progress_info.h b/components/download/database/in_progress/in_progress_info.h index bcdb210..dae08c30 100644 --- a/components/download/database/in_progress/in_progress_info.h +++ b/components/download/database/in_progress/in_progress_info.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/time/time.h" #include "components/download/public/common/download_danger_type.h" #include "components/download/public/common/download_item.h" #include "components/download/public/common/download_item_rename_progress_update.h"
diff --git a/components/download/internal/background_service/controller_impl.cc b/components/download/internal/background_service/controller_impl.cc index 4a655b85..5e39f54e 100644 --- a/components/download/internal/background_service/controller_impl.cc +++ b/components/download/internal/background_service/controller_impl.cc
@@ -12,6 +12,7 @@ #include "base/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/memory_allocator_dump.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/memory_usage_estimator.h"
diff --git a/components/download/internal/background_service/file_monitor_impl.h b/components/download/internal/background_service/file_monitor_impl.h index 1a8956e..fd7714e 100644 --- a/components/download/internal/background_service/file_monitor_impl.h +++ b/components/download/internal/background_service/file_monitor_impl.h
@@ -15,6 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "components/download/internal/background_service/driver_entry.h" #include "components/download/internal/background_service/model.h" #include "components/download/internal/background_service/stats.h"
diff --git a/components/download/internal/background_service/in_memory_download.h b/components/download/internal/background_service/in_memory_download.h index b4b7938..d1fcb0c 100644 --- a/components/download/internal/background_service/in_memory_download.h +++ b/components/download/internal/background_service/in_memory_download.h
@@ -14,6 +14,7 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "components/download/internal/background_service/blob_task_proxy.h" #include "components/download/public/background_service/blob_context_getter_factory.h" #include "components/download/public/background_service/download_params.h"
diff --git a/components/download/internal/background_service/in_memory_download_unittest.cc b/components/download/internal/background_service/in_memory_download_unittest.cc index 607e8eb7..d52abab 100644 --- a/components/download/internal/background_service/in_memory_download_unittest.cc +++ b/components/download/internal/background_service/in_memory_download_unittest.cc
@@ -13,6 +13,7 @@ #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/base/io_buffer.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" #include "services/network/public/mojom/url_response_head.mojom.h"
diff --git a/components/download/internal/background_service/ios/background_download_service_impl.h b/components/download/internal/background_service/ios/background_download_service_impl.h index bed41b5..19a0f6d 100644 --- a/components/download/internal/background_service/ios/background_download_service_impl.h +++ b/components/download/internal/background_service/ios/background_download_service_impl.h
@@ -12,6 +12,7 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "components/download/internal/background_service/initializable_background_download_service.h" #include "components/download/internal/background_service/log_source.h" #include "components/download/internal/background_service/model_impl.h"
diff --git a/components/download/internal/background_service/navigation_monitor_impl.h b/components/download/internal/background_service/navigation_monitor_impl.h index e64a78a9..0f3a089 100644 --- a/components/download/internal/background_service/navigation_monitor_impl.h +++ b/components/download/internal/background_service/navigation_monitor_impl.h
@@ -8,6 +8,7 @@ #include "base/cancelable_callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/download/public/background_service/navigation_monitor.h" namespace download {
diff --git a/components/download/internal/background_service/scheduler/battery_status_listener_impl.h b/components/download/internal/background_service/scheduler/battery_status_listener_impl.h index 9f5e350..57b83f1 100644 --- a/components/download/internal/background_service/scheduler/battery_status_listener_impl.h +++ b/components/download/internal/background_service/scheduler/battery_status_listener_impl.h
@@ -7,6 +7,7 @@ #include "base/memory/raw_ptr.h" #include "base/power_monitor/power_monitor.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/download/internal/background_service/scheduler/battery_status_listener.h"
diff --git a/components/download/internal/background_service/scheduler/device_status_listener.h b/components/download/internal/background_service/scheduler/device_status_listener.h index 3dee1d6..2ca0699 100644 --- a/components/download/internal/background_service/scheduler/device_status_listener.h +++ b/components/download/internal/background_service/scheduler/device_status_listener.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/download/internal/background_service/scheduler/battery_status_listener.h" #include "components/download/internal/background_service/scheduler/device_status.h"
diff --git a/components/download/internal/background_service/scheduler/device_status_listener_unittest.cc b/components/download/internal/background_service/scheduler/device_status_listener_unittest.cc index 799798e..81f54f0 100644 --- a/components/download/internal/background_service/scheduler/device_status_listener_unittest.cc +++ b/components/download/internal/background_service/scheduler/device_status_listener_unittest.cc
@@ -10,6 +10,7 @@ #include "base/run_loop.h" #include "base/test/power_monitor_test.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/download/internal/background_service/scheduler/battery_status_listener_impl.h" #include "components/download/network/network_status_listener_impl.h"
diff --git a/components/download/internal/common/download_file_impl.cc b/components/download/internal/common/download_file_impl.cc index fd951fbc..f89dc2f 100644 --- a/components/download/internal/common/download_file_impl.cc +++ b/components/download/internal/common/download_file_impl.cc
@@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/components/download/internal/common/download_item_impl_unittest.cc b/components/download/internal/common/download_item_impl_unittest.cc index 0420d31..322151c 100644 --- a/components/download/internal/common/download_item_impl_unittest.cc +++ b/components/download/internal/common/download_item_impl_unittest.cc
@@ -25,6 +25,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/download/public/common/download_create_info.h" #include "components/download/public/common/download_destination_observer.h"
diff --git a/components/download/internal/common/download_path_reservation_tracker.cc b/components/download/internal/common/download_path_reservation_tracker.cc index 2457a91f..16f6db24 100644 --- a/components/download/internal/common/download_path_reservation_tracker.cc +++ b/components/download/internal/common/download_path_reservation_tracker.cc
@@ -20,7 +20,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/task/lazy_thread_pool_task_runner.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/third_party/icu/icu_utf.h"
diff --git a/components/download/internal/common/in_progress_download_manager.cc b/components/download/internal/common/in_progress_download_manager.cc index 33440613..bab233a 100644 --- a/components/download/internal/common/in_progress_download_manager.cc +++ b/components/download/internal/common/in_progress_download_manager.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/containers/contains.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "components/download/database/download_db_entry.h"
diff --git a/components/download/internal/common/rate_estimator.cc b/components/download/internal/common/rate_estimator.cc index 1016540..5cd0cb4 100644 --- a/components/download/internal/common/rate_estimator.cc +++ b/components/download/internal/common/rate_estimator.cc
@@ -5,6 +5,7 @@ #include "components/download/public/common/rate_estimator.h" #include "base/check.h" +#include "base/time/time.h" using base::TimeTicks;
diff --git a/components/download/internal/common/rate_estimator_unittest.cc b/components/download/internal/common/rate_estimator_unittest.cc index 67a8820b..275e716 100644 --- a/components/download/internal/common/rate_estimator_unittest.cc +++ b/components/download/internal/common/rate_estimator_unittest.cc
@@ -4,9 +4,9 @@ #include "components/download/public/common/rate_estimator.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" - namespace download { TEST(RateEstimatorTest, RateEstimator) {
diff --git a/components/download/internal/common/stream_handle_input_stream.cc b/components/download/internal/common/stream_handle_input_stream.cc index d694991..07af898 100644 --- a/components/download/internal/common/stream_handle_input_stream.cc +++ b/components/download/internal/common/stream_handle_input_stream.cc
@@ -5,7 +5,6 @@ #include "components/download/public/common/stream_handle_input_stream.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "components/download/public/common/download_interrupt_reasons_utils.h" #include "components/download/public/common/download_utils.h" #include "mojo/public/c/system/types.h"
diff --git a/components/download/public/background_service/basic_task_scheduler.cc b/components/download/public/background_service/basic_task_scheduler.cc index e8ed3660..c55fea5 100644 --- a/components/download/public/background_service/basic_task_scheduler.cc +++ b/components/download/public/background_service/basic_task_scheduler.cc
@@ -5,7 +5,6 @@ #include "components/download/public/background_service/basic_task_scheduler.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/download/public/background_service/test/test_download_service.cc b/components/download/public/background_service/test/test_download_service.cc index 18e8a4a1..b09e401 100644 --- a/components/download/public/background_service/test/test_download_service.cc +++ b/components/download/public/background_service/test/test_download_service.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/no_destructor.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/download/public/background_service/background_download_service.h" #include "components/download/public/background_service/client.h" #include "components/download/public/background_service/download_metadata.h"
diff --git a/components/download/public/common/auto_resumption_handler_unittest.cc b/components/download/public/common/auto_resumption_handler_unittest.cc index 12a64d47..740da9a 100644 --- a/components/download/public/common/auto_resumption_handler_unittest.cc +++ b/components/download/public/common/auto_resumption_handler_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/simple_test_clock.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/download/network/network_status_listener_impl.h" #include "components/download/public/common/download_schedule.h" #include "components/download/public/common/mock_download_item.h"
diff --git a/components/drive/service/fake_drive_service_unittest.cc b/components/drive/service/fake_drive_service_unittest.cc index 60c5c6f..1b976be 100644 --- a/components/drive/service/fake_drive_service_unittest.cc +++ b/components/drive/service/fake_drive_service_unittest.cc
@@ -20,6 +20,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/drive/file_system_core_util.h" #include "components/drive/service/test_util.h" #include "google_apis/common/test_util.h"
diff --git a/components/embedder_support/android/metrics/memory_metrics_logger.cc b/components/embedder_support/android/metrics/memory_metrics_logger.cc index a131d81..e13eafa 100644 --- a/components/embedder_support/android/metrics/memory_metrics_logger.cc +++ b/components/embedder_support/android/metrics/memory_metrics_logger.cc
@@ -9,7 +9,6 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/components/embedder_support/android/util/android_stream_reader_url_loader.cc b/components/embedder_support/android/util/android_stream_reader_url_loader.cc index df4747d..7b709de2 100644 --- a/components/embedder_support/android/util/android_stream_reader_url_loader.cc +++ b/components/embedder_support/android/util/android_stream_reader_url_loader.cc
@@ -14,7 +14,6 @@ #include "base/callback.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/enterprise/browser/controller/browser_dm_token_storage.cc b/components/enterprise/browser/controller/browser_dm_token_storage.cc index ac565293..58f2898 100644 --- a/components/enterprise/browser/controller/browser_dm_token_storage.cc +++ b/components/enterprise/browser/controller/browser_dm_token_storage.cc
@@ -18,7 +18,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/syslog_logging.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/enterprise/browser/controller/chrome_browser_cloud_management_controller.cc b/components/enterprise/browser/controller/chrome_browser_cloud_management_controller.cc index 7c11179..e76df99 100644 --- a/components/enterprise/browser/controller/chrome_browser_cloud_management_controller.cc +++ b/components/enterprise/browser/controller/chrome_browser_cloud_management_controller.cc
@@ -14,7 +14,6 @@ #include "base/notreached.h" #include "base/observer_list.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h"
diff --git a/components/enterprise/browser/controller/fake_browser_dm_token_storage.cc b/components/enterprise/browser/controller/fake_browser_dm_token_storage.cc index 90e7cce..774b532 100644 --- a/components/enterprise/browser/controller/fake_browser_dm_token_storage.cc +++ b/components/enterprise/browser/controller/fake_browser_dm_token_storage.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "components/enterprise/browser/enterprise_switches.h"
diff --git a/components/enterprise/browser/reporting/report_scheduler.cc b/components/enterprise/browser/reporting/report_scheduler.cc index 945dea00..8e7fba0 100644 --- a/components/enterprise/browser/reporting/report_scheduler.cc +++ b/components/enterprise/browser/reporting/report_scheduler.cc
@@ -11,7 +11,6 @@ #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "base/syslog_logging.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/components/exo/buffer.h b/components/exo/buffer.h index 43efbfa..eafbf70 100644 --- a/components/exo/buffer.h +++ b/components/exo/buffer.h
@@ -12,6 +12,7 @@ #include "base/containers/flat_map.h" #include "base/files/file_descriptor_watcher_posix.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/exo/protected_native_pixmap_query_delegate.h" #include "components/viz/common/resources/transferable_resource.h" #include "media/media_buildflags.h"
diff --git a/components/exo/data_offer.cc b/components/exo/data_offer.cc index e9895978..06413f34 100644 --- a/components/exo/data_offer.cc +++ b/components/exo/data_offer.cc
@@ -18,7 +18,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/chromeos_buildflags.h" #include "components/exo/data_device.h"
diff --git a/components/exo/data_source.cc b/components/exo/data_source.cc index d30848dd..7e0857a 100644 --- a/components/exo/data_source.cc +++ b/components/exo/data_source.cc
@@ -14,7 +14,6 @@ #include "base/posix/eintr_wrapper.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/exo/data_source_delegate.h" #include "components/exo/data_source_observer.h"
diff --git a/components/exo/keyboard.h b/components/exo/keyboard.h index 6e339b8..8912b51f 100644 --- a/components/exo/keyboard.h +++ b/components/exo/keyboard.h
@@ -11,6 +11,7 @@ #include "ash/public/cpp/keyboard/keyboard_controller_observer.h" #include "base/containers/flat_map.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "components/exo/key_state.h" #include "components/exo/keyboard_observer.h" #include "components/exo/seat_observer.h"
diff --git a/components/exo/seat.cc b/components/exo/seat.cc index f141559..08354790 100644 --- a/components/exo/seat.cc +++ b/components/exo/seat.cc
@@ -14,7 +14,6 @@ #include "base/memory/weak_ptr.h" #include "base/pickle.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "build/chromeos_buildflags.h" #include "components/exo/data_exchange_delegate.h" #include "components/exo/data_source.h"
diff --git a/components/exo/surface.h b/components/exo/surface.h index 63d711a..fc7e2b6 100644 --- a/components/exo/surface.h +++ b/components/exo/surface.h
@@ -13,6 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "build/chromeos_buildflags.h" #include "cc/base/region.h" #include "components/exo/buffer.h"
diff --git a/components/exo/surface_unittest.cc b/components/exo/surface_unittest.cc index 7fdeb1f..78795d2 100644 --- a/components/exo/surface_unittest.cc +++ b/components/exo/surface_unittest.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "components/exo/buffer.h" #include "components/exo/shell_surface.h" #include "components/exo/sub_surface.h"
diff --git a/components/exo/text_input.cc b/components/exo/text_input.cc index 7bb90d90..54acd30 100644 --- a/components/exo/text_input.cc +++ b/components/exo/text_input.cc
@@ -31,6 +31,17 @@ return window->GetHost()->GetInputMethod(); } +ui::CompositionText GenerateCompositionTextFrom( + const std::u16string& surrounding_text, + const gfx::Range& composition_range, + const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { + ui::CompositionText composition; + composition.text = surrounding_text.substr(composition_range.GetMin(), + composition_range.length()); + composition.ime_text_spans = ui_ime_text_spans; + return composition; +} + } // namespace TextInput::TextInput(std::unique_ptr<Delegate> delegate) @@ -71,7 +82,7 @@ } void TextInput::Reset() { - composition_ = ui::CompositionText(); + ResetCompositionTextCache(); if (input_method_) input_method_->CancelComposition(this); } @@ -113,6 +124,17 @@ void TextInput::SetCompositionText(const ui::CompositionText& composition) { composition_ = composition; + // Identify the starting index of the current composition. If a composition + // range has been set previously, then use it's starting index, otherwise + // use the current cursor position as the start of the composition. If the + // user has a selection, then we can assume the min value of the cursor_pos + // range as the start of the composition, as the selection will be replaced + // by the composition text being set. + uint32_t composition_start = composition_range_.IsValid() + ? composition_range_.GetMin() + : cursor_pos_.GetMin(); + composition_range_ = gfx::Range(composition_start, + composition_start + composition.text.size()); delegate_->SetCompositionText(composition); } @@ -125,14 +147,14 @@ const uint32_t composition_text_length = static_cast<uint32_t>(composition_.text.length()); delegate_->Commit(composition_.text); - composition_ = ui::CompositionText(); + ResetCompositionTextCache(); return composition_text_length; } void TextInput::ClearCompositionText() { if (composition_.text.empty()) return; - composition_ = ui::CompositionText(); + ResetCompositionTextCache(); delegate_->SetCompositionText(composition_); } @@ -140,7 +162,7 @@ InsertTextCursorBehavior cursor_behavior) { // TODO(crbug.com/1155331): Handle |cursor_behavior| correctly. delegate_->Commit(text); - composition_ = ui::CompositionText(); + ResetCompositionTextCache(); } void TextInput::InsertChar(const ui::KeyEvent& event) { @@ -201,22 +223,18 @@ if (!cursor_pos_.IsValid()) return false; range->set_start(0); - if (composition_.text.empty()) { - range->set_end(surrounding_text_.size()); - } else { - range->set_end(surrounding_text_.size() - cursor_pos_.length() + - composition_.text.size()); - } + range->set_end(surrounding_text_.size()); return true; } bool TextInput::GetCompositionTextRange(gfx::Range* range) const { - if (!cursor_pos_.IsValid() || composition_.text.empty()) - return false; + DCHECK(range); + if (composition_range_.IsValid()) { + *range = composition_range_; + return true; + } - range->set_start(cursor_pos_.start()); - range->set_end(cursor_pos_.start() + composition_.text.size()); - return true; + return false; } bool TextInput::GetEditableSelectionRange(gfx::Range* range) const { @@ -246,34 +264,7 @@ gfx::Range text_range; if (!GetTextRange(&text_range) || !text_range.Contains(range)) return false; - if (composition_.text.empty() || range.GetMax() <= cursor_pos_.GetMin()) { - text->assign(surrounding_text_, range.GetMin(), range.length()); - return true; - } - size_t composition_end = cursor_pos_.GetMin() + composition_.text.size(); - if (range.GetMin() >= composition_end) { - size_t start = - range.GetMin() - composition_.text.size() + cursor_pos_.length(); - text->assign(surrounding_text_, start, range.length()); - return true; - } - - size_t start_in_composition = 0; - if (range.GetMin() <= cursor_pos_.GetMin()) { - text->assign(surrounding_text_, range.GetMin(), - cursor_pos_.GetMin() - range.GetMin()); - } else { - start_in_composition = range.GetMin() - cursor_pos_.GetMin(); - } - if (range.GetMax() <= composition_end) { - text->append(composition_.text, start_in_composition, - range.GetMax() - cursor_pos_.GetMin() - start_in_composition); - } else { - text->append(composition_.text, start_in_composition, - composition_.text.size() - start_in_composition); - text->append(surrounding_text_, cursor_pos_.GetMax(), - range.GetMax() - composition_end); - } + text->assign(surrounding_text_.substr(range.GetMin(), range.length())); return true; } @@ -342,6 +333,10 @@ return false; } + composition_ = + GenerateCompositionTextFrom(surrounding_text_, range, ui_ime_text_spans); + composition_range_.set_start(range.GetMin()); + composition_range_.set_end(range.GetMax()); delegate_->SetCompositionFromExistingText(surrounding_text_, cursor_pos_, range, ui_ime_text_spans); return true; @@ -444,4 +439,9 @@ delegate_->Deactivated(); } +void TextInput::ResetCompositionTextCache() { + composition_ = ui::CompositionText(); + composition_range_ = gfx::Range::InvalidRange(); +} + } // namespace exo
diff --git a/components/exo/text_input.h b/components/exo/text_input.h index f735690..2f7b1806 100644 --- a/components/exo/text_input.h +++ b/components/exo/text_input.h
@@ -183,6 +183,7 @@ private: void AttachInputMethod(aura::Window* window); void DetachInputMethod(); + void ResetCompositionTextCache(); // Delegate to talk to actual its client. std::unique_ptr<Delegate> delegate_; @@ -214,6 +215,9 @@ // the client. Maybe "invalid" value, if not available. gfx::Range cursor_pos_ = gfx::Range::InvalidRange(); + // Cache of the current composition range (set in absolute indices). + gfx::Range composition_range_ = gfx::Range::InvalidRange(); + // Cache of the current composition, updated from Chrome OS IME. ui::CompositionText composition_;
diff --git a/components/exo/text_input_unittest.cc b/components/exo/text_input_unittest.cc index 354ad3f..1678def 100644 --- a/components/exo/text_input_unittest.cc +++ b/components/exo/text_input_unittest.cc
@@ -26,6 +26,16 @@ namespace { +ui::CompositionText GenerateCompositionText(const std::u16string& text) { + ui::CompositionText t; + t.text = text; + t.selection = gfx::Range(1u); + t.ime_text_spans.push_back( + ui::ImeTextSpan(ui::ImeTextSpan::Type::kComposition, 0, t.text.size(), + ui::ImeTextSpan::Thickness::kThick)); + return t; +} + class MockTextInputDelegate : public TextInput::Delegate { public: MockTextInputDelegate() = default; @@ -138,12 +148,7 @@ } void SetCompositionText(const std::u16string& utf16) { - ui::CompositionText t; - t.text = utf16; - t.selection = gfx::Range(1u); - t.ime_text_spans.push_back( - ui::ImeTextSpan(ui::ImeTextSpan::Type::kComposition, 0, t.text.size(), - ui::ImeTextSpan::Thickness::kThick)); + ui::CompositionText t = GenerateCompositionText(utf16); EXPECT_CALL(*delegate(), SetCompositionText(t)).Times(1); text_input()->SetCompositionText(t); } @@ -320,6 +325,7 @@ // Second call should be the empty commit string. EXPECT_EQ(0u, text_input()->ConfirmCompositionText(/*keep_selection=*/false)); + EXPECT_FALSE(text_input()->HasCompositionText()); } TEST_F(TextInputTest, ResetCompositionText) { @@ -327,6 +333,7 @@ text_input()->Reset(); EXPECT_EQ(0u, text_input()->ConfirmCompositionText(/*keep_selection=*/false)); + EXPECT_FALSE(text_input()->HasCompositionText()); } TEST_F(TextInputTest, Commit) { @@ -403,29 +410,21 @@ SetCompositionText(u"composition"); EXPECT_TRUE(text_input()->GetCompositionTextRange(&range)); EXPECT_EQ(gfx::Range(11, 11 + composition_size).ToString(), range.ToString()); - EXPECT_TRUE(text_input()->GetTextRange(&range)); - EXPECT_EQ(gfx::Range(0, text.size() - 1 + composition_size).ToString(), - range.ToString()); EXPECT_TRUE(text_input()->GetEditableSelectionRange(&range)); EXPECT_EQ(gfx::Range(11, 12).ToString(), range.ToString()); } -TEST_F(TextInputTest, GetTextRange) { +TEST_F(TextInputTest, GetTextFromRange) { std::u16string text = u"surrounding text"; text_input()->SetSurroundingText(text, gfx::Range(11, 12)); - SetCompositionText(u"composition"); - const struct { gfx::Range range; std::u16string expected; } kTestCases[] = { {gfx::Range(0, 3), u"sur"}, - {gfx::Range(10, 13), u"gco"}, - {gfx::Range(10, 23), u"gcompositiont"}, - {gfx::Range(12, 15), u"omp"}, - {gfx::Range(12, 23), u"ompositiont"}, - {gfx::Range(22, 25), u"tex"}, + {gfx::Range(10, 16), u"g text"}, + {gfx::Range(6, 9), u"ndi"}, }; for (auto& c : kTestCases) { std::u16string result; @@ -482,5 +481,69 @@ testing::Mock::VerifyAndClearExpectations(delegate()); } +TEST_F(TextInputTest, + CompositionRangeSetFromCursorWhenSetCompositionTextCalled) { + text_input()->SetSurroundingText(u"surrounding text", gfx::Range(5, 5)); + + std::u16string composition_text = u"composing"; + SetCompositionText(composition_text); + + gfx::Range composition_range; + EXPECT_TRUE(text_input()->HasCompositionText()); + EXPECT_TRUE(text_input()->GetCompositionTextRange(&composition_range)); + EXPECT_EQ(composition_range, gfx::Range(5, 5 + composition_text.length())); +} + +TEST_F(TextInputTest, + CompositionRangeSetWhenSetCompositionFromExistingTextCalled) { + text_input()->SetSurroundingText(u"surrounding text", gfx::Range(5, 5)); + + text_input()->SetCompositionFromExistingText(gfx::Range(3, 6), + std::vector<ui::ImeTextSpan>{}); + + gfx::Range composition_range; + EXPECT_TRUE(text_input()->HasCompositionText()); + EXPECT_TRUE(text_input()->GetCompositionTextRange(&composition_range)); + EXPECT_EQ(composition_range, gfx::Range(3, 6)); +} + +TEST_F(TextInputTest, CorrectTextReturnedAfterSetCompositionTextCalled) { + gfx::Range cursor_pos = gfx::Range(11, 11); + std::u16string surrounding_text = u"surrounding text"; + std::u16string composition_text = u" and composition"; + + ui::CompositionText t = GenerateCompositionText(composition_text); + EXPECT_CALL(*delegate(), SetCompositionText) + .WillOnce( + testing::Invoke([this, cursor_pos, surrounding_text, + composition_text](const ui::CompositionText& t) { + EXPECT_EQ(t.text, composition_text); + // Simulate surrounding text update from wayland. + auto before = surrounding_text.substr(0, cursor_pos.GetMin()); + auto after = surrounding_text.substr(cursor_pos.GetMin()); + auto new_surrounding = before + t.text + after; + auto new_cursor_pos = cursor_pos.GetMin() + t.text.length(); + text_input()->SetSurroundingText( + new_surrounding, gfx::Range(new_cursor_pos, new_cursor_pos)); + })); + + text_input()->SetSurroundingText(surrounding_text, cursor_pos); + text_input()->SetCompositionText(t); + + gfx::Range text_range; + std::u16string text; + EXPECT_TRUE(text_input()->GetTextRange(&text_range)); + EXPECT_TRUE(text_input()->GetTextFromRange(text_range, &text)); + EXPECT_EQ(text, u"surrounding and composition text"); + + gfx::Range composing_text_range; + std::u16string composing_text; + EXPECT_TRUE(text_input()->HasCompositionText()); + EXPECT_TRUE(text_input()->GetCompositionTextRange(&composing_text_range)); + EXPECT_TRUE( + text_input()->GetTextFromRange(composing_text_range, &composing_text)); + EXPECT_EQ(composing_text, u" and composition"); +} + } // anonymous namespace } // namespace exo
diff --git a/components/exo/ui_lock_controller.h b/components/exo/ui_lock_controller.h index 4dd96bb8..5601c20b 100644 --- a/components/exo/ui_lock_controller.h +++ b/components/exo/ui_lock_controller.h
@@ -7,6 +7,7 @@ #include "ash/shell.h" #include "base/containers/flat_set.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/exo/seat_observer.h" #include "ui/events/event_handler.h"
diff --git a/components/exo/vsync_timing_manager.h b/components/exo/vsync_timing_manager.h index 275d2d5..82a9790 100644 --- a/components/exo/vsync_timing_manager.h +++ b/components/exo/vsync_timing_manager.h
@@ -9,6 +9,7 @@ #include "ash/frame_throttler/frame_throttling_observer.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" #include "services/viz/privileged/mojom/compositing/vsync_parameter_observer.mojom.h"
diff --git a/components/exo/wayland/fuzzer/server_environment.h b/components/exo/wayland/fuzzer/server_environment.h index 1197e537..d3f009cf 100644 --- a/components/exo/wayland/fuzzer/server_environment.h +++ b/components/exo/wayland/fuzzer/server_environment.h
@@ -7,6 +7,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "components/exo/wayland/clients/test/wayland_client_test_helper.h" #include "ui/aura/env.h"
diff --git a/components/exo/wayland/wp_presentation.cc b/components/exo/wayland/wp_presentation.cc index 58b6ee6..42f6c6e 100644 --- a/components/exo/wayland/wp_presentation.cc +++ b/components/exo/wayland/wp_presentation.cc
@@ -10,6 +10,7 @@ #include <utility> #include "base/bind.h" +#include "base/time/time.h" #include "components/exo/wayland/server_util.h" #include "ui/gfx/presentation_feedback.h"
diff --git a/components/favicon/core/large_icon_service_impl.cc b/components/favicon/core/large_icon_service_impl.cc index 1dc47e6..e0cd625 100644 --- a/components/favicon/core/large_icon_service_impl.cc +++ b/components/favicon/core/large_icon_service_impl.cc
@@ -13,7 +13,6 @@ #include "base/memory/ref_counted.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/favicon/core/large_icon_worker.cc b/components/favicon/core/large_icon_worker.cc index a2d30dc..cbafa51 100644 --- a/components/favicon/core/large_icon_worker.cc +++ b/components/favicon/core/large_icon_worker.cc
@@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/feature_engagement/internal/feature_config_condition_validator_unittest.cc b/components/feature_engagement/internal/feature_config_condition_validator_unittest.cc index bb10b17..87b79923 100644 --- a/components/feature_engagement/internal/feature_config_condition_validator_unittest.cc +++ b/components/feature_engagement/internal/feature_config_condition_validator_unittest.cc
@@ -11,6 +11,7 @@ #include "base/feature_list.h" #include "base/metrics/field_trial.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "components/feature_engagement/internal/availability_model.h" #include "components/feature_engagement/internal/event_model.h" #include "components/feature_engagement/internal/noop_display_lock_controller.h"
diff --git a/components/feature_engagement/internal/tracker_impl_unittest.cc b/components/feature_engagement/internal/tracker_impl_unittest.cc index 0b407e6..6d659c8 100644 --- a/components/feature_engagement/internal/tracker_impl_unittest.cc +++ b/components/feature_engagement/internal/tracker_impl_unittest.cc
@@ -21,6 +21,7 @@ #include "base/test/metrics/user_action_tester.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/feature_engagement/internal/availability_model_impl.h" #include "components/feature_engagement/internal/display_lock_controller.h" #include "components/feature_engagement/internal/editable_configuration.h"
diff --git a/components/feed/core/v2/api_test/feed_api_stream_unittest.cc b/components/feed/core/v2/api_test/feed_api_stream_unittest.cc index ce09170..94d754db 100644 --- a/components/feed/core/v2/api_test/feed_api_stream_unittest.cc +++ b/components/feed/core/v2/api_test/feed_api_stream_unittest.cc
@@ -9,6 +9,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/metrics/user_action_tester.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "components/feed/core/common/pref_names.h" #include "components/feed/core/shared_prefs/pref_names.h" #include "components/feed/core/v2/api_test/feed_api_test.h"
diff --git a/components/feed/core/v2/feed_network_impl.cc b/components/feed/core/v2/feed_network_impl.cc index 938cda66..d1dcea3d 100644 --- a/components/feed/core/v2/feed_network_impl.cc +++ b/components/feed/core/v2/feed_network_impl.cc
@@ -17,7 +17,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h" #include "components/feed/core/common/pref_names.h"
diff --git a/components/feed/core/v2/feed_store.cc b/components/feed/core/v2/feed_store.cc index 070eb8c..51814fd1 100644 --- a/components/feed/core/v2/feed_store.cc +++ b/components/feed/core/v2/feed_store.cc
@@ -16,7 +16,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/feed/core/proto/v2/store.pb.h" #include "components/feed/core/v2/feedstore_util.h"
diff --git a/components/feed/core/v2/feed_stream.h b/components/feed/core/v2/feed_stream.h index 6327fc3..22d8599b 100644 --- a/components/feed/core/v2/feed_stream.h +++ b/components/feed/core/v2/feed_stream.h
@@ -16,6 +16,7 @@ #include "base/observer_list.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" +#include "base/time/time.h" #include "base/version.h" #include "components/feed/core/proto/v2/ui.pb.h" #include "components/feed/core/proto/v2/wire/reliability_logging_enums.pb.h"
diff --git a/components/feed/core/v2/tasks/load_more_task.h b/components/feed/core/v2/tasks/load_more_task.h index 8fb6f04..fca156b5 100644 --- a/components/feed/core/v2/tasks/load_more_task.h +++ b/components/feed/core/v2/tasks/load_more_task.h
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/feed/core/proto/v2/store.pb.h" #include "components/feed/core/proto/v2/wire/response.pb.h" #include "components/feed/core/v2/enums.h"
diff --git a/components/feed/core/v2/tasks/load_stream_from_store_task.h b/components/feed/core/v2/tasks/load_stream_from_store_task.h index ab5aedb..9c80be3b92 100644 --- a/components/feed/core/v2/tasks/load_stream_from_store_task.h +++ b/components/feed/core/v2/tasks/load_stream_from_store_task.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/feed/core/proto/v2/wire/reliability_logging_enums.pb.h" #include "components/feed/core/v2/enums.h" #include "components/feed/core/v2/feed_store.h"
diff --git a/components/feed/core/v2/tasks/load_stream_task.h b/components/feed/core/v2/tasks/load_stream_task.h index 6289b81..a2fc09bf 100644 --- a/components/feed/core/v2/tasks/load_stream_task.h +++ b/components/feed/core/v2/tasks/load_stream_task.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/feed/core/proto/v2/wire/reliability_logging_enums.pb.h" #include "components/feed/core/proto/v2/wire/response.pb.h" #include "components/feed/core/v2/enums.h"
diff --git a/components/feed/core/v2/web_feed_subscription_coordinator.cc b/components/feed/core/v2/web_feed_subscription_coordinator.cc index 4812340..a9a9b811 100644 --- a/components/feed/core/v2/web_feed_subscription_coordinator.cc +++ b/components/feed/core/v2/web_feed_subscription_coordinator.cc
@@ -13,7 +13,6 @@ #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h" #include "components/feed/core/common/pref_names.h"
diff --git a/components/feed/core/v2/web_feed_subscriptions/web_feed_index.h b/components/feed/core/v2/web_feed_subscriptions/web_feed_index.h index 82aa1c0..8152b2d 100644 --- a/components/feed/core/v2/web_feed_subscriptions/web_feed_index.h +++ b/components/feed/core/v2/web_feed_subscriptions/web_feed_index.h
@@ -8,6 +8,7 @@ #include <iosfwd> #include "base/strings/string_piece_forward.h" +#include "base/time/time.h" #include "components/feed/core/proto/v2/store.pb.h" #include "components/feed/core/v2/enums.h" #include "components/feed/core/v2/feed_store.h"
diff --git a/components/feedback/feedback_data.cc b/components/feedback/feedback_data.cc index 89e26283..cc22f2b 100644 --- a/components/feedback/feedback_data.cc +++ b/components/feedback/feedback_data.cc
@@ -12,7 +12,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/values.h" #include "components/feedback/feedback_util.h"
diff --git a/components/feedback/feedback_uploader.cc b/components/feedback/feedback_uploader.cc index 3a7e98c..1268231 100644 --- a/components/feedback/feedback_uploader.cc +++ b/components/feedback/feedback_uploader.cc
@@ -8,7 +8,6 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "components/feedback/feedback_report.h"
diff --git a/components/feedback/feedback_uploader_dispatch_unittest.cc b/components/feedback/feedback_uploader_dispatch_unittest.cc index d92d4129..40e3c14 100644 --- a/components/feedback/feedback_uploader_dispatch_unittest.cc +++ b/components/feedback/feedback_uploader_dispatch_unittest.cc
@@ -9,7 +9,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/metrics/field_trial.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/components/feedback/feedback_uploader_unittest.cc b/components/feedback/feedback_uploader_unittest.cc index d7bf425..c4595e0 100644 --- a/components/feedback/feedback_uploader_unittest.cc +++ b/components/feedback/feedback_uploader_unittest.cc
@@ -11,7 +11,6 @@ #include "base/containers/contains.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "base/test/task_environment.h"
diff --git a/components/gcm_driver/gcm_account_tracker.h b/components/gcm_driver/gcm_account_tracker.h index 91d2fd3..3da637f 100644 --- a/components/gcm_driver/gcm_account_tracker.h +++ b/components/gcm_driver/gcm_account_tracker.h
@@ -12,6 +12,7 @@ #include <string> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "components/gcm_driver/account_tracker.h" #include "components/gcm_driver/gcm_client.h" #include "components/gcm_driver/gcm_connection_observer.h"
diff --git a/components/gcm_driver/gcm_account_tracker_unittest.cc b/components/gcm_driver/gcm_account_tracker_unittest.cc index c2ccf55..cbca36d 100644 --- a/components/gcm_driver/gcm_account_tracker_unittest.cc +++ b/components/gcm_driver/gcm_account_tracker_unittest.cc
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "build/chromeos_buildflags.h" #include "components/gcm_driver/fake_gcm_driver.h" #include "components/signin/public/identity_manager/identity_test_environment.h"
diff --git a/components/gcm_driver/gcm_client.h b/components/gcm_driver/gcm_client.h index 4ee187af..51f9c70 100644 --- a/components/gcm_driver/gcm_client.h +++ b/components/gcm_driver/gcm_client.h
@@ -13,6 +13,7 @@ #include <vector> #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "components/gcm_driver/common/gcm_message.h" #include "components/gcm_driver/gcm_activity.h" #include "components/gcm_driver/registration_info.h"
diff --git a/components/gcm_driver/gcm_client_impl.h b/components/gcm_driver/gcm_client_impl.h index c393383a..cb95e95 100644 --- a/components/gcm_driver/gcm_client_impl.h +++ b/components/gcm_driver/gcm_client_impl.h
@@ -18,6 +18,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/gcm_driver/gcm_client.h" #include "components/gcm_driver/gcm_stats_recorder_impl.h"
diff --git a/components/gcm_driver/gcm_client_impl_unittest.cc b/components/gcm_driver/gcm_client_impl_unittest.cc index 9492e91..66bee0f3 100644 --- a/components/gcm_driver/gcm_client_impl_unittest.cc +++ b/components/gcm_driver/gcm_client_impl_unittest.cc
@@ -20,6 +20,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/gcm_driver/features.h" #include "google_apis/gcm/base/fake_encryptor.h"
diff --git a/components/gcm_driver/gcm_driver_desktop.h b/components/gcm_driver/gcm_driver_desktop.h index fc4e500..c67026fd 100644 --- a/components/gcm_driver/gcm_driver_desktop.h +++ b/components/gcm_driver/gcm_driver_desktop.h
@@ -16,6 +16,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/tuple.h" #include "components/gcm_driver/crypto/gcm_decryption_result.h" #include "components/gcm_driver/gcm_client.h"
diff --git a/components/gcm_driver/gcm_driver_desktop_unittest.cc b/components/gcm_driver/gcm_driver_desktop_unittest.cc index 227553c..e8af1f50 100644 --- a/components/gcm_driver/gcm_driver_desktop_unittest.cc +++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc
@@ -19,6 +19,7 @@ #include "base/test/test_simple_task_runner.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/gcm_driver/crypto/gcm_encryption_provider.h" #include "components/gcm_driver/fake_gcm_app_handler.h" #include "components/gcm_driver/fake_gcm_client.h"
diff --git a/components/gcm_driver/gcm_driver_unittest.cc b/components/gcm_driver/gcm_driver_unittest.cc index bcb5aa5..2e4d438 100644 --- a/components/gcm_driver/gcm_driver_unittest.cc +++ b/components/gcm_driver/gcm_driver_unittest.cc
@@ -15,6 +15,7 @@ #include "base/test/test_simple_task_runner.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/gcm_driver/crypto/gcm_decryption_result.h" #include "components/gcm_driver/crypto/gcm_encryption_provider.h" #include "components/gcm_driver/crypto/gcm_encryption_result.h"
diff --git a/components/gcm_driver/instance_id/instance_id_driver_unittest.cc b/components/gcm_driver/instance_id/instance_id_driver_unittest.cc index 0170f49..01d9c7d 100644 --- a/components/gcm_driver/instance_id/instance_id_driver_unittest.cc +++ b/components/gcm_driver/instance_id/instance_id_driver_unittest.cc
@@ -13,6 +13,7 @@ #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/gcm_driver/gcm_buildflags.h" #include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h" #include "components/gcm_driver/instance_id/instance_id.h"
diff --git a/components/grpc_support/test/get_stream_engine.cc b/components/grpc_support/test/get_stream_engine.cc index 91ffac1..634f0090 100644 --- a/components/grpc_support/test/get_stream_engine.cc +++ b/components/grpc_support/test/get_stream_engine.cc
@@ -14,6 +14,7 @@ #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "components/grpc_support/include/bidirectional_stream_c.h" #include "net/base/host_port_pair.h" #include "net/base/network_isolation_key.h"
diff --git a/components/heap_profiling/in_process/heap_profiler_controller.cc b/components/heap_profiling/in_process/heap_profiler_controller.cc index 82f94f1..77e26ad 100644 --- a/components/heap_profiling/in_process/heap_profiler_controller.cc +++ b/components/heap_profiling/in_process/heap_profiler_controller.cc
@@ -17,7 +17,6 @@ #include "base/sampling_heap_profiler/sampling_heap_profiler.h" #include "base/strings/strcat.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h"
diff --git a/components/heavy_ad_intervention/heavy_ad_blocklist_unittest.cc b/components/heavy_ad_intervention/heavy_ad_blocklist_unittest.cc index 14cfacb..d0b80aa 100644 --- a/components/heavy_ad_intervention/heavy_ad_blocklist_unittest.cc +++ b/components/heavy_ad_intervention/heavy_ad_blocklist_unittest.cc
@@ -12,6 +12,7 @@ #include "base/strings/string_number_conversions.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "components/blocklist/opt_out_blocklist/opt_out_blocklist_delegate.h" #include "components/blocklist/opt_out_blocklist/opt_out_store.h" #include "components/heavy_ad_intervention/heavy_ad_features.h"
diff --git a/components/history/core/browser/android/android_history_types.h b/components/history/core/browser/android/android_history_types.h index aea38e0..2a9c0d5 100644 --- a/components/history/core/browser/android/android_history_types.h +++ b/components/history/core/browser/android/android_history_types.h
@@ -10,6 +10,7 @@ #include <map> #include <memory> +#include "base/time/time.h" #include "components/history/core/browser/history_types.h" #include "components/history/core/browser/keyword_id.h"
diff --git a/components/history/core/browser/android/favicon_sql_handler.cc b/components/history/core/browser/android/favicon_sql_handler.cc index 02c4189..818877f 100644 --- a/components/history/core/browser/android/favicon_sql_handler.cc +++ b/components/history/core/browser/android/favicon_sql_handler.cc
@@ -7,6 +7,7 @@ #include "base/check.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" +#include "base/time/time.h" #include "components/favicon/core/favicon_database.h" using base::Time;
diff --git a/components/history/core/browser/android/urls_sql_handler.cc b/components/history/core/browser/android/urls_sql_handler.cc index 0002bad..a85a62e 100644 --- a/components/history/core/browser/android/urls_sql_handler.cc +++ b/components/history/core/browser/android/urls_sql_handler.cc
@@ -5,6 +5,7 @@ #include "components/history/core/browser/android/urls_sql_handler.h" #include "base/logging.h" +#include "base/time/time.h" #include "components/history/core/browser/url_database.h" using base::Time;
diff --git a/components/history/core/browser/android/visit_sql_handler.cc b/components/history/core/browser/android/visit_sql_handler.cc index 6af11f8..05684e4 100644 --- a/components/history/core/browser/android/visit_sql_handler.cc +++ b/components/history/core/browser/android/visit_sql_handler.cc
@@ -7,6 +7,7 @@ #include <stdint.h> #include "base/check.h" +#include "base/time/time.h" #include "components/history/core/browser/url_database.h" #include "components/history/core/browser/visit_database.h"
diff --git a/components/history/core/browser/browsing_history_service.h b/components/history/core/browser/browsing_history_service.h index f4ba912..f9d40b3c 100644 --- a/components/history/core/browser/browsing_history_service.h +++ b/components/history/core/browser/browsing_history_service.h
@@ -20,6 +20,7 @@ #include "base/scoped_observation.h" #include "base/task/cancelable_task_tracker.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/values.h" #include "components/history/core/browser/history_service.h"
diff --git a/components/history/core/browser/browsing_history_service_unittest.cc b/components/history/core/browser/browsing_history_service_unittest.cc index 65dcbf04..e078a96 100644 --- a/components/history/core/browser/browsing_history_service_unittest.cc +++ b/components/history/core/browser/browsing_history_service_unittest.cc
@@ -13,6 +13,7 @@ #include "base/run_loop.h" #include "base/task/cancelable_task_tracker.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "base/timer/mock_timer.h" #include "base/values.h" #include "components/history/core/browser/browsing_history_driver.h"
diff --git a/components/history/core/browser/expire_history_backend_unittest.cc b/components/history/core/browser/expire_history_backend_unittest.cc index 89baee1..7f3b2fd 100644 --- a/components/history/core/browser/expire_history_backend_unittest.cc +++ b/components/history/core/browser/expire_history_backend_unittest.cc
@@ -21,6 +21,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/favicon/core/favicon_database.h" #include "components/history/core/browser/history_backend_client.h" #include "components/history/core/browser/history_backend_notifier.h"
diff --git a/components/history/core/browser/history_backend.h b/components/history/core/browser/history_backend.h index 6bc6d6ea..b98d7182 100644 --- a/components/history/core/browser/history_backend.h +++ b/components/history/core/browser/history_backend.h
@@ -26,6 +26,7 @@ #include "base/supports_user_data.h" #include "base/task/cancelable_task_tracker.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/favicon/core/favicon_backend_delegate.h" #include "components/favicon/core/favicon_database.h"
diff --git a/components/history/core/browser/history_backend_unittest.cc b/components/history/core/browser/history_backend_unittest.cc index 1766c6d..444b3f6 100644 --- a/components/history/core/browser/history_backend_unittest.cc +++ b/components/history/core/browser/history_backend_unittest.cc
@@ -33,6 +33,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/favicon/core/favicon_backend.h" #include "components/favicon_base/favicon_usage_data.h"
diff --git a/components/history/core/browser/history_database.h b/components/history/core/browser/history_database.h index 0f08fe45..f34bf6f 100644 --- a/components/history/core/browser/history_database.h +++ b/components/history/core/browser/history_database.h
@@ -8,6 +8,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/history/core/browser/download_database.h" #include "components/history/core/browser/history_types.h"
diff --git a/components/history/core/browser/history_querying_unittest.cc b/components/history/core/browser/history_querying_unittest.cc index 50e820e91..4df8b80e 100644 --- a/components/history/core/browser/history_querying_unittest.cc +++ b/components/history/core/browser/history_querying_unittest.cc
@@ -16,6 +16,7 @@ #include "base/task/cancelable_task_tracker.h" #include "base/test/bind.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/history/core/browser/history_database_params.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/test/test_history_database.h"
diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc index 05d9a6e..5050317 100644 --- a/components/history/core/browser/history_service.cc +++ b/components/history/core/browser/history_service.cc
@@ -29,7 +29,6 @@ #include "base/metrics/histogram_macros.h" #include "base/observer_list.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/history/core/browser/sync/typed_url_sync_bridge.cc b/components/history/core/browser/sync/typed_url_sync_bridge.cc index 89938f94..fead46e 100644 --- a/components/history/core/browser/sync/typed_url_sync_bridge.cc +++ b/components/history/core/browser/sync/typed_url_sync_bridge.cc
@@ -10,6 +10,7 @@ #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "components/sync/model/metadata_batch.h" #include "components/sync/model/mutable_data_batch.h" #include "components/sync/model/sync_metadata_store_change_list.h"
diff --git a/components/history/core/browser/sync/typed_url_sync_bridge_unittest.cc b/components/history/core/browser/sync/typed_url_sync_bridge_unittest.cc index 4a9b5fd5..d42ab8c 100644 --- a/components/history/core/browser/sync/typed_url_sync_bridge_unittest.cc +++ b/components/history/core/browser/sync/typed_url_sync_bridge_unittest.cc
@@ -14,6 +14,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/history/core/browser/history_backend.h" #include "components/history/core/browser/history_backend_client.h" #include "components/history/core/browser/history_database_params.h"
diff --git a/components/history/core/browser/top_sites_backend.cc b/components/history/core/browser/top_sites_backend.cc index 30e54e53..cb184b5 100644 --- a/components/history/core/browser/top_sites_backend.cc +++ b/components/history/core/browser/top_sites_backend.cc
@@ -16,7 +16,6 @@ #include "base/memory/ref_counted.h" #include "base/metrics/histogram_macros.h" #include "base/task/cancelable_task_tracker.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/history/core/browser/url_database.h b/components/history/core/browser/url_database.h index 882137e..2bbce19 100644 --- a/components/history/core/browser/url_database.h +++ b/components/history/core/browser/url_database.h
@@ -10,6 +10,7 @@ #include <string> #include <vector> +#include "base/time/time.h" #include "components/history/core/browser/keyword_id.h" #include "components/history/core/browser/url_row.h" #include "components/query_parser/query_parser.h"
diff --git a/components/history/core/browser/web_history_service.cc b/components/history/core/browser/web_history_service.cc index ab674df..9e5dba2 100644 --- a/components/history/core/browser/web_history_service.cc +++ b/components/history/core/browser/web_history_service.cc
@@ -17,6 +17,7 @@ #include "base/observer_list.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "base/values.h" #include "components/history/core/browser/history_service_observer.h" #include "components/history/core/browser/web_history_service_observer.h"
diff --git a/components/history/metrics/domain_diversity_reporter.cc b/components/history/metrics/domain_diversity_reporter.cc index 9ede2b3b..c096d0a 100644 --- a/components/history/metrics/domain_diversity_reporter.cc +++ b/components/history/metrics/domain_diversity_reporter.cc
@@ -5,7 +5,6 @@ #include "components/history/metrics/domain_diversity_reporter.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/threading/thread_task_runner_handle.h" #include "components/pref_registry/pref_registry_syncable.h"
diff --git a/components/history_clusters/core/on_device_clustering_backend.h b/components/history_clusters/core/on_device_clustering_backend.h index 4882967..8a7e0b21 100644 --- a/components/history_clusters/core/on_device_clustering_backend.h +++ b/components/history_clusters/core/on_device_clustering_backend.h
@@ -14,6 +14,7 @@ #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" +#include "base/time/time.h" #include "components/history_clusters/core/cluster_finalizer.h" #include "components/history_clusters/core/cluster_processor.h" #include "components/history_clusters/core/clusterer.h"
diff --git a/components/history_clusters/core/on_device_clustering_util.cc b/components/history_clusters/core/on_device_clustering_util.cc index 430d1c0..6a3a2de 100644 --- a/components/history_clusters/core/on_device_clustering_util.cc +++ b/components/history_clusters/core/on_device_clustering_util.cc
@@ -5,6 +5,7 @@ #include "components/history_clusters/core/on_device_clustering_util.h" #include "base/containers/contains.h" +#include "base/time/time.h" #include "components/history_clusters/core/config.h" #include "components/history_clusters/core/history_clusters_util.h" #include "components/history_clusters/core/on_device_clustering_features.h"
diff --git a/components/image_fetcher/core/cache/image_cache.cc b/components/image_fetcher/core/cache/image_cache.cc index 836210a1..75b6beb6 100644 --- a/components/image_fetcher/core/cache/image_cache.cc +++ b/components/image_fetcher/core/cache/image_cache.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/hash/sha1.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/image_fetcher/core/cached_image_fetcher.cc b/components/image_fetcher/core/cached_image_fetcher.cc index 79782c82..9663a97 100644 --- a/components/image_fetcher/core/cached_image_fetcher.cc +++ b/components/image_fetcher/core/cached_image_fetcher.cc
@@ -9,9 +9,9 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "components/image_fetcher/core/cache/image_cache.h" #include "components/image_fetcher/core/image_decoder.h"
diff --git a/components/image_fetcher/core/image_data_fetcher.cc b/components/image_fetcher/core/image_data_fetcher.cc index f6fb8c1d..3c120a0 100644 --- a/components/image_fetcher/core/image_data_fetcher.cc +++ b/components/image_fetcher/core/image_data_fetcher.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "components/image_fetcher/core/image_fetcher_metrics_reporter.h" #include "net/base/data_url.h" #include "net/base/load_flags.h"
diff --git a/components/image_fetcher/ios/ios_image_data_fetcher_wrapper.mm b/components/image_fetcher/ios/ios_image_data_fetcher_wrapper.mm index 1b9ccd3..ad695dd 100644 --- a/components/image_fetcher/ios/ios_image_data_fetcher_wrapper.mm +++ b/components/image_fetcher/ios/ios_image_data_fetcher_wrapper.mm
@@ -6,7 +6,6 @@ #include "base/bind.h" #import "base/ios/ios_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #import "components/image_fetcher/ios/webp_decoder.h" #include "net/http/http_response_headers.h"
diff --git a/components/image_fetcher/ios/ios_image_decoder_impl.mm b/components/image_fetcher/ios/ios_image_decoder_impl.mm index 50e196b..1ceaf70 100644 --- a/components/image_fetcher/ios/ios_image_decoder_impl.mm +++ b/components/image_fetcher/ios/ios_image_decoder_impl.mm
@@ -12,7 +12,6 @@ #include "base/callback.h" #import "base/ios/ios_util.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #import "components/image_fetcher/ios/webp_decoder.h" #include "ios/web/public/thread/web_thread.h"
diff --git a/components/invalidation/impl/fcm_invalidation_service.h b/components/invalidation/impl/fcm_invalidation_service.h index 905eac2..fca1217 100644 --- a/components/invalidation/impl/fcm_invalidation_service.h +++ b/components/invalidation/impl/fcm_invalidation_service.h
@@ -7,6 +7,7 @@ #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "components/invalidation/impl/fcm_invalidation_service_base.h" #include "components/invalidation/public/identity_provider.h"
diff --git a/components/invalidation/impl/fcm_network_handler.cc b/components/invalidation/impl/fcm_network_handler.cc index 540e2d8..4e40373 100644 --- a/components/invalidation/impl/fcm_network_handler.cc +++ b/components/invalidation/impl/fcm_network_handler.cc
@@ -18,7 +18,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "components/gcm_driver/gcm_driver.h" #include "components/gcm_driver/gcm_profile_service.h"
diff --git a/components/invalidation/impl/fcm_network_handler.h b/components/invalidation/impl/fcm_network_handler.h index 986fe401..1a10360 100644 --- a/components/invalidation/impl/fcm_network_handler.h +++ b/components/invalidation/impl/fcm_network_handler.h
@@ -8,6 +8,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/gcm_driver/gcm_app_handler.h" #include "components/gcm_driver/instance_id/instance_id.h"
diff --git a/components/invalidation/impl/fcm_network_handler_unittests.cc b/components/invalidation/impl/fcm_network_handler_unittests.cc index d34a01ff..453c2ca 100644 --- a/components/invalidation/impl/fcm_network_handler_unittests.cc +++ b/components/invalidation/impl/fcm_network_handler_unittests.cc
@@ -16,6 +16,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/test/test_mock_time_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "build/build_config.h" #include "components/gcm_driver/gcm_driver.h"
diff --git a/components/invalidation/public/identity_provider.h b/components/invalidation/public/identity_provider.h index b52eff4..39abe7d 100644 --- a/components/invalidation/public/identity_provider.h +++ b/components/invalidation/public/identity_provider.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/values.h" #include "google_apis/gaia/core_account_id.h" #include "google_apis/gaia/google_service_auth_error.h"
diff --git a/components/language/content/browser/geo_language_provider.cc b/components/language/content/browser/geo_language_provider.cc index a252fbcfd..ab28d4b7 100644 --- a/components/language/content/browser/geo_language_provider.cc +++ b/components/language/content/browser/geo_language_provider.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/memory/singleton.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/components/leveldb_proto/internal/proto_database_impl_unittest.cc b/components/leveldb_proto/internal/proto_database_impl_unittest.cc index 7cee807..b22176e 100644 --- a/components/leveldb_proto/internal/proto_database_impl_unittest.cc +++ b/components/leveldb_proto/internal/proto_database_impl_unittest.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h"
diff --git a/components/leveldb_proto/internal/proto_leveldb_wrapper.cc b/components/leveldb_proto/internal/proto_leveldb_wrapper.cc index 44b477b..8495912b 100644 --- a/components/leveldb_proto/internal/proto_leveldb_wrapper.cc +++ b/components/leveldb_proto/internal/proto_leveldb_wrapper.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/callback_forward.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/leveldb_proto/internal/shared_proto_database.cc b/components/leveldb_proto/internal/shared_proto_database.cc index 5ef93f9d..5776d0d 100644 --- a/components/leveldb_proto/internal/shared_proto_database.cc +++ b/components/leveldb_proto/internal/shared_proto_database.cc
@@ -10,7 +10,6 @@ #include "base/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "components/leveldb_proto/internal/leveldb_database.h"
diff --git a/components/leveldb_proto/internal/shared_proto_database.h b/components/leveldb_proto/internal/shared_proto_database.h index 00fb987..e461aff9 100644 --- a/components/leveldb_proto/internal/shared_proto_database.h +++ b/components/leveldb_proto/internal/shared_proto_database.h
@@ -17,6 +17,7 @@ #include "base/memory/ref_counted.h" #include "base/sequence_checker.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "components/leveldb_proto/internal/proto/shared_db_metadata.pb.h" #include "components/leveldb_proto/internal/shared_proto_database_client.h" #include "components/leveldb_proto/public/proto_database.h"
diff --git a/components/leveldb_proto/public/proto_database_provider.cc b/components/leveldb_proto/public/proto_database_provider.cc index 24c25d4a..7d05a27 100644 --- a/components/leveldb_proto/public/proto_database_provider.cc +++ b/components/leveldb_proto/public/proto_database_provider.cc
@@ -10,7 +10,6 @@ #include "base/files/file_path.h" #include "base/memory/ptr_util.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/leveldb_proto/internal/shared_proto_database.h"
diff --git a/components/leveldb_proto/testing/fake_db.h b/components/leveldb_proto/testing/fake_db.h index 5f5043d..229b1af 100644 --- a/components/leveldb_proto/testing/fake_db.h +++ b/components/leveldb_proto/testing/fake_db.h
@@ -16,7 +16,6 @@ #include "base/check.h" #include "base/files/file_path.h" #include "base/memory/raw_ptr.h" -#include "base/task/post_task.h" #include "base/test/test_simple_task_runner.h" #include "components/leveldb_proto/internal/proto_database_impl.h" #include "components/leveldb_proto/public/proto_database.h"
diff --git a/components/login/secure_module_util_chromeos.cc b/components/login/secure_module_util_chromeos.cc index 68a6099..2a6611863 100644 --- a/components/login/secure_module_util_chromeos.cc +++ b/components/login/secure_module_util_chromeos.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" namespace login {
diff --git a/components/lookalikes/core/lookalike_url_util.cc b/components/lookalikes/core/lookalike_url_util.cc index 040bfa1..db6cf63 100644 --- a/components/lookalikes/core/lookalike_url_util.cc +++ b/components/lookalikes/core/lookalike_url_util.cc
@@ -21,7 +21,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/default_clock.h" #include "base/trace_event/trace_event.h" @@ -1174,4 +1173,4 @@ } } return false; -} \ No newline at end of file +}
diff --git a/components/media_router/browser/logger_impl.h b/components/media_router/browser/logger_impl.h index 49a9696..74eb6ec 100644 --- a/components/media_router/browser/logger_impl.h +++ b/components/media_router/browser/logger_impl.h
@@ -8,6 +8,7 @@ #include "base/containers/circular_deque.h" #include "base/gtest_prod_util.h" #include "base/strings/string_piece_forward.h" +#include "base/time/time.h" #include "components/media_router/common/mojom/logger.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver_set.h"
diff --git a/components/media_router/common/providers/cast/cast_media_source.h b/components/media_router/common/providers/cast/cast_media_source.h index ab4180e..2d4451f 100644 --- a/components/media_router/common/providers/cast/cast_media_source.h +++ b/components/media_router/common/providers/cast/cast_media_source.h
@@ -12,6 +12,7 @@ #include <vector> #include "base/check.h" +#include "base/time/time.h" #include "components/cast_channel/cast_message_util.h" #include "components/cast_channel/cast_socket.h" #include "components/media_router/common/media_source.h"
diff --git a/components/memory_pressure/system_memory_pressure_evaluator_fuchsia.h b/components/memory_pressure/system_memory_pressure_evaluator_fuchsia.h index a783928..422f8bb8 100644 --- a/components/memory_pressure/system_memory_pressure_evaluator_fuchsia.h +++ b/components/memory_pressure/system_memory_pressure_evaluator_fuchsia.h
@@ -9,6 +9,7 @@ #include <lib/fidl/cpp/binding.h> #include "base/sequence_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/memory_pressure/system_memory_pressure_evaluator.h"
diff --git a/components/memory_pressure/system_memory_pressure_evaluator_linux.cc b/components/memory_pressure/system_memory_pressure_evaluator_linux.cc index e74ca0a..cb96fba 100644 --- a/components/memory_pressure/system_memory_pressure_evaluator_linux.cc +++ b/components/memory_pressure/system_memory_pressure_evaluator_linux.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/numerics/safe_conversions.h" #include "base/process/process_metrics.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/memory_pressure/system_memory_pressure_evaluator_linux.h b/components/memory_pressure/system_memory_pressure_evaluator_linux.h index 73d8bcd..aa5033c 100644 --- a/components/memory_pressure/system_memory_pressure_evaluator_linux.h +++ b/components/memory_pressure/system_memory_pressure_evaluator_linux.h
@@ -8,6 +8,7 @@ #include "base/memory/memory_pressure_listener.h" #include "base/process/process_metrics.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/memory_pressure/memory_pressure_voter.h" #include "components/memory_pressure/system_memory_pressure_evaluator.h"
diff --git a/components/metal_util/test_shader.mm b/components/metal_util/test_shader.mm index c83f8953..aefc0dc 100644 --- a/components/metal_util/test_shader.mm +++ b/components/metal_util/test_shader.mm
@@ -16,7 +16,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/crash/core/common/crash_key.h" #include "components/metal_util/device.h"
diff --git a/components/metrics/child_call_stack_profile_collector.h b/components/metrics/child_call_stack_profile_collector.h index 6c3af1fe..4d3040cc 100644 --- a/components/metrics/child_call_stack_profile_collector.h +++ b/components/metrics/child_call_stack_profile_collector.h
@@ -11,6 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "components/metrics/public/mojom/call_stack_profile_collector.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/components/metrics/child_call_stack_profile_collector_unittest.cc b/components/metrics/child_call_stack_profile_collector_unittest.cc index 8f0e147..292bca54 100644 --- a/components/metrics/child_call_stack_profile_collector_unittest.cc +++ b/components/metrics/child_call_stack_profile_collector_unittest.cc
@@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/metrics/cloned_install_detector.cc b/components/metrics/cloned_install_detector.cc index abd59b1a..4e0ca8b 100644 --- a/components/metrics/cloned_install_detector.cc +++ b/components/metrics/cloned_install_detector.cc
@@ -12,7 +12,6 @@ #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/metrics_hashes.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/components/metrics/data_use_tracker_unittest.cc b/components/metrics/data_use_tracker_unittest.cc index c6fcd34..26f7cfed 100644 --- a/components/metrics/data_use_tracker_unittest.cc +++ b/components/metrics/data_use_tracker_unittest.cc
@@ -4,6 +4,7 @@ #include "components/metrics/data_use_tracker.h" +#include "base/time/time.h" #include "components/metrics/metrics_pref_names.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/testing_pref_service.h"
diff --git a/components/metrics/demographics/user_demographics_unittest.cc b/components/metrics/demographics/user_demographics_unittest.cc index 301819f..382fd9d 100644 --- a/components/metrics/demographics/user_demographics_unittest.cc +++ b/components/metrics/demographics/user_demographics_unittest.cc
@@ -6,6 +6,7 @@ #include <utility> +#include "base/time/time.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/metrics_proto/user_demographics.pb.h"
diff --git a/components/metrics/drive_metrics_provider.cc b/components/metrics/drive_metrics_provider.cc index 8c774fd..b3e1db5 100644 --- a/components/metrics/drive_metrics_provider.cc +++ b/components/metrics/drive_metrics_provider.cc
@@ -11,7 +11,6 @@ #include "base/files/file_path.h" #include "base/location.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/components/metrics/file_metrics_provider.cc b/components/metrics/file_metrics_provider.cc index b0bf0bb..5cbae468 100644 --- a/components/metrics/file_metrics_provider.cc +++ b/components/metrics/file_metrics_provider.cc
@@ -21,7 +21,6 @@ #include "base/metrics/persistent_histogram_allocator.h" #include "base/metrics/persistent_memory_allocator.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h"
diff --git a/components/metrics/net/network_metrics_provider.cc b/components/metrics/net/network_metrics_provider.cc index 03b1998..3e84039 100644 --- a/components/metrics/net/network_metrics_provider.cc +++ b/components/metrics/net/network_metrics_provider.cc
@@ -18,7 +18,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h"
diff --git a/components/metrics/persistent_histograms.cc b/components/metrics/persistent_histograms.cc index 7c7d7cb..18953706 100644 --- a/components/metrics/persistent_histograms.cc +++ b/components/metrics/persistent_histograms.cc
@@ -14,7 +14,6 @@ #include "base/metrics/persistent_histogram_allocator.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/components/metrics/single_sample_metrics_factory_impl_unittest.cc b/components/metrics/single_sample_metrics_factory_impl_unittest.cc index 0895421..e767b99 100644 --- a/components/metrics/single_sample_metrics_factory_impl_unittest.cc +++ b/components/metrics/single_sample_metrics_factory_impl_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "components/metrics/single_sample_metrics.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/metrics/stability_metrics_provider_unittest.cc b/components/metrics/stability_metrics_provider_unittest.cc index 49d315e9..563dc0b 100644 --- a/components/metrics/stability_metrics_provider_unittest.cc +++ b/components/metrics/stability_metrics_provider_unittest.cc
@@ -5,6 +5,7 @@ #include "components/metrics/stability_metrics_provider.h" #include "base/test/metrics/histogram_tester.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/metrics/stability_metrics_helper.h" #include "components/prefs/testing_pref_service.h"
diff --git a/components/metrics/structured/external_metrics.cc b/components/metrics/structured/external_metrics.cc index b5a79d5..d9e92fb 100644 --- a/components/metrics/structured/external_metrics.cc +++ b/components/metrics/structured/external_metrics.cc
@@ -11,7 +11,6 @@ #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/metrics/structured/persistent_proto.cc b/components/metrics/structured/persistent_proto.cc index ded0843..9201ba8 100644 --- a/components/metrics/structured/persistent_proto.cc +++ b/components/metrics/structured/persistent_proto.cc
@@ -10,7 +10,6 @@ #include "base/files/important_file_writer.h" #include "base/logging.h" #include "base/rand_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/metrics/structured/recorder.cc b/components/metrics/structured/recorder.cc index 34fdb163..b4a7e05 100644 --- a/components/metrics/structured/recorder.cc +++ b/components/metrics/structured/recorder.cc
@@ -10,7 +10,6 @@ #include "base/feature_list.h" #include "base/no_destructor.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "components/metrics/structured/event_base.h" #include "components/metrics/structured/histogram_util.h" #include "components/metrics/structured/structured_metrics_features.h"
diff --git a/components/metrics/structured/structured_metrics_provider.h b/components/metrics/structured/structured_metrics_provider.h index 4e36569c..e1c64bf 100644 --- a/components/metrics/structured/structured_metrics_provider.h +++ b/components/metrics/structured/structured_metrics_provider.h
@@ -10,6 +10,7 @@ #include "base/files/file_path.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/metrics/metrics_provider.h" #include "components/metrics/structured/event_base.h" #include "components/metrics/structured/key_data.h"
diff --git a/components/mirroring/service/remoting_sender.cc b/components/mirroring/service/remoting_sender.cc index b403629..22ea8e5 100644 --- a/components/mirroring/service/remoting_sender.cc +++ b/components/mirroring/service/remoting_sender.cc
@@ -11,6 +11,7 @@ #include "base/logging.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "media/cast/constants.h" #include "media/cast/sender/sender_encoded_frame.h" #include "media/mojo/common/mojo_data_pipe_read_write.h"
diff --git a/components/mirroring/service/rtp_stream_unittest.cc b/components/mirroring/service/rtp_stream_unittest.cc index 2d6dccac..03130fe 100644 --- a/components/mirroring/service/rtp_stream_unittest.cc +++ b/components/mirroring/service/rtp_stream_unittest.cc
@@ -10,6 +10,7 @@ #include "base/test/mock_callback.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "media/base/video_frame.h" #include "media/cast/cast_config.h" #include "media/cast/cast_environment.h"
diff --git a/components/mirroring/service/session.cc b/components/mirroring/service/session.cc index 68382d70..2495046 100644 --- a/components/mirroring/service/session.cc +++ b/components/mirroring/service/session.cc
@@ -23,7 +23,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h"
diff --git a/components/nacl/browser/nacl_browser.h b/components/nacl/browser/nacl_browser.h index 5ddf530..fda17cd4 100644 --- a/components/nacl/browser/nacl_browser.h +++ b/components/nacl/browser/nacl_browser.h
@@ -13,7 +13,6 @@ #include "base/containers/circular_deque.h" #include "base/containers/lru_cache.h" #include "base/files/file.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc index 3688fad..3763d11 100644 --- a/components/nacl/browser/nacl_process_host.cc +++ b/components/nacl/browser/nacl_process_host.cc
@@ -29,7 +29,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/sys_byteorder.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/nacl/browser/pnacl_host.h b/components/nacl/browser/pnacl_host.h index 5d6671b..493606a 100644 --- a/components/nacl/browser/pnacl_host.h +++ b/components/nacl/browser/pnacl_host.h
@@ -13,7 +13,6 @@ #include "base/callback.h" #include "base/files/file.h" #include "base/memory/raw_ptr.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_checker.h"
diff --git a/components/nacl/loader/nacl_listener.h b/components/nacl/loader/nacl_listener.h index 46489e3..e657f08e 100644 --- a/components/nacl/loader/nacl_listener.h +++ b/components/nacl/loader/nacl_listener.h
@@ -16,6 +16,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/nacl/common/nacl_types.h" #include "components/nacl/loader/nacl_ipc_adapter.h"
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc index 5591480..6d5f972 100644 --- a/components/nacl/renderer/ppb_nacl_private_impl.cc +++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -29,6 +29,7 @@ #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/nacl/common/nacl_host_messages.h" #include "components/nacl/common/nacl_messages.h"
diff --git a/components/net_log/net_export_file_writer.cc b/components/net_log/net_export_file_writer.cc index f0f1cfaa..d3e0659d 100644 --- a/components/net_log/net_export_file_writer.cc +++ b/components/net_log/net_export_file_writer.cc
@@ -16,7 +16,6 @@ #include "base/files/scoped_file.h" #include "base/observer_list.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/components/net_log/net_log_proxy_source_unittest.cc b/components/net_log/net_log_proxy_source_unittest.cc index 2ca91f3e..a548c8a 100644 --- a/components/net_log/net_log_proxy_source_unittest.cc +++ b/components/net_log/net_log_proxy_source_unittest.cc
@@ -9,6 +9,7 @@ #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "net/log/net_log.h" #include "net/log/net_log_with_source.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/no_state_prefetch/browser/no_state_prefetch_contents.cc b/components/no_state_prefetch/browser/no_state_prefetch_contents.cc index bd8589f6..1770f12 100644 --- a/components/no_state_prefetch/browser/no_state_prefetch_contents.cc +++ b/components/no_state_prefetch/browser/no_state_prefetch_contents.cc
@@ -15,7 +15,6 @@ #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "components/no_state_prefetch/browser/no_state_prefetch_contents_delegate.h" #include "components/no_state_prefetch/browser/no_state_prefetch_manager.h"
diff --git a/components/no_state_prefetch/browser/no_state_prefetch_utils.cc b/components/no_state_prefetch/browser/no_state_prefetch_utils.cc index 01ae2502..314ce899 100644 --- a/components/no_state_prefetch/browser/no_state_prefetch_utils.cc +++ b/components/no_state_prefetch/browser/no_state_prefetch_utils.cc
@@ -5,6 +5,7 @@ #include "components/no_state_prefetch/browser/no_state_prefetch_utils.h" #include "base/metrics/histogram_macros.h" +#include "base/time/time.h" #include "components/google/core/common/google_util.h" #include "components/no_state_prefetch/browser/no_state_prefetch_manager.h" #include "content/public/browser/navigation_handle.h"
diff --git a/components/ntp_snippets/remote/remote_suggestion_builder.h b/components/ntp_snippets/remote/remote_suggestion_builder.h index e92902ee..5eeee1e 100644 --- a/components/ntp_snippets/remote/remote_suggestion_builder.h +++ b/components/ntp_snippets/remote/remote_suggestion_builder.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/time/time.h" #include "components/ntp_snippets/remote/json_to_categories.h" #include "components/ntp_snippets/remote/remote_suggestion.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/components/ntp_snippets/remote/remote_suggestions_database.cc b/components/ntp_snippets/remote/remote_suggestions_database.cc index e78267d7..cdc83d8 100644 --- a/components/ntp_snippets/remote/remote_suggestions_database.cc +++ b/components/ntp_snippets/remote/remote_suggestions_database.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/leveldb_proto/public/proto_database_provider.h" #include "components/ntp_snippets/remote/proto/ntp_snippets.pb.h"
diff --git a/components/offline_pages/core/background/pick_request_task.h b/components/offline_pages/core/background/pick_request_task.h index 16c92bb1..95e0556 100644 --- a/components/offline_pages/core/background/pick_request_task.h +++ b/components/offline_pages/core/background/pick_request_task.h
@@ -12,6 +12,7 @@ #include "base/containers/circular_deque.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/offline_pages/core/background/device_conditions.h" #include "components/offline_pages/core/background/request_queue_results.h" #include "components/offline_pages/core/background/save_page_request.h"
diff --git a/components/offline_pages/core/model/cleanup_visuals_task.h b/components/offline_pages/core/model/cleanup_visuals_task.h index 6d909e59..aaec861 100644 --- a/components/offline_pages/core/model/cleanup_visuals_task.h +++ b/components/offline_pages/core/model/cleanup_visuals_task.h
@@ -7,6 +7,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/offline_pages/core/offline_page_types.h" #include "components/offline_pages/core/offline_page_visuals.h" #include "components/offline_pages/task/task.h"
diff --git a/components/offline_pages/core/model/clear_storage_task.h b/components/offline_pages/core/model/clear_storage_task.h index 0ac848ed..8e6dfa5 100644 --- a/components/offline_pages/core/model/clear_storage_task.h +++ b/components/offline_pages/core/model/clear_storage_task.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/offline_pages/core/archive_manager.h" #include "components/offline_pages/core/offline_page_types.h" #include "components/offline_pages/task/task.h"
diff --git a/components/offline_pages/core/model/offline_page_item_generator.h b/components/offline_pages/core/model/offline_page_item_generator.h index c07e62a68..1d2d4c1 100644 --- a/components/offline_pages/core/model/offline_page_item_generator.h +++ b/components/offline_pages/core/model/offline_page_item_generator.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/time/time.h" #include "components/offline_pages/core/client_namespace_constants.h" #include "components/offline_pages/core/offline_page_archive_publisher.h" #include "components/offline_pages/core/offline_page_item.h"
diff --git a/components/offline_pages/core/model/offline_page_model_taskified.cc b/components/offline_pages/core/model/offline_page_model_taskified.cc index 81982e82..db2bdd8 100644 --- a/components/offline_pages/core/model/offline_page_model_taskified.cc +++ b/components/offline_pages/core/model/offline_page_model_taskified.cc
@@ -15,7 +15,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/observer_list.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "components/offline_pages/core/archive_manager.h"
diff --git a/components/offline_pages/core/model/persistent_page_consistency_check_task.h b/components/offline_pages/core/model/persistent_page_consistency_check_task.h index 748dcde..54bc5b4 100644 --- a/components/offline_pages/core/model/persistent_page_consistency_check_task.h +++ b/components/offline_pages/core/model/persistent_page_consistency_check_task.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/offline_pages/core/offline_page_archive_publisher.h" #include "components/offline_pages/core/offline_store_types.h" #include "components/offline_pages/task/task.h"
diff --git a/components/offline_pages/core/model/store_visuals_task.h b/components/offline_pages/core/model/store_visuals_task.h index 404d7a50..b58ed44a 100644 --- a/components/offline_pages/core/model/store_visuals_task.h +++ b/components/offline_pages/core/model/store_visuals_task.h
@@ -7,6 +7,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/offline_pages/core/offline_page_visuals.h" #include "components/offline_pages/task/task.h"
diff --git a/components/offline_pages/core/prefetch/prefetch_dispatcher_impl.cc b/components/offline_pages/core/prefetch/prefetch_dispatcher_impl.cc index 2988cfda..1bee6ae 100644 --- a/components/offline_pages/core/prefetch/prefetch_dispatcher_impl.cc +++ b/components/offline_pages/core/prefetch/prefetch_dispatcher_impl.cc
@@ -11,7 +11,6 @@ #include "base/callback_helpers.h" #include "base/guid.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "components/offline_pages/core/client_namespace_constants.h"
diff --git a/components/offline_pages/core/prefetch/prefetch_prefs.cc b/components/offline_pages/core/prefetch/prefetch_prefs.cc index 218d905..387bf62 100644 --- a/components/offline_pages/core/prefetch/prefetch_prefs.cc +++ b/components/offline_pages/core/prefetch/prefetch_prefs.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "components/offline_pages/core/prefetch/prefetch_prefs.h" +#include "base/time/time.h" #include "components/offline_pages/core/offline_clock.h" #include "components/offline_pages/core/offline_page_feature.h" #include "components/prefs/pref_registry_simple.h"
diff --git a/components/offline_pages/core/prefetch/prefetch_prefs_unittest.cc b/components/offline_pages/core/prefetch/prefetch_prefs_unittest.cc index fed41d251..3b3a2ae 100644 --- a/components/offline_pages/core/prefetch/prefetch_prefs_unittest.cc +++ b/components/offline_pages/core/prefetch/prefetch_prefs_unittest.cc
@@ -4,6 +4,7 @@ #include "components/offline_pages/core/prefetch/prefetch_prefs.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "components/offline_pages/buildflags/buildflags.h" #include "components/offline_pages/core/offline_clock.h" #include "components/offline_pages/core/offline_page_feature.h"
diff --git a/components/offline_pages/core/prefetch/test_download_service.cc b/components/offline_pages/core/prefetch/test_download_service.cc index af900fa..6afce70 100644 --- a/components/offline_pages/core/prefetch/test_download_service.cc +++ b/components/offline_pages/core/prefetch/test_download_service.cc
@@ -11,6 +11,7 @@ #include "base/strings/string_number_conversions.h" #include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/download/public/background_service/download_metadata.h" #include "components/download/public/background_service/service_config.h" #include "components/offline_pages/core/prefetch/test_download_client.h"
diff --git a/components/offline_pages/task/sql_store_base.h b/components/offline_pages/task/sql_store_base.h index e496d76..38839846 100644 --- a/components/offline_pages/task/sql_store_base.h +++ b/components/offline_pages/task/sql_store_base.h
@@ -16,6 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/task_runner_util.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "sql/database.h" namespace offline_pages {
diff --git a/components/omnibox/browser/clipboard_provider.cc b/components/omnibox/browser/clipboard_provider.cc index 05d7276..ddc9f381 100644 --- a/components/omnibox/browser/clipboard_provider.cc +++ b/components/omnibox/browser/clipboard_provider.cc
@@ -19,7 +19,6 @@ #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "components/omnibox/browser/autocomplete_input.h"
diff --git a/components/omnibox/browser/history_quick_provider_performance_unittest.cc b/components/omnibox/browser/history_quick_provider_performance_unittest.cc index c6b9f5c..befd4cf 100644 --- a/components/omnibox/browser/history_quick_provider_performance_unittest.cc +++ b/components/omnibox/browser/history_quick_provider_performance_unittest.cc
@@ -11,6 +11,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/bookmarks/test/test_bookmark_client.h" #include "components/history/core/browser/history_backend.h" #include "components/history/core/browser/history_database.h"
diff --git a/components/omnibox/browser/in_memory_url_index.cc b/components/omnibox/browser/in_memory_url_index.cc index 67c87a3..04bd21f 100644 --- a/components/omnibox/browser/in_memory_url_index.cc +++ b/components/omnibox/browser/in_memory_url_index.cc
@@ -14,7 +14,6 @@ #include "base/no_destructor.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/omnibox/browser/in_memory_url_index_unittest.cc b/components/omnibox/browser/in_memory_url_index_unittest.cc index a1b8044..f9fbc86 100644 --- a/components/omnibox/browser/in_memory_url_index_unittest.cc +++ b/components/omnibox/browser/in_memory_url_index_unittest.cc
@@ -28,6 +28,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/history/core/browser/history_backend.h" #include "components/history/core/browser/history_database.h" #include "components/history/core/browser/history_service.h"
diff --git a/components/omnibox/browser/on_device_head_provider.cc b/components/omnibox/browser/on_device_head_provider.cc index 2a7259c..31b5868 100644 --- a/components/omnibox/browser/on_device_head_provider.cc +++ b/components/omnibox/browser/on_device_head_provider.cc
@@ -17,6 +17,7 @@ #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "components/omnibox/browser/autocomplete_provider_listener.h" #include "components/omnibox/browser/base_search_provider.h"
diff --git a/components/omnibox/browser/on_device_head_provider.h b/components/omnibox/browser/on_device_head_provider.h index e82bd996e..1a7492b 100644 --- a/components/omnibox/browser/on_device_head_provider.h +++ b/components/omnibox/browser/on_device_head_provider.h
@@ -10,7 +10,6 @@ #include "base/callback_list.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "components/omnibox/browser/autocomplete_provider.h" #include "components/omnibox/browser/autocomplete_provider_client.h" #include "components/omnibox/browser/on_device_head_model.h"
diff --git a/components/omnibox/browser/on_device_model_update_listener.cc b/components/omnibox/browser/on_device_model_update_listener.cc index 6ea68d5..7534b656 100644 --- a/components/omnibox/browser/on_device_model_update_listener.cc +++ b/components/omnibox/browser/on_device_model_update_listener.cc
@@ -7,7 +7,6 @@ #include "base/files/file_enumerator.h" #include "base/no_destructor.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/components/omnibox/browser/shortcuts_backend.cc b/components/omnibox/browser/shortcuts_backend.cc index 32fa801..6cde29c 100644 --- a/components/omnibox/browser/shortcuts_backend.cc +++ b/components/omnibox/browser/shortcuts_backend.cc
@@ -20,7 +20,6 @@ #include "base/metrics/histogram_macros.h" #include "base/observer_list.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "components/omnibox/browser/autocomplete_input.h"
diff --git a/components/omnibox/browser/shortcuts_database.h b/components/omnibox/browser/shortcuts_database.h index 5434d78d..bfd2758c 100644 --- a/components/omnibox/browser/shortcuts_database.h +++ b/components/omnibox/browser/shortcuts_database.h
@@ -12,6 +12,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "components/omnibox/browser/autocomplete_match.h" #include "components/omnibox/browser/autocomplete_match_type.h" #include "sql/database.h"
diff --git a/components/omnibox/browser/url_index_private_data.h b/components/omnibox/browser/url_index_private_data.h index 3a38ce9..94a34c86 100644 --- a/components/omnibox/browser/url_index_private_data.h +++ b/components/omnibox/browser/url_index_private_data.h
@@ -15,6 +15,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "components/history/core/browser/history_service.h" #include "components/omnibox/browser/in_memory_url_index_cache.pb.h" #include "components/omnibox/browser/in_memory_url_index_types.h"
diff --git a/components/openscreen_platform/task_runner.cc b/components/openscreen_platform/task_runner.cc index d526b9c..0a16f41 100644 --- a/components/openscreen_platform/task_runner.cc +++ b/components/openscreen_platform/task_runner.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/time/time.h"
diff --git a/components/openscreen_platform/tls_client_connection_unittest.cc b/components/openscreen_platform/tls_client_connection_unittest.cc index d2816ce..9c476dfd 100644 --- a/components/openscreen_platform/tls_client_connection_unittest.cc +++ b/components/openscreen_platform/tls_client_connection_unittest.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h" #include "components/openscreen_platform/task_runner.h"
diff --git a/components/openscreen_platform/tls_connection_factory_unittest.cc b/components/openscreen_platform/tls_connection_factory_unittest.cc index 3e6e333..df033e9 100644 --- a/components/openscreen_platform/tls_connection_factory_unittest.cc +++ b/components/openscreen_platform/tls_connection_factory_unittest.cc
@@ -9,7 +9,6 @@ #include <utility> #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h" #include "components/openscreen_platform/network_context.h"
diff --git a/components/optimization_guide/content/browser/page_content_annotations_service.h b/components/optimization_guide/content/browser/page_content_annotations_service.h index 76c64aa..abba569 100644 --- a/components/optimization_guide/content/browser/page_content_annotations_service.h +++ b/components/optimization_guide/content/browser/page_content_annotations_service.h
@@ -17,6 +17,7 @@ #include "base/strings/string_number_conversions.h" #include "base/task/cancelable_task_tracker.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "components/continuous_search/browser/search_result_extractor_client.h" #include "components/continuous_search/browser/search_result_extractor_client_status.h" #include "components/continuous_search/common/public/mojom/continuous_search.mojom.h"
diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc index cb04235b9d..1dddce42 100644 --- a/components/optimization_guide/core/hints_manager.cc +++ b/components/optimization_guide/core/hints_manager.cc
@@ -17,11 +17,11 @@ #include "base/notreached.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/default_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/optimization_guide/core/bloom_filter.h" #include "components/optimization_guide/core/hint_cache.h"
diff --git a/components/optimization_guide/core/optimization_guide_store.h b/components/optimization_guide/core/optimization_guide_store.h index 1c56d8d..45e3c8b 100644 --- a/components/optimization_guide/core/optimization_guide_store.h +++ b/components/optimization_guide/core/optimization_guide_store.h
@@ -13,6 +13,7 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "base/version.h" #include "components/leveldb_proto/public/proto_database.h" #include "components/leveldb_proto/public/proto_database_provider.h"
diff --git a/components/optimization_guide/core/prediction_manager.cc b/components/optimization_guide/core/prediction_manager.cc index e234e80..f50b03a 100644 --- a/components/optimization_guide/core/prediction_manager.cc +++ b/components/optimization_guide/core/prediction_manager.cc
@@ -17,11 +17,11 @@ #include "base/path_service.h" #include "base/rand_util.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_clock.h" +#include "base/time/time.h" #include "components/optimization_guide/core/model_info.h" #include "components/optimization_guide/core/model_util.h" #include "components/optimization_guide/core/optimization_guide_constants.h"
diff --git a/components/optimization_guide/core/prediction_model_download_manager.cc b/components/optimization_guide/core/prediction_model_download_manager.cc index 37773dc..f351ff2 100644 --- a/components/optimization_guide/core/prediction_model_download_manager.cc +++ b/components/optimization_guide/core/prediction_model_download_manager.cc
@@ -15,7 +15,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "components/crx_file/crx_verifier.h"
diff --git a/components/page_info/core/page_info_history_data_source_unittest.cc b/components/page_info/core/page_info_history_data_source_unittest.cc index b46523d..c4684a6 100644 --- a/components/page_info/core/page_info_history_data_source_unittest.cc +++ b/components/page_info/core/page_info_history_data_source_unittest.cc
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/callback_helpers.h" #include "base/i18n/time_formatting.h" +#include "base/time/time.h" #include "components/history/core/browser/history_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h index d67d1b8..6d5405f 100644 --- a/components/page_info/page_info.h +++ b/components/page_info/page_info.h
@@ -10,6 +10,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h"
diff --git a/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc b/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc index a9fdee6..cbef94c 100644 --- a/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc +++ b/components/page_load_metrics/browser/observers/ad_metrics/ads_page_load_metrics_observer.cc
@@ -18,6 +18,7 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/heavy_ad_intervention/heavy_ad_blocklist.h" #include "components/heavy_ad_intervention/heavy_ad_features.h"
diff --git a/components/page_load_metrics/browser/observers/back_forward_cache_page_load_metrics_observer.cc b/components/page_load_metrics/browser/observers/back_forward_cache_page_load_metrics_observer.cc index 17b69f2..26a19a1b 100644 --- a/components/page_load_metrics/browser/observers/back_forward_cache_page_load_metrics_observer.cc +++ b/components/page_load_metrics/browser/observers/back_forward_cache_page_load_metrics_observer.cc
@@ -6,6 +6,7 @@ #include "base/metrics/histogram_functions.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h" #include "components/page_load_metrics/browser/page_load_metrics_util.h" #include "components/page_load_metrics/browser/responsiveness_metrics_normalization.h"
diff --git a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h index 514d1b8d0..3c5f8c9 100644 --- a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h +++ b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer.h
@@ -5,6 +5,7 @@ #ifndef COMPONENTS_PAGE_LOAD_METRICS_BROWSER_OBSERVERS_CORE_UMA_PAGE_LOAD_METRICS_OBSERVER_H_ #define COMPONENTS_PAGE_LOAD_METRICS_BROWSER_OBSERVERS_CORE_UMA_PAGE_LOAD_METRICS_OBSERVER_H_ +#include "base/time/time.h" #include "components/page_load_metrics/browser/observers/click_input_tracker.h" #include "components/page_load_metrics/browser/page_load_metrics_observer.h" #include "content/public/browser/navigation_handle_timing.h"
diff --git a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc index 8aea65e67..1ed74d21 100644 --- a/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc +++ b/components/page_load_metrics/browser/observers/core/uma_page_load_metrics_observer_unittest.cc
@@ -9,6 +9,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/power_monitor_test.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "components/page_load_metrics/browser/metrics_web_contents_observer.h" #include "components/page_load_metrics/browser/observers/core/largest_contentful_paint_handler.h" #include "components/page_load_metrics/browser/observers/page_load_metrics_observer_content_test_harness.h"
diff --git a/components/page_load_metrics/browser/page_load_metrics_observer.h b/components/page_load_metrics/browser/page_load_metrics_observer.h index 3530ca23..126ca0e1 100644 --- a/components/page_load_metrics/browser/page_load_metrics_observer.h +++ b/components/page_load_metrics/browser/page_load_metrics_observer.h
@@ -8,6 +8,7 @@ #include <memory> #include <string> +#include "base/time/time.h" #include "components/page_load_metrics/browser/page_load_metrics_observer_delegate.h" #include "components/page_load_metrics/common/page_load_timing.h" #include "content/public/browser/global_routing_id.h"
diff --git a/components/page_load_metrics/browser/page_load_metrics_test_waiter.h b/components/page_load_metrics/browser/page_load_metrics_test_waiter.h index cb6426d0..eff6d606 100644 --- a/components/page_load_metrics/browser/page_load_metrics_test_waiter.h +++ b/components/page_load_metrics/browser/page_load_metrics_test_waiter.h
@@ -10,6 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "components/page_load_metrics/browser/metrics_lifecycle_observer.h" #include "components/page_load_metrics/browser/page_load_tracker.h" #include "content/public/browser/render_frame_host.h"
diff --git a/components/paint_preview/browser/paint_preview_client.cc b/components/paint_preview/browser/paint_preview_client.cc index dfcf2ca..a44b1d99 100644 --- a/components/paint_preview/browser/paint_preview_client.cc +++ b/components/paint_preview/browser/paint_preview_client.cc
@@ -13,7 +13,6 @@ #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/trace_event/trace_event.h"
diff --git a/components/paint_preview/browser/paint_preview_client.h b/components/paint_preview/browser/paint_preview_client.h index 00762b3..0f8cea14 100644 --- a/components/paint_preview/browser/paint_preview_client.h +++ b/components/paint_preview/browser/paint_preview_client.h
@@ -13,6 +13,7 @@ #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" #include "base/files/file_path.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "components/paint_preview/common/capture_result.h" #include "components/paint_preview/common/mojom/paint_preview_recorder.mojom-shared.h"
diff --git a/components/paint_preview/player/android/player_compositor_delegate_android.cc b/components/paint_preview/player/android/player_compositor_delegate_android.cc index 19ce7088..fa059bc 100644 --- a/components/paint_preview/player/android/player_compositor_delegate_android.cc +++ b/components/paint_preview/player/android/player_compositor_delegate_android.cc
@@ -14,7 +14,6 @@ #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/common/trace_event_common.h" #include "base/trace_event/trace_event.h"
diff --git a/components/paint_preview/player/android/player_compositor_delegate_android.h b/components/paint_preview/player/android/player_compositor_delegate_android.h index 3f1850c..d9ddbc0 100644 --- a/components/paint_preview/player/android/player_compositor_delegate_android.h +++ b/components/paint_preview/player/android/player_compositor_delegate_android.h
@@ -10,6 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/task_runner.h" +#include "base/time/time.h" #include "components/paint_preview/player/player_compositor_delegate.h" namespace paint_preview {
diff --git a/components/paint_preview/player/player_compositor_delegate.cc b/components/paint_preview/player/player_compositor_delegate.cc index 4a98fec..2d5bf16 100644 --- a/components/paint_preview/player/player_compositor_delegate.cc +++ b/components/paint_preview/player/player_compositor_delegate.cc
@@ -16,7 +16,6 @@ #include "base/notreached.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/common/trace_event_common.h" #include "base/trace_event/trace_event.h"
diff --git a/components/password_manager/core/browser/android_affiliation/affiliation_backend.h b/components/password_manager/core/browser/android_affiliation/affiliation_backend.h index 6edc7a3..ec72b9fc 100644 --- a/components/password_manager/core/browser/android_affiliation/affiliation_backend.h +++ b/components/password_manager/core/browser/android_affiliation/affiliation_backend.h
@@ -16,6 +16,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler_delegate.h" #include "components/password_manager/core/browser/android_affiliation/affiliation_fetcher_delegate.h" #include "components/password_manager/core/browser/android_affiliation/affiliation_utils.h"
diff --git a/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator_unittest.cc b/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator_unittest.cc index 35e903d84..7ee6d58 100644 --- a/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator_unittest.cc +++ b/components/password_manager/core/browser/built_in_backend_to_android_backend_migrator_unittest.cc
@@ -10,6 +10,7 @@ #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/password_manager/core/browser/fake_password_store_backend.h" #include "components/password_manager/core/browser/mock_password_store_backend.h" #include "components/password_manager/core/browser/password_manager_test_utils.h"
diff --git a/components/password_manager/core/browser/export/password_manager_exporter.cc b/components/password_manager/core/browser/export/password_manager_exporter.cc index 60e6fd3..ec452c44 100644 --- a/components/password_manager/core/browser/export/password_manager_exporter.cc +++ b/components/password_manager/core/browser/export/password_manager_exporter.cc
@@ -12,7 +12,6 @@ #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/task/lazy_thread_pool_task_runner.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "build/build_config.h" #include "components/password_manager/core/browser/export/password_csv_writer.h"
diff --git a/components/password_manager/core/browser/field_info_table_unittest.cc b/components/password_manager/core/browser/field_info_table_unittest.cc index 9796709..fa8e497 100644 --- a/components/password_manager/core/browser/field_info_table_unittest.cc +++ b/components/password_manager/core/browser/field_info_table_unittest.cc
@@ -7,6 +7,7 @@ #include <vector> #include "base/files/scoped_temp_dir.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/autofill/core/browser/field_types.h" #include "components/autofill/core/common/signatures.h"
diff --git a/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.h b/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.h index 457e98a..2f4ba6b 100644 --- a/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.h +++ b/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.h
@@ -12,6 +12,7 @@ #include <utility> #include "base/callback.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/password_manager/core/browser/generation/password_requirements_spec_fetcher.h" #include "url/gurl.h"
diff --git a/components/password_manager/core/browser/import/password_importer.cc b/components/password_manager/core/browser/import/password_importer.cc index 3eb0535..d6f180ee 100644 --- a/components/password_manager/core/browser/import/password_importer.cc +++ b/components/password_manager/core/browser/import/password_importer.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/password_manager/core/browser/import/csv_password.h" #include "components/password_manager/core/browser/import/csv_password_sequence.h"
diff --git a/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc b/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc index 93087cc..0e7a1cb 100644 --- a/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc +++ b/components/password_manager/core/browser/leak_detection/bulk_leak_check_impl.cc
@@ -8,7 +8,6 @@ #include "base/check.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/password_manager/core/browser/leak_detection/encryption_utils.h" #include "components/password_manager/core/browser/leak_detection/leak_detection_delegate_interface.h"
diff --git a/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc b/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc index 5485a65..d5567c1 100644 --- a/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc +++ b/components/password_manager/core/browser/leak_detection/leak_detection_request_utils.cc
@@ -11,7 +11,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "components/password_manager/core/browser/leak_detection/encryption_utils.h"
diff --git a/components/password_manager/core/browser/old_google_credentials_cleaner.cc b/components/password_manager/core/browser/old_google_credentials_cleaner.cc index 7522a1c..8c11040 100644 --- a/components/password_manager/core/browser/old_google_credentials_cleaner.cc +++ b/components/password_manager/core/browser/old_google_credentials_cleaner.cc
@@ -4,6 +4,7 @@ #include "components/password_manager/core/browser/old_google_credentials_cleaner.h" +#include "base/time/time.h" #include "components/password_manager/core/browser/password_form.h" #include "components/password_manager/core/browser/password_store_interface.h" #include "components/password_manager/core/common/password_manager_pref_names.h"
diff --git a/components/password_manager/core/browser/old_google_credentials_cleaner_unittest.cc b/components/password_manager/core/browser/old_google_credentials_cleaner_unittest.cc index 04ff9445..612e192b 100644 --- a/components/password_manager/core/browser/old_google_credentials_cleaner_unittest.cc +++ b/components/password_manager/core/browser/old_google_credentials_cleaner_unittest.cc
@@ -5,6 +5,7 @@ #include "components/password_manager/core/browser/old_google_credentials_cleaner.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/password_manager/core/browser/mock_password_store_interface.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_registry_simple.h"
diff --git a/components/password_manager/core/browser/password_manager_util_unittest.cc b/components/password_manager/core/browser/password_manager_util_unittest.cc index 9ae39fc..2d7e69e 100644 --- a/components/password_manager/core/browser/password_manager_util_unittest.cc +++ b/components/password_manager/core/browser/password_manager_util_unittest.cc
@@ -11,6 +11,7 @@ #include "base/callback_helpers.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "components/autofill/core/browser/autofill_client.h"
diff --git a/components/password_manager/core/browser/password_session_durations_metrics_recorder.cc b/components/password_manager/core/browser/password_session_durations_metrics_recorder.cc index 0d66ba46..17e68c3 100644 --- a/components/password_manager/core/browser/password_session_durations_metrics_recorder.cc +++ b/components/password_manager/core/browser/password_session_durations_metrics_recorder.cc
@@ -5,6 +5,7 @@ #include "components/password_manager/core/browser/password_session_durations_metrics_recorder.h" #include "base/metrics/histogram_functions.h" +#include "base/time/time.h" #include "components/password_manager/core/browser/password_manager_features_util.h" namespace password_manager {
diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc index 2af78ca..bf1c84e 100644 --- a/components/password_manager/core/browser/password_store.cc +++ b/components/password_manager/core/browser/password_store.cc
@@ -20,7 +20,6 @@ #include "base/observer_list.h" #include "base/ranges/algorithm.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/password_manager/core/browser/possible_username_data_unittest.cc b/components/password_manager/core/browser/possible_username_data_unittest.cc index 0263117..799e62e 100644 --- a/components/password_manager/core/browser/possible_username_data_unittest.cc +++ b/components/password_manager/core/browser/possible_username_data_unittest.cc
@@ -6,6 +6,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/autofill/core/common/unique_ids.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/password_manager/core/browser/ui/insecure_credentials_manager.cc b/components/password_manager/core/browser/ui/insecure_credentials_manager.cc index 865756f..e5f2b57f 100644 --- a/components/password_manager/core/browser/ui/insecure_credentials_manager.cc +++ b/components/password_manager/core/browser/ui/insecure_credentials_manager.cc
@@ -18,7 +18,6 @@ #include "base/observer_list.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "components/password_manager/core/browser/insecure_credentials_table.h"
diff --git a/components/password_manager/core/browser/ui/insecure_credentials_manager.h b/components/password_manager/core/browser/ui/insecure_credentials_manager.h index bbb06fc..8766bd5 100644 --- a/components/password_manager/core/browser/ui/insecure_credentials_manager.h +++ b/components/password_manager/core/browser/ui/insecure_credentials_manager.h
@@ -17,6 +17,7 @@ #include "base/observer_list.h" #include "base/observer_list_types.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "base/types/strong_alias.h" #include "build/build_config.h"
diff --git a/components/password_manager/core/browser/well_known_change_password_state.cc b/components/password_manager/core/browser/well_known_change_password_state.cc index e28c6a42..0e7d8d7 100644 --- a/components/password_manager/core/browser/well_known_change_password_state.cc +++ b/components/password_manager/core/browser/well_known_change_password_state.cc
@@ -6,6 +6,7 @@ #include <utility> +#include "base/time/time.h" #include "components/password_manager/core/browser/site_affiliation/affiliation_service.h" #include "components/password_manager/core/browser/well_known_change_password_util.h" #include "components/password_manager/core/common/password_manager_features.h"
diff --git a/components/password_manager/core/browser/well_known_change_password_state_unittest.cc b/components/password_manager/core/browser/well_known_change_password_state_unittest.cc index aefe621..005cd19 100644 --- a/components/password_manager/core/browser/well_known_change_password_state_unittest.cc +++ b/components/password_manager/core/browser/well_known_change_password_state_unittest.cc
@@ -5,7 +5,6 @@ #include "components/password_manager/core/browser/well_known_change_password_state.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/test/task_environment.h" #include "base/test/test_mock_time_task_runner.h" #include "base/timer/mock_timer.h"
diff --git a/components/password_manager/core/common/passwords_directory_util_ios.cc b/components/password_manager/core/common/passwords_directory_util_ios.cc index 62d7f7a8..c78ce11 100644 --- a/components/password_manager/core/common/passwords_directory_util_ios.cc +++ b/components/password_manager/core/common/passwords_directory_util_ios.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/components/password_manager/core/common/passwords_directory_util_ios_unittest.cc b/components/password_manager/core/common/passwords_directory_util_ios_unittest.cc index cb9d364..67789a0 100644 --- a/components/password_manager/core/common/passwords_directory_util_ios_unittest.cc +++ b/components/password_manager/core/common/passwords_directory_util_ios_unittest.cc
@@ -6,7 +6,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/performance_manager/decorators/process_metrics_decorator.cc b/components/performance_manager/decorators/process_metrics_decorator.cc index d86ab1e..0ff4199 100644 --- a/components/performance_manager/decorators/process_metrics_decorator.cc +++ b/components/performance_manager/decorators/process_metrics_decorator.cc
@@ -8,6 +8,7 @@ #include "base/feature_list.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/performance_manager/graph/graph_impl.h" #include "components/performance_manager/graph/node_attached_data_impl.h"
diff --git a/components/performance_manager/decorators/site_data_recorder_unittest.cc b/components/performance_manager/decorators/site_data_recorder_unittest.cc index aa20ed76..216448f 100644 --- a/components/performance_manager/decorators/site_data_recorder_unittest.cc +++ b/components/performance_manager/decorators/site_data_recorder_unittest.cc
@@ -9,7 +9,6 @@ #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/threading/sequence_bound.h" #include "components/performance_manager/graph/page_node_impl.h"
diff --git a/components/performance_manager/freezing/freezing.cc b/components/performance_manager/freezing/freezing.cc index bb8ac12..d0798a2 100644 --- a/components/performance_manager/freezing/freezing.cc +++ b/components/performance_manager/freezing/freezing.cc
@@ -14,7 +14,6 @@ #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/thread_annotations.h" #include "components/performance_manager/freezing/freezing_vote_aggregator.h"
diff --git a/components/performance_manager/performance_manager_impl.cc b/components/performance_manager/performance_manager_impl.cc index b28287cc..0b77d05 100644 --- a/components/performance_manager/performance_manager_impl.cc +++ b/components/performance_manager/performance_manager_impl.cc
@@ -15,7 +15,6 @@ #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/task/lazy_thread_pool_task_runner.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/performance_manager/graph/frame_node_impl.h"
diff --git a/components/performance_manager/persistence/site_data/leveldb_site_data_store.h b/components/performance_manager/persistence/site_data/leveldb_site_data_store.h index 3fe13d70..0e89a8f8 100644 --- a/components/performance_manager/persistence/site_data/leveldb_site_data_store.h +++ b/components/performance_manager/persistence/site_data/leveldb_site_data_store.h
@@ -9,7 +9,6 @@ #include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "components/performance_manager/persistence/site_data/site_data_store.h" #include "third_party/leveldatabase/src/include/leveldb/db.h"
diff --git a/components/performance_manager/persistence/site_data/site_data_cache_factory_unittest.cc b/components/performance_manager/persistence/site_data/site_data_cache_factory_unittest.cc index a9eb5b05..79f660c 100644 --- a/components/performance_manager/persistence/site_data/site_data_cache_factory_unittest.cc +++ b/components/performance_manager/persistence/site_data/site_data_cache_factory_unittest.cc
@@ -10,7 +10,6 @@ #include "base/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/test/bind.h" #include "base/threading/sequence_bound.h"
diff --git a/components/permissions/permission_actions_history_unittest.cc b/components/permissions/permission_actions_history_unittest.cc index 0026df5..fe40cc49 100644 --- a/components/permissions/permission_actions_history_unittest.cc +++ b/components/permissions/permission_actions_history_unittest.cc
@@ -9,6 +9,7 @@ #include "base/json/json_reader.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "components/content_settings/core/common/pref_names.h" #include "components/permissions/permission_request_enums.h" #include "components/permissions/permission_uma_util.h"
diff --git a/components/permissions/permission_auditing_service_unittest.cc b/components/permissions/permission_auditing_service_unittest.cc index b009f3ed..76881f28 100644 --- a/components/permissions/permission_auditing_service_unittest.cc +++ b/components/permissions/permission_auditing_service_unittest.cc
@@ -15,6 +15,7 @@ #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "components/permissions/permission_usage_session.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc index 068dfe6..4de86c5 100644 --- a/components/permissions/permission_util.cc +++ b/components/permissions/permission_util.cc
@@ -4,15 +4,18 @@ #include "components/permissions/permission_util.h" +#include "base/check.h" #include "base/feature_list.h" #include "base/notreached.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "components/permissions/features.h" #include "content/public/browser/permission_type.h" +#include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "third_party/blink/public/common/web_preferences/web_preferences.h" #include "url/gurl.h" +#include "url/origin.h" using content::PermissionType; @@ -238,17 +241,10 @@ } } -// Returns the last committed URL for `web_contents`. If the frame's URL is +// Returns the last committed URL for `render_frame_host`. If the frame's URL is // about:blank, returns GetLastCommittedOrigin. // Due to dependency issues, this method is duplicated in // content/browser/permissions/permission_util.cc. -// TODO(crbug.com/698985): Resolve GetLastCommitted[URL|Origin]() usage. -GURL PermissionUtil::GetLastCommittedOriginAsURL( - content::WebContents* web_contents) { - DCHECK(web_contents); - return GetLastCommittedOriginAsURL(web_contents->GetMainFrame()); -} - GURL PermissionUtil::GetLastCommittedOriginAsURL( content::RenderFrameHost* render_frame_host) { DCHECK(render_frame_host);
diff --git a/components/permissions/permission_util.h b/components/permissions/permission_util.h index 1f1ab581..4c1e9702 100644 --- a/components/permissions/permission_util.h +++ b/components/permissions/permission_util.h
@@ -14,7 +14,6 @@ namespace content { enum class PermissionType; -class WebContents; class RenderFrameHost; } // namespace content @@ -71,11 +70,7 @@ static bool CanPermissionBeAllowedOnce(ContentSettingsType type); // Returns the authoritative `embedding origin`, as a GURL, to be used for - // permission decisions in `web_contents`. - // TODO(crbug.com/698985): This method should only be used temporarily, and - // ultimately all call sites should be migrated to determine the authoritative - // security origin based on the requesting RenderFrameHost. - static GURL GetLastCommittedOriginAsURL(content::WebContents* web_contents); + // permission decisions in `render_frame_host`. static GURL GetLastCommittedOriginAsURL( content::RenderFrameHost* render_frame_host); };
diff --git a/components/policy/core/browser/url_blocklist_manager.cc b/components/policy/core/browser/url_blocklist_manager.cc index 459292e..b00a452 100644 --- a/components/policy/core/browser/url_blocklist_manager.cc +++ b/components/policy/core/browser/url_blocklist_manager.cc
@@ -17,7 +17,6 @@ #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner_util.h"
diff --git a/components/policy/core/browser/webui/machine_level_user_cloud_policy_status_provider.h b/components/policy/core/browser/webui/machine_level_user_cloud_policy_status_provider.h index 395f09b..05f0540 100644 --- a/components/policy/core/browser/webui/machine_level_user_cloud_policy_status_provider.h +++ b/components/policy/core/browser/webui/machine_level_user_cloud_policy_status_provider.h
@@ -8,6 +8,7 @@ #include <string> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "components/policy/core/browser/webui/policy_status_provider.h" #include "components/policy/core/common/cloud/cloud_policy_store.h" #include "components/policy/policy_export.h"
diff --git a/components/policy/core/browser/webui/policy_status_provider.h b/components/policy/core/browser/webui/policy_status_provider.h index 8faabf3b..f157704 100644 --- a/components/policy/core/browser/webui/policy_status_provider.h +++ b/components/policy/core/browser/webui/policy_status_provider.h
@@ -9,6 +9,7 @@ #include "base/callback_helpers.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "components/policy/policy_export.h" namespace base {
diff --git a/components/policy/core/common/cloud/cloud_policy_manager.cc b/components/policy/core/common/cloud/cloud_policy_manager.cc index 5ef9bbc..219d72f5f 100644 --- a/components/policy/core/common/cloud/cloud_policy_manager.cc +++ b/components/policy/core/common/cloud/cloud_policy_manager.cc
@@ -11,7 +11,6 @@ #include "base/callback_helpers.h" #include "base/check_op.h" #include "base/files/file_path.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/components/policy/core/common/cloud/mock_device_management_service.cc b/components/policy/core/common/cloud/mock_device_management_service.cc index af6e5cd..1074baab 100644 --- a/components/policy/core/common/cloud/mock_device_management_service.cc +++ b/components/policy/core/common/cloud/mock_device_management_service.cc
@@ -8,7 +8,6 @@ #include "base/callback_helpers.h" #include "base/notreached.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "components/policy/core/common/cloud/dm_auth.h" #include "net/base/net_errors.h"
diff --git a/components/policy/core/common/configuration_policy_provider_test.cc b/components/policy/core/common/configuration_policy_provider_test.cc index 90e391b9..85b79f1c 100644 --- a/components/policy/core/common/configuration_policy_provider_test.cc +++ b/components/policy/core/common/configuration_policy_provider_test.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/components/policy/core/common/features.h b/components/policy/core/common/features.h index 9a315efa..db2aa40 100644 --- a/components/policy/core/common/features.h +++ b/components/policy/core/common/features.h
@@ -7,6 +7,7 @@ #include "base/feature_list.h" #include "base/metrics/field_trial_params.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/policy/policy_export.h"
diff --git a/components/policy/core/common/policy_statistics_collector_unittest.cc b/components/policy/core/common/policy_statistics_collector_unittest.cc index 2f87fb6..422ddc68 100644 --- a/components/policy/core/common/policy_statistics_collector_unittest.cc +++ b/components/policy/core/common/policy_statistics_collector_unittest.cc
@@ -12,6 +12,7 @@ #include "base/compiler_specific.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/test_simple_task_runner.h" +#include "base/time/time.h" #include "base/values.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/mock_policy_service.h"
diff --git a/components/power_scheduler/power_mode_arbiter_unittest.cc b/components/power_scheduler/power_mode_arbiter_unittest.cc index cff551b..1112b7b 100644 --- a/components/power_scheduler/power_mode_arbiter_unittest.cc +++ b/components/power_scheduler/power_mode_arbiter_unittest.cc
@@ -5,6 +5,7 @@ #include "components/power_scheduler/power_mode_arbiter.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -814,4 +815,4 @@ EXPECT_EQ(arbiter_.GetActiveModeForTesting(), PowerMode::kSmallAnimation); } -} // namespace power_scheduler \ No newline at end of file +} // namespace power_scheduler
diff --git a/components/prefs/json_pref_store.h b/components/prefs/json_pref_store.h index a660cc8..c9a132a 100644 --- a/components/prefs/json_pref_store.h +++ b/components/prefs/json_pref_store.h
@@ -19,7 +19,6 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/prefs/persistent_pref_store.h" #include "components/prefs/pref_filter.h"
diff --git a/components/prefs/pref_member_unittest.cc b/components/prefs/pref_member_unittest.cc index ca1bbe3..df51f99 100644 --- a/components/prefs/pref_member_unittest.cc +++ b/components/prefs/pref_member_unittest.cc
@@ -10,7 +10,6 @@ #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h"
diff --git a/components/proxy_config/ios/proxy_service_factory.cc b/components/proxy_config/ios/proxy_service_factory.cc index 1eb70c9..cbd5f3a 100644 --- a/components/proxy_config/ios/proxy_service_factory.cc +++ b/components/proxy_config/ios/proxy_service_factory.cc
@@ -8,7 +8,6 @@ #include <memory> -#include "base/task/post_task.h" #include "components/proxy_config/pref_proxy_config_tracker_impl.h" #include "ios/web/public/thread/web_task_traits.h" #include "ios/web/public/thread/web_thread.h"
diff --git a/components/query_tiles/internal/tile_manager_unittest.cc b/components/query_tiles/internal/tile_manager_unittest.cc index 807d946..254b2615 100644 --- a/components/query_tiles/internal/tile_manager_unittest.cc +++ b/components/query_tiles/internal/tile_manager_unittest.cc
@@ -12,6 +12,7 @@ #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/query_tiles/internal/tile_config.h" #include "components/query_tiles/internal/tile_store.h" #include "components/query_tiles/switches.h"
diff --git a/components/query_tiles/internal/tile_service_scheduler_impl.cc b/components/query_tiles/internal/tile_service_scheduler_impl.cc index 2a937042..d8b4477 100644 --- a/components/query_tiles/internal/tile_service_scheduler_impl.cc +++ b/components/query_tiles/internal/tile_service_scheduler_impl.cc
@@ -10,6 +10,7 @@ #include "base/command_line.h" #include "base/rand_util.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "components/prefs/pref_service.h" #include "components/query_tiles/internal/stats.h" #include "components/query_tiles/internal/tile_config.h"
diff --git a/components/query_tiles/internal/tile_service_scheduler_unittest.cc b/components/query_tiles/internal/tile_service_scheduler_unittest.cc index 8d207ef3..8ab092c 100644 --- a/components/query_tiles/internal/tile_service_scheduler_unittest.cc +++ b/components/query_tiles/internal/tile_service_scheduler_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" #include "base/test/test_mock_time_task_runner.h" +#include "base/time/time.h" #include "components/prefs/pref_service.h" #include "components/prefs/testing_pref_service.h" #include "components/query_tiles/internal/black_hole_log_sink.h"
diff --git a/components/query_tiles/tile_service_factory_helper.cc b/components/query_tiles/tile_service_factory_helper.cc index 60a1ed9..8882000 100644 --- a/components/query_tiles/tile_service_factory_helper.cc +++ b/components/query_tiles/tile_service_factory_helper.cc
@@ -8,7 +8,6 @@ #include <utility> #include "base/command_line.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/time/default_clock.h"
diff --git a/components/quirks/quirks_manager.cc b/components/quirks/quirks_manager.cc index 027cc7fe..10dfe15 100644 --- a/components/quirks/quirks_manager.cc +++ b/components/quirks/quirks_manager.cc
@@ -12,7 +12,6 @@ #include "base/memory/ptr_util.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h"
diff --git a/components/reporting/encryption/decryption.cc b/components/reporting/encryption/decryption.cc index d8b9a7d..70e94fc 100644 --- a/components/reporting/encryption/decryption.cc +++ b/components/reporting/encryption/decryption.cc
@@ -16,7 +16,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "components/reporting/encryption/encryption.h"
diff --git a/components/reporting/encryption/decryption.h b/components/reporting/encryption/decryption.h index cb80f901..fb9f8ae 100644 --- a/components/reporting/encryption/decryption.h +++ b/components/reporting/encryption/decryption.h
@@ -14,6 +14,7 @@ #include "base/strings/string_piece.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/reporting/encryption/encryption.h" #include "components/reporting/util/status.h" #include "components/reporting/util/statusor.h"
diff --git a/components/reporting/encryption/encryption.cc b/components/reporting/encryption/encryption.cc index 42accb6d..9413af3 100644 --- a/components/reporting/encryption/encryption.cc +++ b/components/reporting/encryption/encryption.cc
@@ -14,7 +14,6 @@ #include "base/memory/ptr_util.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "components/reporting/encryption/primitives.h"
diff --git a/components/reporting/resources/resource_interface_unittest.cc b/components/reporting/resources/resource_interface_unittest.cc index ade669e..1ea2c8f 100644 --- a/components/reporting/resources/resource_interface_unittest.cc +++ b/components/reporting/resources/resource_interface_unittest.cc
@@ -6,7 +6,6 @@ #include "components/reporting/resources/resource_interface.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h"
diff --git a/components/reporting/storage/storage_queue.cc b/components/reporting/storage/storage_queue.cc index f3cdc047..495bf9ac 100644 --- a/components/reporting/storage/storage_queue.cc +++ b/components/reporting/storage/storage_queue.cc
@@ -33,7 +33,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "components/reporting/compression/compression_module.h"
diff --git a/components/reporting/util/task_runner_context_unittest.cc b/components/reporting/util/task_runner_context_unittest.cc index 2bec10d..d085caa 100644 --- a/components/reporting/util/task_runner_context_unittest.cc +++ b/components/reporting/util/task_runner_context_unittest.cc
@@ -17,6 +17,7 @@ #include "base/task/thread_pool.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "components/reporting/util/status.h" #include "components/reporting/util/statusor.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/components/rlz/rlz_tracker.cc b/components/rlz/rlz_tracker.cc index 38ab24b..480b2e2 100644 --- a/components/rlz/rlz_tracker.cc +++ b/components/rlz/rlz_tracker.cc
@@ -16,7 +16,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/safe_browsing/content/browser/browser_url_loader_throttle.h b/components/safe_browsing/content/browser/browser_url_loader_throttle.h index cc86b2f..1e112ee 100644 --- a/components/safe_browsing/content/browser/browser_url_loader_throttle.h +++ b/components/safe_browsing/content/browser/browser_url_loader_throttle.h
@@ -9,7 +9,6 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "content/public/browser/browser_thread.h" #include "third_party/blink/public/common/loader/url_loader_throttle.h"
diff --git a/components/safe_browsing/content/browser/client_side_detection_host.h b/components/safe_browsing/content/browser/client_side_detection_host.h index fdf45fa8..30c50c3 100644 --- a/components/safe_browsing/content/browser/client_side_detection_host.h +++ b/components/safe_browsing/content/browser/client_side_detection_host.h
@@ -14,6 +14,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "components/safe_browsing/content/browser/base_ui_manager.h" #include "components/safe_browsing/content/common/safe_browsing.mojom-shared.h" #include "components/safe_browsing/content/common/safe_browsing.mojom.h"
diff --git a/components/safe_browsing/content/browser/safe_browsing_navigation_observer.h b/components/safe_browsing/content/browser/safe_browsing_navigation_observer.h index 24c3782..1137141 100644 --- a/components/safe_browsing/content/browser/safe_browsing_navigation_observer.h +++ b/components/safe_browsing/content/browser/safe_browsing_navigation_observer.h
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/supports_user_data.h" +#include "base/time/time.h" #include "components/content_settings/core/browser/content_settings_observer.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/content_settings/core/common/content_settings.h"
diff --git a/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.h b/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.h index 05679df..27bf23d 100644 --- a/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.h +++ b/components/safe_browsing/content/browser/safe_browsing_navigation_observer_manager.h
@@ -11,6 +11,7 @@ #include "base/feature_list.h" #include "base/memory/raw_ptr.h" #include "base/supports_user_data.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/keyed_service/core/keyed_service.h" #include "components/safe_browsing/core/browser/referrer_chain_provider.h"
diff --git a/components/safe_browsing/content/browser/safe_browsing_network_context.cc b/components/safe_browsing/content/browser/safe_browsing_network_context.cc index 3751405..43daf77 100644 --- a/components/safe_browsing/content/browser/safe_browsing_network_context.cc +++ b/components/safe_browsing/content/browser/safe_browsing_network_context.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "components/safe_browsing/core/common/safebrowsing_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/network_context_client_base.h"
diff --git a/components/safe_browsing/content/browser/triggers/trigger_throttler.h b/components/safe_browsing/content/browser/triggers/trigger_throttler.h index c6563b2..33fa604 100644 --- a/components/safe_browsing/content/browser/triggers/trigger_throttler.h +++ b/components/safe_browsing/content/browser/triggers/trigger_throttler.h
@@ -12,6 +12,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/time/clock.h" +#include "base/time/time.h" class PrefService;
diff --git a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h index b62c1fd..ac8c92c 100644 --- a/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h +++ b/components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "components/safe_browsing/buildflags.h"
diff --git a/components/safe_browsing/content/renderer/renderer_url_loader_throttle.h b/components/safe_browsing/content/renderer/renderer_url_loader_throttle.h index 1372aec..fc865b8 100644 --- a/components/safe_browsing/content/renderer/renderer_url_loader_throttle.h +++ b/components/safe_browsing/content/renderer/renderer_url_loader_throttle.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/safe_browsing/content/common/safe_browsing.mojom.h" #include "components/safe_browsing/core/common/safe_browsing_url_checker.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/components/safe_browsing/core/browser/db/v4_database.cc b/components/safe_browsing/core/browser/db/v4_database.cc index 21efbfc2..870b42d 100644 --- a/components/safe_browsing/core/browser/db/v4_database.cc +++ b/components/safe_browsing/core/browser/db/v4_database.cc
@@ -15,6 +15,7 @@ #include "base/metrics/histogram_macros.h" #include "base/task/task_runner_util.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/safe_browsing/core/common/proto/webui.pb.h"
diff --git a/components/safe_browsing/core/browser/db/v4_local_database_manager.h b/components/safe_browsing/core/browser/db/v4_local_database_manager.h index b830d59c..c78e161 100644 --- a/components/safe_browsing/core/browser/db/v4_local_database_manager.h +++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.h
@@ -15,6 +15,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "components/safe_browsing/core/browser/db/database_manager.h" #include "components/safe_browsing/core/browser/db/hit_report.h" #include "components/safe_browsing/core/browser/db/v4_database.h"
diff --git a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc index 9fb5472..4e9290e 100644 --- a/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc +++ b/components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
@@ -11,6 +11,7 @@ #include "base/rand_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/version_info/version_info.h" #include "crypto/sha2.h"
diff --git a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc index 4ac929c..cbfc29d 100644 --- a/components/safe_browsing/core/browser/realtime/url_lookup_service.cc +++ b/components/safe_browsing/core/browser/realtime/url_lookup_service.cc
@@ -11,7 +11,6 @@ #include "base/rand_util.h" #include "base/strings/strcat.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/buildflags.h"
diff --git a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.h b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.h index 1ac110db..3a7a783 100644 --- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.h +++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service.h
@@ -17,6 +17,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/keyed_service/core/keyed_service.h" #include "components/prefs/pref_change_registrar.h"
diff --git a/components/safe_browsing/ios/browser/password_protection/password_protection_request_ios.mm b/components/safe_browsing/ios/browser/password_protection/password_protection_request_ios.mm index 71260ab..a40a721 100644 --- a/components/safe_browsing/ios/browser/password_protection/password_protection_request_ios.mm +++ b/components/safe_browsing/ios/browser/password_protection/password_protection_request_ios.mm
@@ -8,7 +8,6 @@ #error "This file requires ARC support." #endif -#include "base/task/post_task.h" #import "components/safe_browsing/core/browser/password_protection/request_canceler.h" #import "components/safe_browsing/ios/browser/password_protection/password_protection_service.h" #include "ios/web/public/thread/web_task_traits.h"
diff --git a/components/scheduling_metrics/thread_metrics.h b/components/scheduling_metrics/thread_metrics.h index 525d73e..ec96d3e 100644 --- a/components/scheduling_metrics/thread_metrics.h +++ b/components/scheduling_metrics/thread_metrics.h
@@ -7,6 +7,7 @@ #include "base/component_export.h" #include "base/task/sequence_manager/task_queue.h" +#include "base/time/time.h" #include "components/scheduling_metrics/task_duration_metric_reporter.h" #include "components/scheduling_metrics/thread_type.h" #include "components/scheduling_metrics/total_duration_metric_reporter.h"
diff --git a/components/search_engines/keyword_table.cc b/components/search_engines/keyword_table.cc index 7f402ad..42b9d85 100644 --- a/components/search_engines/keyword_table.cc +++ b/components/search_engines/keyword_table.cc
@@ -18,6 +18,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time.h" #include "base/values.h" #include "components/database_utils/url_converter.h" #include "components/history/core/browser/url_database.h"
diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h index 449c6c7..56399fb 100644 --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h
@@ -21,6 +21,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/time/default_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/keyed_service/core/keyed_service.h" #include "components/prefs/pref_change_registrar.h"
diff --git a/components/search_provider_logos/logo_service_impl.cc b/components/search_provider_logos/logo_service_impl.cc index d229db18..a6bcb4b 100644 --- a/components/search_provider_logos/logo_service_impl.cc +++ b/components/search_provider_logos/logo_service_impl.cc
@@ -15,7 +15,6 @@ #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/security_interstitials/content/cert_report_helper.h b/components/security_interstitials/content/cert_report_helper.h index 41da731..52e611a 100644 --- a/components/security_interstitials/content/cert_report_helper.h +++ b/components/security_interstitials/content/cert_report_helper.h
@@ -6,6 +6,7 @@ #define COMPONENTS_SECURITY_INTERSTITIALS_CONTENT_CERT_REPORT_HELPER_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "components/security_interstitials/content/certificate_error_report.h" #include "components/security_interstitials/core/controller_client.h" #include "net/ssl/ssl_info.h"
diff --git a/components/segmentation_platform/internal/database/database_maintenance_impl.h b/components/segmentation_platform/internal/database/database_maintenance_impl.h index ea70a01..bb6d2f77 100644 --- a/components/segmentation_platform/internal/database/database_maintenance_impl.h +++ b/components/segmentation_platform/internal/database/database_maintenance_impl.h
@@ -14,6 +14,7 @@ #include "base/containers/flat_set.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/optimization_guide/proto/models.pb.h" #include "components/segmentation_platform/internal/database/database_maintenance.h" #include "components/segmentation_platform/internal/execution/default_model_manager.h"
diff --git a/components/segmentation_platform/internal/database/mock_signal_storage_config.h b/components/segmentation_platform/internal/database/mock_signal_storage_config.h index 38f8ec6..fbada8cd 100644 --- a/components/segmentation_platform/internal/database/mock_signal_storage_config.h +++ b/components/segmentation_platform/internal/database/mock_signal_storage_config.h
@@ -10,6 +10,7 @@ #include <utility> #include <vector> +#include "base/time/time.h" #include "components/segmentation_platform/internal/database/signal_storage_config.h" #include "components/segmentation_platform/internal/proto/model_metadata.pb.h" #include "components/segmentation_platform/internal/proto/types.pb.h"
diff --git a/components/segmentation_platform/internal/database/signal_storage_config_unittest.cc b/components/segmentation_platform/internal/database/signal_storage_config_unittest.cc index 92222ac..8c2015e 100644 --- a/components/segmentation_platform/internal/database/signal_storage_config_unittest.cc +++ b/components/segmentation_platform/internal/database/signal_storage_config_unittest.cc
@@ -9,6 +9,7 @@ #include "base/test/mock_callback.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/leveldb_proto/public/proto_database.h" #include "components/leveldb_proto/testing/fake_db.h" #include "components/segmentation_platform/internal/proto/aggregation.pb.h"
diff --git a/components/segmentation_platform/internal/execution/feature_processor_state.h b/components/segmentation_platform/internal/execution/feature_processor_state.h index fd8ba6dc..7755c9a 100644 --- a/components/segmentation_platform/internal/execution/feature_processor_state.h +++ b/components/segmentation_platform/internal/execution/feature_processor_state.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/time/clock.h" +#include "base/time/time.h" #include "components/optimization_guide/proto/models.pb.h" #include "components/segmentation_platform/internal/database/ukm_types.h" #include "components/segmentation_platform/internal/execution/feature_list_query_processor.h"
diff --git a/components/segmentation_platform/internal/scheduler/model_execution_scheduler_unittest.cc b/components/segmentation_platform/internal/scheduler/model_execution_scheduler_unittest.cc index 8e791d4..e40ff21 100644 --- a/components/segmentation_platform/internal/scheduler/model_execution_scheduler_unittest.cc +++ b/components/segmentation_platform/internal/scheduler/model_execution_scheduler_unittest.cc
@@ -7,6 +7,7 @@ #include "base/run_loop.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/segmentation_platform/internal/database/mock_signal_storage_config.h" #include "components/segmentation_platform/internal/database/segment_info_database.h" #include "components/segmentation_platform/internal/database/signal_storage_config.h"
diff --git a/components/segmentation_platform/internal/selection/segment_selector_impl.cc b/components/segmentation_platform/internal/selection/segment_selector_impl.cc index a74cdb9..c815c12 100644 --- a/components/segmentation_platform/internal/selection/segment_selector_impl.cc +++ b/components/segmentation_platform/internal/selection/segment_selector_impl.cc
@@ -10,6 +10,7 @@ #include "base/logging.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "components/segmentation_platform/internal/constants.h" #include "components/segmentation_platform/internal/database/metadata_utils.h" #include "components/segmentation_platform/internal/database/segment_info_database.h"
diff --git a/components/services/app_service/app_service_mojom_impl.cc b/components/services/app_service/app_service_mojom_impl.cc index 434209d..6099254 100644 --- a/components/services/app_service/app_service_mojom_impl.cc +++ b/components/services/app_service/app_service_mojom_impl.cc
@@ -16,7 +16,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/components/services/app_service/public/cpp/app_update_mojom_unittest.cc b/components/services/app_service/public/cpp/app_update_mojom_unittest.cc index 6a35122..978ee6c 100644 --- a/components/services/app_service/public/cpp/app_update_mojom_unittest.cc +++ b/components/services/app_service/public/cpp/app_update_mojom_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "components/services/app_service/public/cpp/app_types.h" #include "components/services/app_service/public/cpp/app_update.h" #include "components/services/app_service/public/cpp/features.h"
diff --git a/components/services/app_service/public/cpp/app_update_unittest.cc b/components/services/app_service/public/cpp/app_update_unittest.cc index a21a298..fd0aa0e1 100644 --- a/components/services/app_service/public/cpp/app_update_unittest.cc +++ b/components/services/app_service/public/cpp/app_update_unittest.cc
@@ -5,6 +5,7 @@ #include "components/services/app_service/public/cpp/app_update.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "components/services/app_service/public/cpp/app_update.h" #include "components/services/app_service/public/cpp/features.h" #include "components/services/app_service/public/cpp/intent_filter.h"
diff --git a/components/services/app_service/public/cpp/features.cc b/components/services/app_service/public/cpp/features.cc index 5c026779..15e6b28 100644 --- a/components/services/app_service/public/cpp/features.cc +++ b/components/services/app_service/public/cpp/features.cc
@@ -11,6 +11,6 @@ base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kAppServiceOnAppUpdateWithoutMojom{ - "AppServiceOnAppUpdateWithoutMojom", base::FEATURE_DISABLED_BY_DEFAULT}; + "AppServiceOnAppUpdateWithoutMojom", base::FEATURE_ENABLED_BY_DEFAULT}; } // namespace apps
diff --git a/components/services/app_service/public/cpp/instance_registry.h b/components/services/app_service/public/cpp/instance_registry.h index f8b64a1..d0f78ea 100644 --- a/components/services/app_service/public/cpp/instance_registry.h +++ b/components/services/app_service/public/cpp/instance_registry.h
@@ -15,6 +15,7 @@ #include "base/observer_list.h" #include "base/observer_list_types.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "components/services/app_service/public/cpp/instance.h" #include "components/services/app_service/public/cpp/instance_update.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/components/services/app_service/public/cpp/instance_update_unittest.cc b/components/services/app_service/public/cpp/instance_update_unittest.cc index f243ad5..e617e6c 100644 --- a/components/services/app_service/public/cpp/instance_update_unittest.cc +++ b/components/services/app_service/public/cpp/instance_update_unittest.cc
@@ -5,6 +5,7 @@ #include "components/services/app_service/public/cpp/instance_update.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "chrome/test/base/testing_profile.h" #include "components/services/app_service/public/cpp/instance.h"
diff --git a/components/services/app_service/public/cpp/shortcut.cc b/components/services/app_service/public/cpp/shortcut.cc index bb2f14f6..8918b48 100644 --- a/components/services/app_service/public/cpp/shortcut.cc +++ b/components/services/app_service/public/cpp/shortcut.cc
@@ -12,7 +12,7 @@ Shortcut::Shortcut(const std::string& shortcut_id, const std::string& name, - int position) + uint8_t position) : shortcut_id(shortcut_id), name(name), position(position) {} Shortcut::~Shortcut() = default;
diff --git a/components/services/app_service/public/cpp/shortcut.h b/components/services/app_service/public/cpp/shortcut.h index 22fbba6..4ca4f3dd 100644 --- a/components/services/app_service/public/cpp/shortcut.h +++ b/components/services/app_service/public/cpp/shortcut.h
@@ -18,7 +18,7 @@ struct COMPONENT_EXPORT(APP_TYPES) Shortcut { Shortcut(const std::string& shortcut_id, const std::string& name, - int position = 0); + uint8_t position = 0); Shortcut(const Shortcut&) = delete; Shortcut& operator=(const Shortcut&) = delete; @@ -46,7 +46,7 @@ std::string name; // "Position" of a shortcut, which is a non-negative, sequential // value. If position is 0, no position was specified. - int position; + uint8_t position; }; using ShortcutPtr = std::unique_ptr<Shortcut>;
diff --git a/components/services/filesystem/directory_test_helper.cc b/components/services/filesystem/directory_test_helper.cc index 695d5150..094098a 100644 --- a/components/services/filesystem/directory_test_helper.cc +++ b/components/services/filesystem/directory_test_helper.cc
@@ -9,7 +9,6 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "components/services/filesystem/directory_impl.h"
diff --git a/components/services/filesystem/file_impl.cc b/components/services/filesystem/file_impl.cc index a8417ea7..a2b4352 100644 --- a/components/services/filesystem/file_impl.cc +++ b/components/services/filesystem/file_impl.cc
@@ -16,6 +16,7 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/scoped_file.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/services/filesystem/lock_table.h" #include "components/services/filesystem/shared_temp_dir.h"
diff --git a/components/services/font/font_loader_unittest.cc b/components/services/font/font_loader_unittest.cc index ab7b50b..b9112b5 100644 --- a/components/services/font/font_loader_unittest.cc +++ b/components/services/font/font_loader_unittest.cc
@@ -7,7 +7,6 @@ #include "base/files/file_path.h" #include "base/no_destructor.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h" #include "components/services/font/font_service_app.h"
diff --git a/components/services/font/public/cpp/font_service_thread.cc b/components/services/font/public/cpp/font_service_thread.cc index 84446cd..85d8956e 100644 --- a/components/services/font/public/cpp/font_service_thread.cc +++ b/components/services/font/public/cpp/font_service_thread.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/services/font/public/cpp/mapped_font_file.h"
diff --git a/components/services/heap_profiling/heap_profiling_service.cc b/components/services/heap_profiling/heap_profiling_service.cc index b21009e11..4d2def2d 100644 --- a/components/services/heap_profiling/heap_profiling_service.cc +++ b/components/services/heap_profiling/heap_profiling_service.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/services/heap_profiling/connection_manager.h" #include "components/services/heap_profiling/public/mojom/heap_profiling_client.mojom.h"
diff --git a/components/services/heap_profiling/public/cpp/profiling_client.cc b/components/services/heap_profiling/public/cpp/profiling_client.cc index 70de019..23c0e154 100644 --- a/components/services/heap_profiling/public/cpp/profiling_client.cc +++ b/components/services/heap_profiling/public/cpp/profiling_client.cc
@@ -14,7 +14,6 @@ #include "base/notreached.h" #include "base/sampling_heap_profiler/poisson_allocation_sampler.h" #include "base/sampling_heap_profiler/sampling_heap_profiler.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/heap_profiler_allocation_context_tracker.h" #include "base/trace_event/malloc_dump_provider.h"
diff --git a/components/services/patch/in_process_file_patcher.cc b/components/services/patch/in_process_file_patcher.cc index 1ff1b46..5bfd52ef 100644 --- a/components/services/patch/in_process_file_patcher.cc +++ b/components/services/patch/in_process_file_patcher.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/services/patch/file_patcher_impl.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h"
diff --git a/components/services/quarantine/quarantine_impl.cc b/components/services/quarantine/quarantine_impl.cc index c5f1a33c..9429d2d5 100644 --- a/components/services/quarantine/quarantine_impl.cc +++ b/components/services/quarantine/quarantine_impl.cc
@@ -5,7 +5,6 @@ #include "components/services/quarantine/quarantine_impl.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h"
diff --git a/components/services/storage/BUILD.gn b/components/services/storage/BUILD.gn index 00ed503c..8119da0c 100644 --- a/components/services/storage/BUILD.gn +++ b/components/services/storage/BUILD.gn
@@ -77,10 +77,13 @@ "service_worker/service_worker_storage.h", "service_worker/service_worker_storage_control_impl.cc", "service_worker/service_worker_storage_control_impl.h", - "shared_storage/async_shared_storage_database.cc", "shared_storage/async_shared_storage_database.h", + "shared_storage/async_shared_storage_database_impl.cc", + "shared_storage/async_shared_storage_database_impl.h", "shared_storage/shared_storage_database.cc", "shared_storage/shared_storage_database.h", + "shared_storage/shared_storage_manager.cc", + "shared_storage/shared_storage_manager.h", "shared_storage/shared_storage_options.cc", "shared_storage/shared_storage_options.h", "storage_service_impl.cc", @@ -110,6 +113,7 @@ "//services/network/public/mojom", "//storage/browser", "//storage/common", + "//third_party/sqlite", ] } @@ -184,8 +188,9 @@ "service_worker/service_worker_storage_test_utils.cc", "service_worker/service_worker_storage_test_utils.h", "service_worker/service_worker_storage_unittest.cc", - "shared_storage/async_shared_storage_database_unittest.cc", + "shared_storage/async_shared_storage_database_impl_unittest.cc", "shared_storage/shared_storage_database_unittest.cc", + "shared_storage/shared_storage_manager_unittest.cc", "storage_service_impl_unittest.cc", ]
diff --git a/components/services/storage/dom_storage/dom_storage_database.cc b/components/services/storage/dom_storage/dom_storage_database.cc index 0991060d..c09f7ce 100644 --- a/components/services/storage/dom_storage/dom_storage_database.cc +++ b/components/services/storage/dom_storage/dom_storage_database.cc
@@ -9,7 +9,6 @@ #include "base/debug/leak_annotations.h" #include "base/no_destructor.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/trace_event/memory_allocator_dump.h"
diff --git a/components/services/storage/dom_storage/dom_storage_database_unittest.cc b/components/services/storage/dom_storage/dom_storage_database_unittest.cc index 9f232dd..63b5b0c6 100644 --- a/components/services/storage/dom_storage/dom_storage_database_unittest.cc +++ b/components/services/storage/dom_storage/dom_storage_database_unittest.cc
@@ -12,7 +12,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/components/services/storage/dom_storage/local_storage_impl.cc b/components/services/storage/dom_storage/local_storage_impl.cc index 3d24a6d5..bf608371 100644 --- a/components/services/storage/dom_storage/local_storage_impl.cc +++ b/components/services/storage/dom_storage/local_storage_impl.cc
@@ -25,7 +25,6 @@ #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/components/services/storage/dom_storage/session_storage_area_impl_unittest.cc b/components/services/storage/dom_storage/session_storage_area_impl_unittest.cc index 1e99b12a..6e70f62 100644 --- a/components/services/storage/dom_storage/session_storage_area_impl_unittest.cc +++ b/components/services/storage/dom_storage/session_storage_area_impl_unittest.cc
@@ -12,7 +12,6 @@ #include "base/guid.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/components/services/storage/dom_storage/session_storage_data_map_unittest.cc b/components/services/storage/dom_storage/session_storage_data_map_unittest.cc index 5d3362c5..dbad888 100644 --- a/components/services/storage/dom_storage/session_storage_data_map_unittest.cc +++ b/components/services/storage/dom_storage/session_storage_data_map_unittest.cc
@@ -12,7 +12,6 @@ #include "base/containers/span.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/components/services/storage/dom_storage/session_storage_impl.cc b/components/services/storage/dom_storage/session_storage_impl.cc index 80aecec..cb5d09e 100644 --- a/components/services/storage/dom_storage/session_storage_impl.cc +++ b/components/services/storage/dom_storage/session_storage_impl.cc
@@ -20,7 +20,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/trace_event/memory_dump_manager.h" #include "build/build_config.h" #include "components/services/storage/dom_storage/async_dom_storage_database.h"
diff --git a/components/services/storage/dom_storage/session_storage_impl_unittest.cc b/components/services/storage/dom_storage/session_storage_impl_unittest.cc index 545c989b..e631fa0c 100644 --- a/components/services/storage/dom_storage/session_storage_impl_unittest.cc +++ b/components/services/storage/dom_storage/session_storage_impl_unittest.cc
@@ -20,7 +20,6 @@ #include "base/memory/ref_counted.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/components/services/storage/dom_storage/session_storage_metadata_unittest.cc b/components/services/storage/dom_storage/session_storage_metadata_unittest.cc index fa21672..deff1ec 100644 --- a/components/services/storage/dom_storage/session_storage_metadata_unittest.cc +++ b/components/services/storage/dom_storage/session_storage_metadata_unittest.cc
@@ -13,7 +13,6 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/components/services/storage/dom_storage/session_storage_namespace_impl_unittest.cc b/components/services/storage/dom_storage/session_storage_namespace_impl_unittest.cc index 2c30996..deea3410 100644 --- a/components/services/storage/dom_storage/session_storage_namespace_impl_unittest.cc +++ b/components/services/storage/dom_storage/session_storage_namespace_impl_unittest.cc
@@ -11,7 +11,6 @@ #include "base/guid.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/gmock_callback_support.h"
diff --git a/components/services/storage/dom_storage/storage_area_impl_unittest.cc b/components/services/storage/dom_storage/storage_area_impl_unittest.cc index 299d538..c48d1dff 100644 --- a/components/services/storage/dom_storage/storage_area_impl_unittest.cc +++ b/components/services/storage/dom_storage/storage_area_impl_unittest.cc
@@ -17,7 +17,6 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/components/services/storage/indexed_db/scopes/leveldb_scopes.cc b/components/services/storage/indexed_db/scopes/leveldb_scopes.cc index e2d1299..da24baf3 100644 --- a/components/services/storage/indexed_db/scopes/leveldb_scopes.cc +++ b/components/services/storage/indexed_db/scopes/leveldb_scopes.cc
@@ -15,7 +15,6 @@ #include "base/memory/ptr_util.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_database.h b/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_database.h index e0826eb..89fa64e 100644 --- a/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_database.h +++ b/components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_database.h
@@ -17,6 +17,7 @@ #include "base/strings/string_piece.h" #include "base/task/sequenced_task_runner.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_provider.h" #include "components/services/storage/indexed_db/leveldb/leveldb_state.h" #include "third_party/leveldatabase/src/include/leveldb/options.h"
diff --git a/components/services/storage/partition_impl.cc b/components/services/storage/partition_impl.cc index d77cb00..2972ce0 100644 --- a/components/services/storage/partition_impl.cc +++ b/components/services/storage/partition_impl.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/services/storage/public/cpp/constants.cc b/components/services/storage/public/cpp/constants.cc index 0c80a8e..3291608 100644 --- a/components/services/storage/public/cpp/constants.cc +++ b/components/services/storage/public/cpp/constants.cc
@@ -51,4 +51,9 @@ const base::FilePath::CharType kScriptCacheDirectory[] = FILE_PATH_LITERAL("ScriptCache"); +// The path where Shared Storage data is persisted on disk, relative to a +// storage partition's root directory. +const base::FilePath::CharType kSharedStoragePath[] = + FILE_PATH_LITERAL("SharedStorage"); + } // namespace storage
diff --git a/components/services/storage/public/cpp/constants.h b/components/services/storage/public/cpp/constants.h index aa4fa59..b1de327 100644 --- a/components/services/storage/public/cpp/constants.h +++ b/components/services/storage/public/cpp/constants.h
@@ -40,6 +40,9 @@ COMPONENT_EXPORT(STORAGE_SERVICE_PUBLIC) extern const base::FilePath::CharType kScriptCacheDirectory[]; +COMPONENT_EXPORT(STORAGE_SERVICE_PUBLIC) +extern const base::FilePath::CharType kSharedStoragePath[]; + } // namespace storage #endif // COMPONENTS_SERVICES_STORAGE_PUBLIC_CPP_CONSTANTS_H_
diff --git a/components/services/storage/public/cpp/filesystem/filesystem_proxy.cc b/components/services/storage/public/cpp/filesystem/filesystem_proxy.cc index c2d78955..30bb710 100644 --- a/components/services/storage/public/cpp/filesystem/filesystem_proxy.cc +++ b/components/services/storage/public/cpp/filesystem/filesystem_proxy.cc
@@ -12,7 +12,6 @@ #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" -#include "base/task/post_task.h" #include "base/types/pass_key.h" #include "build/build_config.h" #include "components/services/storage/public/cpp/filesystem/filesystem_impl.h"
diff --git a/components/services/storage/public/cpp/filesystem/filesystem_proxy_unittest.cc b/components/services/storage/public/cpp/filesystem/filesystem_proxy_unittest.cc index 1e169b91..25cb215 100644 --- a/components/services/storage/public/cpp/filesystem/filesystem_proxy_unittest.cc +++ b/components/services/storage/public/cpp/filesystem/filesystem_proxy_unittest.cc
@@ -11,7 +11,6 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h" #include "components/services/storage/public/cpp/filesystem/filesystem_impl.h"
diff --git a/components/services/storage/service_worker/service_worker_storage.cc b/components/services/storage/service_worker/service_worker_storage.cc index 983ddbe..9ca7aa74 100644 --- a/components/services/storage/service_worker/service_worker_storage.cc +++ b/components/services/storage/service_worker/service_worker_storage.cc
@@ -16,7 +16,6 @@ #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/components/services/storage/shared_storage/async_shared_storage_database.h b/components/services/storage/shared_storage/async_shared_storage_database.h index 1771c4f..8a17667 100644 --- a/components/services/storage/shared_storage/async_shared_storage_database.h +++ b/components/services/storage/shared_storage/async_shared_storage_database.h
@@ -6,6 +6,7 @@ #define COMPONENTS_SERVICES_STORAGE_SHARED_STORAGE_ASYNC_SHARED_STORAGE_DATABASE_H_ #include <memory> +#include <queue> #include <string> #include <vector> @@ -16,7 +17,6 @@ #include "components/services/storage/shared_storage/shared_storage_database.h" namespace base { -class FilePath; class Time; class TimeDelta; } // namespace base @@ -43,33 +43,7 @@ // match. using OriginMatcherFunction = SharedStorageDatabase::OriginMatcherFunction; - // Creates an `AsyncSharedStorageDatabase` instance. If `db_path` is empty, - // creates a temporary, in-memory database; otherwise creates a persistent - // database within a filesystem directory given by `db_path`, which must be an - // absolute path. If file-backed, the database may or may not already exist at - // `db_path`, and if it doesn't, it will be created. - // - // The instance will be bound to and perform all operations on - // `blocking_task_runner`, which must support blocking operations. - static std::unique_ptr<AsyncSharedStorageDatabase> Create( - base::FilePath db_path, - scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, - scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy, - std::unique_ptr<SharedStorageDatabaseOptions> options); - - AsyncSharedStorageDatabase(const AsyncSharedStorageDatabase&) = delete; - AsyncSharedStorageDatabase& operator=(const AsyncSharedStorageDatabase&) = - delete; - AsyncSharedStorageDatabase(const AsyncSharedStorageDatabase&&) = delete; - AsyncSharedStorageDatabase& operator=(const AsyncSharedStorageDatabase&&) = - delete; - - ~AsyncSharedStorageDatabase(); - - base::SequenceBound<SharedStorageDatabase>& - GetSequenceBoundDatabaseForTesting() { - return database_; - } + virtual ~AsyncSharedStorageDatabase() = default; // Destroys the database. // @@ -78,7 +52,7 @@ // // It is OK to call `Destroy()` regardless of whether database initialization // was successful. - void Destroy(base::OnceCallback<void(bool)> callback); + virtual void Destroy(base::OnceCallback<void(bool)> callback) = 0; // `TrimMemory()`, `Get()`, `Set()`, `Append()`, `Delete()`, `Clear()`, // `Length()`, `Key()`, `PurgeMatchingOrigins()`, `PurgeStaleOrigins()`, and @@ -96,7 +70,7 @@ // Releases all non-essential memory associated with this database connection. // `callback` runs once the operation is finished. - void TrimMemory(base::OnceClosure callback); + virtual void TrimMemory(base::OnceClosure callback) = 0; // Retrieves the `value` for `context_origin` and `key`. `callback` is called // with a struct bundling a string `value` in its data field if one is found, @@ -106,9 +80,9 @@ // `key` must be of length at most // `SharedStorageDatabaseOptions::max_string_length`, with the burden on the // caller to handle errors for strings that exceed this length. - void Get(url::Origin context_origin, - std::u16string key, - base::OnceCallback<void(GetResult)> callback); + virtual void Get(url::Origin context_origin, + std::u16string key, + base::OnceCallback<void(GetResult)> callback) = 0; // Sets an entry for `context_origin` and `key` to have `value`. // If `behavior` is `kIgnoreIfPresent` and an entry already exists for @@ -122,11 +96,11 @@ // the length retrieved by `Length(context_origin, callback)` equals // `SharedStorageDatabaseOptions::max_entries_per_origin_`, `Set()` will fail // and the table will not be modified. - void Set(url::Origin context_origin, - std::u16string key, - std::u16string value, - base::OnceCallback<void(OperationResult)> callback, - SetBehavior behavior = SetBehavior::kDefault); + virtual void Set(url::Origin context_origin, + std::u16string key, + std::u16string value, + base::OnceCallback<void(OperationResult)> callback, + SetBehavior behavior = SetBehavior::kDefault) = 0; // Appends `value` to the end of the current `value` for `context_origin` and // `key`, if `key` exists. If `key` does not exist, creates an entry for `key` @@ -142,10 +116,10 @@ // retrieved by `Length(context_origin, callback)` equals // `SharedStorageDatabaseOptions::max_entries_per_origin_`, `Append()` will // fail and the database table will not be modified. - void Append(url::Origin context_origin, - std::u16string key, - std::u16string value, - base::OnceCallback<void(OperationResult)> callback); + virtual void Append(url::Origin context_origin, + std::u16string key, + std::u16string value, + base::OnceCallback<void(OperationResult)> callback) = 0; // Deletes the entry for `context_origin` and `key`. The parameter of // `callback` reports whether the deletion is successful. @@ -153,19 +127,19 @@ // `key` must be of length at most // `SharedStorageDatabaseOptions::max_string_length`, with the burden on the // caller to handle errors for strings that exceed this length. - void Delete(url::Origin context_origin, - std::u16string key, - base::OnceCallback<void(OperationResult)> callback); + virtual void Delete(url::Origin context_origin, + std::u16string key, + base::OnceCallback<void(OperationResult)> callback) = 0; // Clears all entries for `context_origin`. The parameter of `callback` // reports whether the operation is successful. - void Clear(url::Origin context_origin, - base::OnceCallback<void(OperationResult)> callback); + virtual void Clear(url::Origin context_origin, + base::OnceCallback<void(OperationResult)> callback) = 0; // The parameter of `callback` reports the number of entries for // `context_origin`, 0 if there are none, or -1 on operation failure. - void Length(url::Origin context_origin, - base::OnceCallback<void(int)> callback); + virtual void Length(url::Origin context_origin, + base::OnceCallback<void(int)> callback) = 0; // If a list of all the keys for `context_origin` are taken in lexicographic // order, retrieves the `key` at `index` of the list and calls `callback` with @@ -175,9 +149,9 @@ // `index` must be non-negative. // // TODO(crbug.com/1247861): Replace with an async iterator. - void Key(url::Origin context_origin, - int index, - base::OnceCallback<void(GetResult)> callback); + virtual void Key(url::Origin context_origin, + int index, + base::OnceCallback<void(GetResult)> callback) = 0; // Clears all origins that match `origin_matcher` run on the owning // StoragePartition's `SpecialStoragePolicy` and have `last_used_time` between @@ -187,49 +161,25 @@ // // Note that `origin_matcher` is accessed on a different sequence than where // it was created. - void PurgeMatchingOrigins(OriginMatcherFunction origin_matcher, - base::Time begin, - base::Time end, - base::OnceCallback<void(OperationResult)> callback, - bool perform_storage_cleanup = false); + virtual void PurgeMatchingOrigins( + OriginMatcherFunction origin_matcher, + base::Time begin, + base::Time end, + base::OnceCallback<void(OperationResult)> callback, + bool perform_storage_cleanup = false) = 0; // Clear all entries for all origins whose `last_read_time` falls before // `base::Time::Now() - window_to_be_deemed_active`. - void PurgeStaleOrigins(base::TimeDelta window_to_be_deemed_active, - base::OnceCallback<void(OperationResult)> callback); + virtual void PurgeStaleOrigins( + base::TimeDelta window_to_be_deemed_active, + base::OnceCallback<void(OperationResult)> callback) = 0; // Fetches a vector of `mojom::StorageUsageInfoPtr`, with one // `mojom::StorageUsageInfoPtr` for each origin currently using shared storage // in this profile. - void FetchOrigins( + virtual void FetchOrigins( base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> - callback); - - // Asynchronously determines whether the database is open. Useful for testing. - void IsOpenForTesting(base::OnceCallback<void(bool)> callback); - - // Asynchronously determines the database `InitStatus`. Useful for testing. - void DBStatusForTesting(base::OnceCallback<void(InitStatus)> callback); - - // Changes `last_used_time` to `override_last_used_time` for `context_origin`. - void OverrideLastUsedTimeForTesting(url::Origin context_origin, - base::Time override_last_used_time, - base::OnceCallback<void(bool)> callback); - - // Overrides the `SpecialStoragePolicy` for tests. - void OverrideSpecialStoragePolicyForTesting( - scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy, - base::OnceCallback<void(bool)> callback); - - private: - // Instances should be obtained from the `Create()` factory method. - AsyncSharedStorageDatabase( - base::FilePath db_path, - scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, - scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy, - std::unique_ptr<SharedStorageDatabaseOptions> options); - - base::SequenceBound<SharedStorageDatabase> database_; + callback) = 0; }; } // namespace storage
diff --git a/components/services/storage/shared_storage/async_shared_storage_database.cc b/components/services/storage/shared_storage/async_shared_storage_database_impl.cc similarity index 78% rename from components/services/storage/shared_storage/async_shared_storage_database.cc rename to components/services/storage/shared_storage/async_shared_storage_database_impl.cc index 3a6d9f4..61d61cd 100644 --- a/components/services/storage/shared_storage/async_shared_storage_database.cc +++ b/components/services/storage/shared_storage/async_shared_storage_database_impl.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/services/storage/shared_storage/async_shared_storage_database.h" +#include "components/services/storage/shared_storage/async_shared_storage_database_impl.h" #include <inttypes.h> @@ -21,17 +21,18 @@ namespace storage { // static -std::unique_ptr<AsyncSharedStorageDatabase> AsyncSharedStorageDatabase::Create( +std::unique_ptr<AsyncSharedStorageDatabase> +AsyncSharedStorageDatabaseImpl::Create( base::FilePath db_path, scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy, std::unique_ptr<SharedStorageDatabaseOptions> options) { - return absl::WrapUnique(new AsyncSharedStorageDatabase( + return absl::WrapUnique(new AsyncSharedStorageDatabaseImpl( std::move(db_path), std::move(blocking_task_runner), std::move(special_storage_policy), std::move(options))); } -AsyncSharedStorageDatabase::AsyncSharedStorageDatabase( +AsyncSharedStorageDatabaseImpl::AsyncSharedStorageDatabaseImpl( base::FilePath db_path, scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy, @@ -42,22 +43,22 @@ std::move(special_storage_policy), std::move(options))) {} -AsyncSharedStorageDatabase::~AsyncSharedStorageDatabase() = default; +AsyncSharedStorageDatabaseImpl::~AsyncSharedStorageDatabaseImpl() = default; -void AsyncSharedStorageDatabase::Destroy( +void AsyncSharedStorageDatabaseImpl::Destroy( base::OnceCallback<void(bool)> callback) { DCHECK(database_); database_.AsyncCall(&SharedStorageDatabase::Destroy) .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::TrimMemory(base::OnceClosure callback) { +void AsyncSharedStorageDatabaseImpl::TrimMemory(base::OnceClosure callback) { DCHECK(database_); database_.AsyncCall(&SharedStorageDatabase::TrimMemory) .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::Get( +void AsyncSharedStorageDatabaseImpl::Get( url::Origin context_origin, std::u16string key, base::OnceCallback<void(GetResult)> callback) { @@ -67,7 +68,7 @@ .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::Set( +void AsyncSharedStorageDatabaseImpl::Set( url::Origin context_origin, std::u16string key, std::u16string value, @@ -80,7 +81,7 @@ .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::Append( +void AsyncSharedStorageDatabaseImpl::Append( url::Origin context_origin, std::u16string key, std::u16string value, @@ -91,7 +92,7 @@ .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::Delete( +void AsyncSharedStorageDatabaseImpl::Delete( url::Origin context_origin, std::u16string key, base::OnceCallback<void(OperationResult)> callback) { @@ -101,7 +102,7 @@ .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::Clear( +void AsyncSharedStorageDatabaseImpl::Clear( url::Origin context_origin, base::OnceCallback<void(OperationResult)> callback) { DCHECK(database_); @@ -110,7 +111,7 @@ .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::Length( +void AsyncSharedStorageDatabaseImpl::Length( url::Origin context_origin, base::OnceCallback<void(int)> callback) { DCHECK(database_); @@ -119,7 +120,7 @@ .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::Key( +void AsyncSharedStorageDatabaseImpl::Key( url::Origin context_origin, int index, base::OnceCallback<void(GetResult)> callback) { @@ -130,7 +131,7 @@ .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::PurgeMatchingOrigins( +void AsyncSharedStorageDatabaseImpl::PurgeMatchingOrigins( OriginMatcherFunction origin_matcher, base::Time begin, base::Time end, @@ -142,7 +143,7 @@ .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::PurgeStaleOrigins( +void AsyncSharedStorageDatabaseImpl::PurgeStaleOrigins( base::TimeDelta window_to_be_deemed_active, base::OnceCallback<void(OperationResult)> callback) { DCHECK(database_); @@ -151,7 +152,7 @@ .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::FetchOrigins( +void AsyncSharedStorageDatabaseImpl::FetchOrigins( base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> callback) { DCHECK(database_); @@ -159,38 +160,41 @@ .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::IsOpenForTesting( +base::SequenceBound<SharedStorageDatabase>* +AsyncSharedStorageDatabaseImpl::GetSequenceBoundDatabaseForTesting() { + return database_ ? &database_ : nullptr; +} + +void AsyncSharedStorageDatabaseImpl::IsOpenForTesting( base::OnceCallback<void(bool)> callback) { DCHECK(database_); database_.AsyncCall(&SharedStorageDatabase::IsOpenForTesting) .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::DBStatusForTesting( +void AsyncSharedStorageDatabaseImpl::DBStatusForTesting( base::OnceCallback<void(InitStatus)> callback) { DCHECK(database_); database_.AsyncCall(&SharedStorageDatabase::DBStatusForTesting) .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::OverrideLastUsedTimeForTesting( +void AsyncSharedStorageDatabaseImpl::OverrideLastUsedTimeForTesting( url::Origin context_origin, - base::Time override_last_used_time, + base::Time new_last_used_time, base::OnceCallback<void(bool)> callback) { DCHECK(database_); database_.AsyncCall(&SharedStorageDatabase::OverrideLastUsedTimeForTesting) - .WithArgs(std::move(context_origin), override_last_used_time) + .WithArgs(std::move(context_origin), new_last_used_time) .Then(std::move(callback)); } -void AsyncSharedStorageDatabase::OverrideSpecialStoragePolicyForTesting( - scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy, - base::OnceCallback<void(bool)> callback) { +void AsyncSharedStorageDatabaseImpl::OverrideSpecialStoragePolicyForTesting( + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy) { DCHECK(database_); database_ .AsyncCall(&SharedStorageDatabase::OverrideSpecialStoragePolicyForTesting) - .WithArgs(std::move(special_storage_policy)) - .Then(std::move(callback)); + .WithArgs(std::move(special_storage_policy)); } } // namespace storage
diff --git a/components/services/storage/shared_storage/async_shared_storage_database_impl.h b/components/services/storage/shared_storage/async_shared_storage_database_impl.h new file mode 100644 index 0000000..90853955 --- /dev/null +++ b/components/services/storage/shared_storage/async_shared_storage_database_impl.h
@@ -0,0 +1,143 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_SERVICES_STORAGE_SHARED_STORAGE_ASYNC_SHARED_STORAGE_DATABASE_IMPL_H_ +#define COMPONENTS_SERVICES_STORAGE_SHARED_STORAGE_ASYNC_SHARED_STORAGE_DATABASE_IMPL_H_ + +#include <memory> +#include <queue> +#include <string> +#include <vector> + +#include "base/callback_forward.h" +#include "base/memory/scoped_refptr.h" +#include "base/task/sequenced_task_runner.h" +#include "base/threading/sequence_bound.h" +#include "components/services/storage/shared_storage/async_shared_storage_database.h" +#include "components/services/storage/shared_storage/shared_storage_database.h" + +namespace base { +class FilePath; +class Time; +class TimeDelta; +} // namespace base + +namespace url { +class Origin; +} // namespace url + +namespace storage { +struct SharedStorageDatabaseOptions; +class SpecialStoragePolicy; + +// A wrapper around SharedStorageDatabase which makes the operations +// asynchronous. +class AsyncSharedStorageDatabaseImpl : public AsyncSharedStorageDatabase { + public: + using InitStatus = SharedStorageDatabase::InitStatus; + using SetBehavior = SharedStorageDatabase::SetBehavior; + using OperationResult = SharedStorageDatabase::OperationResult; + using GetResult = SharedStorageDatabase::GetResult; + + // A callback type to check if a given origin matches a storage policy. + // Can be passed empty/null where used, which means the origin will always + // match. + using OriginMatcherFunction = SharedStorageDatabase::OriginMatcherFunction; + + // Creates an `AsyncSharedStorageDatabase` instance. If `db_path` is empty, + // creates a temporary, in-memory database; otherwise creates a persistent + // database within a filesystem directory given by `db_path`, which must be an + // absolute path. If file-backed, the database may or may not already exist at + // `db_path`, and if it doesn't, it will be created. + // + // The instance will be bound to and perform all operations on + // `blocking_task_runner`, which must support blocking operations. + static std::unique_ptr<AsyncSharedStorageDatabase> Create( + base::FilePath db_path, + scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy, + std::unique_ptr<SharedStorageDatabaseOptions> options); + + AsyncSharedStorageDatabaseImpl(const AsyncSharedStorageDatabaseImpl&) = + delete; + AsyncSharedStorageDatabaseImpl(const AsyncSharedStorageDatabaseImpl&&) = + delete; + + ~AsyncSharedStorageDatabaseImpl() override; + + AsyncSharedStorageDatabaseImpl& operator=( + const AsyncSharedStorageDatabaseImpl&) = delete; + AsyncSharedStorageDatabaseImpl& operator=( + const AsyncSharedStorageDatabaseImpl&&) = delete; + + // AsyncSharedStorageDatabase + void Destroy(base::OnceCallback<void(bool)> callback) override; + void TrimMemory(base::OnceClosure callback) override; + void Get(url::Origin context_origin, + std::u16string key, + base::OnceCallback<void(GetResult)> callback) override; + void Set(url::Origin context_origin, + std::u16string key, + std::u16string value, + base::OnceCallback<void(OperationResult)> callback, + SetBehavior behavior = SetBehavior::kDefault) override; + void Append(url::Origin context_origin, + std::u16string key, + std::u16string value, + base::OnceCallback<void(OperationResult)> callback) override; + void Delete(url::Origin context_origin, + std::u16string key, + base::OnceCallback<void(OperationResult)> callback) override; + void Clear(url::Origin context_origin, + base::OnceCallback<void(OperationResult)> callback) override; + void Length(url::Origin context_origin, + base::OnceCallback<void(int)> callback) override; + void Key(url::Origin context_origin, + int index, + base::OnceCallback<void(GetResult)> callback) override; + void PurgeMatchingOrigins(OriginMatcherFunction origin_matcher, + base::Time begin, + base::Time end, + base::OnceCallback<void(OperationResult)> callback, + bool perform_storage_cleanup = false) override; + void PurgeStaleOrigins( + base::TimeDelta window_to_be_deemed_active, + base::OnceCallback<void(OperationResult)> callback) override; + void FetchOrigins( + base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> + callback) override; + + // Gets the underlying database for tests. + base::SequenceBound<SharedStorageDatabase>* + GetSequenceBoundDatabaseForTesting(); + + // Asynchronously determines whether the database is open. + void IsOpenForTesting(base::OnceCallback<void(bool)> callback); + + // Asynchronously determines the database `InitStatus`. Useful for testing. + void DBStatusForTesting(base::OnceCallback<void(InitStatus)> callback); + + // Changes `last_used_time` to `new_last_used_time` for `context_origin`. + void OverrideLastUsedTimeForTesting(url::Origin context_origin, + base::Time new_last_used_time, + base::OnceCallback<void(bool)> callback); + + // Overrides the `SpecialStoragePolicy` for tests. + void OverrideSpecialStoragePolicyForTesting( + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy); + + private: + // Instances should be obtained from the `Create()` factory method. + AsyncSharedStorageDatabaseImpl( + base::FilePath db_path, + scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy, + std::unique_ptr<SharedStorageDatabaseOptions> options); + + base::SequenceBound<SharedStorageDatabase> database_; +}; + +} // namespace storage + +#endif // COMPONENTS_SERVICES_STORAGE_SHARED_STORAGE_ASYNC_SHARED_STORAGE_DATABASE_IMPL_H_
diff --git a/components/services/storage/shared_storage/async_shared_storage_database_unittest.cc b/components/services/storage/shared_storage/async_shared_storage_database_impl_unittest.cc similarity index 87% rename from components/services/storage/shared_storage/async_shared_storage_database_unittest.cc rename to components/services/storage/shared_storage/async_shared_storage_database_impl_unittest.cc index fdf3041a..5193e2a0 100644 --- a/components/services/storage/shared_storage/async_shared_storage_database_unittest.cc +++ b/components/services/storage/shared_storage/async_shared_storage_database_impl_unittest.cc
@@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/services/storage/shared_storage/async_shared_storage_database.h" +#include "components/services/storage/shared_storage/async_shared_storage_database_impl.h" +#include <cctype> #include <memory> #include <queue> #include <string> @@ -49,15 +50,16 @@ using GetResult = SharedStorageDatabase::GetResult; using DBOperation = TestDatabaseOperationReceiver::DBOperation; using Type = DBOperation::Type; +using DBType = SharedStorageTestDBType; const int kMaxEntriesPerOrigin = 5; const int kMaxStringLength = 100; } // namespace -class AsyncSharedStorageDatabaseTest : public testing::Test { +class AsyncSharedStorageDatabaseImplTest : public testing::Test { public: - AsyncSharedStorageDatabaseTest() + AsyncSharedStorageDatabaseImplTest() : task_runner_(base::ThreadPool::CreateSequencedTaskRunner( {base::MayBlock(), base::WithBaseSyncPrimitives(), base::TaskShutdownBehavior::BLOCK_SHUTDOWN})), @@ -65,15 +67,11 @@ base::MakeRefCounted<MockSpecialStoragePolicy>()), receiver_(std::make_unique<TestDatabaseOperationReceiver>()) {} - ~AsyncSharedStorageDatabaseTest() override = default; + ~AsyncSharedStorageDatabaseImplTest() override = default; void SetUp() override { InitSharedStorageFeature(); - - // Get a temporary directory for the test DB files. - ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - - file_name_ = temp_dir_.GetPath().AppendASCII("TestSharedStorage.db"); + async_database_ = Create(); } void TearDown() override { @@ -84,7 +82,8 @@ // force deletes the database file. EXPECT_TRUE(DestroySync()); EXPECT_FALSE(base::PathExists(file_name_)); - EXPECT_TRUE(temp_dir_.Delete()); + if (GetType() != DBType::kInMemory) + EXPECT_TRUE(temp_dir_.Delete()); } virtual void InitSharedStorageFeature() { @@ -93,22 +92,35 @@ {{"MaxSharedStorageInitTries", "1"}}); } - // Initialize an async shared storage database instance from the SQL file at - // `relative_file_path` in the "storage/" subdirectory of test data. - void LoadFromFileSync(const char* relative_file_path) { - DCHECK(!file_name_.empty()); + virtual DBType GetType() { return DBType::kInMemory; } - ASSERT_TRUE(CreateDatabaseFromSQL(file_name_, relative_file_path)); + // Return the relative file path in the "storage/" subdirectory of test data + // for the SQL file from which to initialize an async shared storage database + // instance. + virtual const char* GetRelativeFilePath() { return nullptr; } - async_database_ = AsyncSharedStorageDatabase::Create( + std::unique_ptr<AsyncSharedStorageDatabase> Create() { + if (GetType() != DBType::kInMemory) + PrepareFileBacked(); + else + EXPECT_TRUE(file_name_.empty()); + + return AsyncSharedStorageDatabaseImpl::Create( file_name_, task_runner_, special_storage_policy_, SharedStorageOptions::Create()->GetDatabaseOptions()); } - void CreateSync(const base::FilePath& db_path, - std::unique_ptr<SharedStorageDatabaseOptions> options) { - async_database_ = AsyncSharedStorageDatabase::Create( - db_path, task_runner_, special_storage_policy_, std::move(options)); + void PrepareFileBacked() { + // Get a temporary directory for the test DB files. + ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); + file_name_ = temp_dir_.GetPath().AppendASCII("TestSharedStorage.db"); + if (GetType() == DBType::kFileBackedFromExisting) + ASSERT_TRUE(CreateDatabaseFromSQL(file_name_, GetRelativeFilePath())); + EXPECT_FALSE(file_name_.empty()); + } + + AsyncSharedStorageDatabaseImpl* GetImpl() { + return static_cast<AsyncSharedStorageDatabaseImpl*>(async_database_.get()); } void Destroy(bool* out_success) { @@ -128,7 +140,6 @@ base::test::TestFuture<bool> future; async_database_->Destroy(future.GetCallback()); - EXPECT_TRUE(future.Wait()); return future.Get(); } @@ -149,6 +160,7 @@ void VerifySharedStorageTablesAndColumnsSync() { DCHECK(async_database_); + DCHECK(GetImpl()->GetSequenceBoundDatabaseForTesting()); auto task = base::BindOnce([](SharedStorageDatabase* db) -> bool { auto* sql_db = db->db(); @@ -171,10 +183,9 @@ std::move(task), future.GetCallback(), base::SequencedTaskRunnerHandle::Get()); - async_database_->GetSequenceBoundDatabaseForTesting() - .PostTaskWithThisObject(std::move(wrapped_task)); + GetImpl()->GetSequenceBoundDatabaseForTesting()->PostTaskWithThisObject( + std::move(wrapped_task)); - EXPECT_TRUE(future.Wait()); EXPECT_TRUE(future.Get()); } @@ -183,18 +194,16 @@ DCHECK(async_database_); DCHECK(receiver_); - DBOperation operation(Type::DB_IS_OPEN); auto callback = - receiver_->MakeBoolCallback(std::move(operation), out_boolean); - async_database_->IsOpenForTesting(std::move(callback)); + receiver_->MakeBoolCallback(DBOperation(Type::DB_IS_OPEN), out_boolean); + GetImpl()->IsOpenForTesting(std::move(callback)); } bool IsOpenSync() { DCHECK(async_database_); base::test::TestFuture<bool> future; - async_database_->IsOpenForTesting(future.GetCallback()); - EXPECT_TRUE(future.Wait()); + GetImpl()->IsOpenForTesting(future.GetCallback()); return future.Get(); } @@ -203,18 +212,16 @@ DCHECK(async_database_); DCHECK(receiver_); - DBOperation operation(Type::DB_STATUS); auto callback = - receiver_->MakeStatusCallback(std::move(operation), out_status); - async_database_->DBStatusForTesting(std::move(callback)); + receiver_->MakeStatusCallback(DBOperation(Type::DB_STATUS), out_status); + GetImpl()->DBStatusForTesting(std::move(callback)); } InitStatus DBStatusSync() { DCHECK(async_database_); base::test::TestFuture<InitStatus> future; - async_database_->DBStatusForTesting(future.GetCallback()); - EXPECT_TRUE(future.Wait()); + GetImpl()->DBStatusForTesting(future.GetCallback()); return future.Get(); } @@ -222,26 +229,25 @@ DCHECK(async_database_); DCHECK(receiver_); - DBOperation operation(Type::DB_TRIM_MEMORY); - auto callback = receiver_->MakeOnceClosure(std::move(operation)); + auto callback = + receiver_->MakeOnceClosure(DBOperation(Type::DB_TRIM_MEMORY)); async_database_->TrimMemory(std::move(callback)); } void OverrideLastUsedTime(url::Origin context_origin, - base::Time override_last_used_time, + base::Time new_last_used_time, bool* out_success) { DCHECK(out_success); DCHECK(async_database_); DCHECK(receiver_); - DBOperation operation(Type::DB_OVERRIDE_TIME, context_origin, - {TestDatabaseOperationReceiver::SerializeTime( - override_last_used_time)}); - auto callback = - receiver_->MakeBoolCallback(std::move(operation), out_success); - async_database_->OverrideLastUsedTimeForTesting(std::move(context_origin), - override_last_used_time, - std::move(callback)); + auto callback = receiver_->MakeBoolCallback( + DBOperation( + Type::DB_OVERRIDE_TIME, context_origin, + {TestDatabaseOperationReceiver::SerializeTime(new_last_used_time)}), + out_success); + GetImpl()->OverrideLastUsedTimeForTesting( + std::move(context_origin), new_last_used_time, std::move(callback)); } void Get(url::Origin context_origin, @@ -251,9 +257,8 @@ DCHECK(async_database_); DCHECK(receiver_); - DBOperation operation(Type::DB_GET, context_origin, {key}); - auto callback = - receiver_->MakeGetResultCallback(std::move(operation), out_value); + auto callback = receiver_->MakeGetResultCallback( + DBOperation(Type::DB_GET, context_origin, {key}), out_value); async_database_->Get(std::move(context_origin), std::move(key), std::move(callback)); } @@ -264,7 +269,6 @@ base::test::TestFuture<GetResult> future; async_database_->Get(std::move(context_origin), std::move(key), future.GetCallback()); - EXPECT_TRUE(future.Wait()); return future.Get(); } @@ -278,11 +282,12 @@ DCHECK(receiver_); *out_result = OperationResult::kSqlError; - DBOperation operation( - Type::DB_SET, context_origin, - {key, value, base::NumberToString16(static_cast<int>(behavior))}); - auto callback = receiver_->MakeOperationResultCallback(std::move(operation), - out_result); + auto callback = receiver_->MakeOperationResultCallback( + DBOperation( + Type::DB_SET, context_origin, + {key, value, + TestDatabaseOperationReceiver::SerializeSetBehavior(behavior)}), + out_result); async_database_->Set(std::move(context_origin), std::move(key), std::move(value), std::move(callback), behavior); } @@ -296,7 +301,6 @@ base::test::TestFuture<OperationResult> future; async_database_->Set(std::move(context_origin), std::move(key), std::move(value), future.GetCallback(), behavior); - EXPECT_TRUE(future.Wait()); return future.Get(); } @@ -309,9 +313,8 @@ DCHECK(receiver_); *out_result = OperationResult::kSqlError; - DBOperation operation(Type::DB_APPEND, context_origin, {key, value}); - auto callback = receiver_->MakeOperationResultCallback(std::move(operation), - out_result); + auto callback = receiver_->MakeOperationResultCallback( + DBOperation(Type::DB_APPEND, context_origin, {key, value}), out_result); async_database_->Append(std::move(context_origin), std::move(key), std::move(value), std::move(callback)); } @@ -324,7 +327,6 @@ base::test::TestFuture<OperationResult> future; async_database_->Append(std::move(context_origin), std::move(key), std::move(value), future.GetCallback()); - EXPECT_TRUE(future.Wait()); return future.Get(); } @@ -336,9 +338,8 @@ DCHECK(receiver_); *out_result = OperationResult::kSqlError; - DBOperation operation(Type::DB_DELETE, context_origin, {key}); - auto callback = receiver_->MakeOperationResultCallback(std::move(operation), - out_result); + auto callback = receiver_->MakeOperationResultCallback( + DBOperation(Type::DB_DELETE, context_origin, {key}), out_result); async_database_->Delete(std::move(context_origin), std::move(key), std::move(callback)); } @@ -349,7 +350,6 @@ base::test::TestFuture<OperationResult> future; async_database_->Delete(std::move(context_origin), std::move(key), future.GetCallback()); - EXPECT_TRUE(future.Wait()); return future.Get(); } @@ -359,9 +359,8 @@ DCHECK(receiver_); *out_length = -1; - DBOperation operation(Type::DB_LENGTH, context_origin); - auto callback = - receiver_->MakeIntCallback(std::move(operation), out_length); + auto callback = receiver_->MakeIntCallback( + DBOperation(Type::DB_LENGTH, context_origin), out_length); async_database_->Length(std::move(context_origin), std::move(callback)); } @@ -370,7 +369,6 @@ base::test::TestFuture<int> future; async_database_->Length(std::move(context_origin), future.GetCallback()); - EXPECT_TRUE(future.Wait()); return future.Get(); } @@ -379,10 +377,10 @@ DCHECK(async_database_); DCHECK(receiver_); - DBOperation operation(Type::DB_KEY, context_origin, - {base::NumberToString16(index)}); - auto callback = - receiver_->MakeGetResultCallback(std::move(operation), out_key); + auto callback = receiver_->MakeGetResultCallback( + DBOperation(Type::DB_KEY, context_origin, + {base::NumberToString16(index)}), + out_key); async_database_->Key(std::move(context_origin), index, std::move(callback)); } @@ -392,7 +390,6 @@ base::test::TestFuture<GetResult> future; async_database_->Key(std::move(context_origin), index, future.GetCallback()); - EXPECT_TRUE(future.Wait()); return future.Get(); } @@ -402,9 +399,8 @@ DCHECK(receiver_); *out_result = OperationResult::kSqlError; - DBOperation operation(Type::DB_CLEAR, context_origin); - auto callback = receiver_->MakeOperationResultCallback(std::move(operation), - out_result); + auto callback = receiver_->MakeOperationResultCallback( + DBOperation(Type::DB_CLEAR, context_origin), out_result); async_database_->Clear(std::move(context_origin), std::move(callback)); } @@ -413,7 +409,6 @@ base::test::TestFuture<OperationResult> future; async_database_->Clear(std::move(context_origin), future.GetCallback()); - EXPECT_TRUE(future.Wait()); return future.Get(); } @@ -422,9 +417,8 @@ DCHECK(async_database_); DCHECK(receiver_); - DBOperation operation(Type::DB_FETCH_ORIGINS); - auto callback = - receiver_->MakeInfosCallback(std::move(operation), out_result); + auto callback = receiver_->MakeInfosCallback( + DBOperation(Type::DB_FETCH_ORIGINS), out_result); async_database_->FetchOrigins(std::move(callback)); } @@ -433,7 +427,6 @@ base::test::TestFuture<std::vector<mojom::StorageUsageInfoPtr>> future; async_database_->FetchOrigins(future.GetCallback()); - EXPECT_TRUE(future.Wait()); return future.Take(); } @@ -456,9 +449,8 @@ TestDatabaseOperationReceiver::SerializeTime(end), TestDatabaseOperationReceiver::SerializeBool( perform_storage_cleanup)}); - DBOperation operation(Type::DB_PURGE_MATCHING, std::move(params)); - auto callback = receiver_->MakeOperationResultCallback(std::move(operation), - out_result); + auto callback = receiver_->MakeOperationResultCallback( + DBOperation(Type::DB_PURGE_MATCHING, std::move(params)), out_result); async_database_->PurgeMatchingOrigins( matcher_utility->TakeMatcherFunctionForId(matcher_id), begin, end, std::move(callback), perform_storage_cleanup); @@ -470,29 +462,36 @@ DCHECK(async_database_); DCHECK(receiver_); - DBOperation operation(Type::DB_PURGE_STALE, - {TestDatabaseOperationReceiver::SerializeTimeDelta( - window_to_be_deemed_active)}); - auto callback = receiver_->MakeOperationResultCallback(std::move(operation), - out_result); + auto callback = receiver_->MakeOperationResultCallback( + DBOperation(Type::DB_PURGE_STALE, + {TestDatabaseOperationReceiver::SerializeTimeDelta( + window_to_be_deemed_active)}), + out_result); async_database_->PurgeStaleOrigins(window_to_be_deemed_active, std::move(callback)); } protected: + base::test::ScopedFeatureList scoped_feature_list_; base::test::TaskEnvironment task_environment_; scoped_refptr<base::SequencedTaskRunner> task_runner_; scoped_refptr<storage::MockSpecialStoragePolicy> special_storage_policy_; std::unique_ptr<AsyncSharedStorageDatabase> async_database_; std::unique_ptr<TestDatabaseOperationReceiver> receiver_; - base::test::ScopedFeatureList scoped_feature_list_; base::ScopedTempDir temp_dir_; base::FilePath file_name_; }; +class AsyncSharedStorageDatabaseImplFromFileV1Test + : public AsyncSharedStorageDatabaseImplTest { + public: + DBType GetType() override { return DBType::kFileBackedFromExisting; } + + const char* GetRelativeFilePath() override { return "shared_storage.v1.sql"; } +}; + // Test loading version 1 database. -TEST_F(AsyncSharedStorageDatabaseTest, Version1_LoadFromFile) { - LoadFromFileSync("shared_storage.v1.sql"); +TEST_F(AsyncSharedStorageDatabaseImplFromFileV1Test, Version1_LoadFromFile) { ASSERT_TRUE(async_database_); url::Origin google_com = url::Origin::Create(GURL("http://google.com/")); @@ -518,10 +517,45 @@ url::Origin::Create(GURL("http://youtube.com")))); } -TEST_F(AsyncSharedStorageDatabaseTest, Version1_DestroyTooNew) { - // Initialization should fail, since the last compatible version number - // is too high. - LoadFromFileSync("shared_storage.v1.init_too_new.sql"); +struct InitFailureTestCase { + const char* relative_file_path; + InitStatus expected_status; +}; + +std::vector<InitFailureTestCase> GetInitFailureTestCases() { + return std::vector<InitFailureTestCase>( + {{"shared_storage.v1.init_too_new.sql", InitStatus::kTooNew}, + {"shared_storage.v0.init_too_old.sql", InitStatus::kTooOld}}); +} + +// Used by `testing::PrintToStringParamName()`. +[[nodiscard]] std::string PrintToString(const InitFailureTestCase& c) { + std::string str(c.relative_file_path); + for (char& ch : str) { + if (!std::isalpha(static_cast<unsigned char>(ch)) && ch != '_') + ch = '_'; + } + return str; +} + +class AsyncSharedStorageDatabaseImplFromFileWithFailureTest + : public AsyncSharedStorageDatabaseImplTest, + public testing::WithParamInterface<InitFailureTestCase> { + public: + DBType GetType() override { return DBType::kFileBackedFromExisting; } + + const char* GetRelativeFilePath() override { + return GetParam().relative_file_path; + } +}; + +INSTANTIATE_TEST_SUITE_P(All, + AsyncSharedStorageDatabaseImplFromFileWithFailureTest, + testing::ValuesIn(GetInitFailureTestCases()), + testing::PrintToStringParamName()); + +TEST_P(AsyncSharedStorageDatabaseImplFromFileWithFailureTest, + Version1_Destroy) { ASSERT_TRUE(async_database_); // Call an operation so that the database will attempt to be lazy-initialized. @@ -529,44 +563,16 @@ OperationResult::kInitFailure, SetSync(url::Origin::Create(GURL("http://www.a.com")), u"key", u"value")); ASSERT_FALSE(IsOpenSync()); - EXPECT_EQ(InitStatus::kTooNew, DBStatusSync()); + EXPECT_EQ(GetParam().expected_status, DBStatusSync()); // Test that it is still OK to `Destroy()` the database. EXPECT_TRUE(DestroySync()); } -TEST_F(AsyncSharedStorageDatabaseTest, Version0_DestroyTooOld) { - // Initialization should fail, since the current version number - // is too low and we're forcing there not to be a retry attempt. - LoadFromFileSync("shared_storage.v0.init_too_old.sql"); - ASSERT_TRUE(async_database_); - - // Call an operation so that the database will attempt to be lazy-initialized. - EXPECT_EQ( - OperationResult::kInitFailure, - SetSync(url::Origin::Create(GURL("http://www.a.com")), u"key", u"value")); - ASSERT_FALSE(IsOpenSync()); - EXPECT_EQ(InitStatus::kTooOld, DBStatusSync()); - - // Test that it is still OK to `Destroy()` the database. - EXPECT_TRUE(DestroySync()); -} - -class AsyncSharedStorageDatabaseParamTest - : public AsyncSharedStorageDatabaseTest, +class AsyncSharedStorageDatabaseImplParamTest + : public AsyncSharedStorageDatabaseImplTest, public testing::WithParamInterface<SharedStorageWrappedBool> { public: - void SetUp() override { - AsyncSharedStorageDatabaseTest::SetUp(); - - auto options = SharedStorageOptions::Create()->GetDatabaseOptions(); - - if (GetParam().in_memory_only) - CreateSync(base::FilePath(), std::move(options)); - else - CreateSync(file_name_, std::move(options)); - } - void TearDown() override { if (!GetParam().in_memory_only) { // `TearDown()` will call `DestroySync()`. First verify that the file @@ -576,7 +582,12 @@ EXPECT_TRUE(base::PathExists(file_name_)); } - AsyncSharedStorageDatabaseTest::TearDown(); + AsyncSharedStorageDatabaseImplTest::TearDown(); + } + + DBType GetType() override { + return GetParam().in_memory_only ? DBType::kInMemory + : DBType::kFileBackedFromNew; } void InitSharedStorageFeature() override { @@ -590,12 +601,12 @@ }; INSTANTIATE_TEST_SUITE_P(All, - AsyncSharedStorageDatabaseParamTest, + AsyncSharedStorageDatabaseImplParamTest, testing::ValuesIn(GetSharedStorageWrappedBools()), testing::PrintToStringParamName()); // Operations are tested more thoroughly in shared_storage_database_unittest.cc. -TEST_P(AsyncSharedStorageDatabaseParamTest, SyncOperations) { +TEST_P(AsyncSharedStorageDatabaseImplParamTest, SyncOperations) { url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key1", u"value1")); EXPECT_EQ(GetSync(kOrigin1, u"key1").data, u"value1"); @@ -628,7 +639,7 @@ } // Verifies that the async operations are executed in order and without races. -TEST_P(AsyncSharedStorageDatabaseParamTest, AsyncOperations) { +TEST_P(AsyncSharedStorageDatabaseImplParamTest, AsyncOperations) { url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); std::queue<DBOperation> operation_list( @@ -739,7 +750,7 @@ EXPECT_EQ(0, length5); } -TEST_P(AsyncSharedStorageDatabaseParamTest, +TEST_P(AsyncSharedStorageDatabaseImplParamTest, LazyInit_IgnoreForGet_CreateForSet) { url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); @@ -808,7 +819,7 @@ EXPECT_EQ(1, length1); } -TEST_P(AsyncSharedStorageDatabaseParamTest, +TEST_P(AsyncSharedStorageDatabaseImplParamTest, LazyInit_IgnoreForDelete_CreateForAppend) { url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); @@ -870,7 +881,7 @@ EXPECT_EQ(OperationResult::kSuccess, result3); } -TEST_P(AsyncSharedStorageDatabaseParamTest, +TEST_P(AsyncSharedStorageDatabaseImplParamTest, LazyInit_IgnoreForClear_CreateForAppend) { url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); url::Origin kOrigin2 = url::Origin::Create(GURL("http://www.example2.test")); @@ -933,7 +944,7 @@ EXPECT_EQ(OperationResult::kSuccess, result3); } -TEST_P(AsyncSharedStorageDatabaseParamTest, PurgeStaleOrigins) { +TEST_P(AsyncSharedStorageDatabaseImplParamTest, PurgeStaleOrigins) { url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); url::Origin kOrigin2 = url::Origin::Create(GURL("http://www.example2.test")); url::Origin kOrigin3 = url::Origin::Create(GURL("http://www.example3.test")); @@ -1234,19 +1245,13 @@ EXPECT_EQ(OperationResult::kSuccess, value5.result); } -class AsyncSharedStorageDatabasePurgeMatchingOriginsParamTest - : public AsyncSharedStorageDatabaseTest, +class AsyncSharedStorageDatabaseImplPurgeMatchingOriginsParamTest + : public AsyncSharedStorageDatabaseImplTest, public testing::WithParamInterface<PurgeMatchingOriginsParams> { public: - void SetUp() override { - AsyncSharedStorageDatabaseTest::SetUp(); - - auto options = SharedStorageOptions::Create()->GetDatabaseOptions(); - - if (GetParam().in_memory_only) - CreateSync(base::FilePath(), std::move(options)); - else - CreateSync(file_name_, std::move(options)); + DBType GetType() override { + return GetParam().in_memory_only ? DBType::kInMemory + : DBType::kFileBackedFromNew; } void InitSharedStorageFeature() override { @@ -1261,11 +1266,11 @@ INSTANTIATE_TEST_SUITE_P( All, - AsyncSharedStorageDatabasePurgeMatchingOriginsParamTest, + AsyncSharedStorageDatabaseImplPurgeMatchingOriginsParamTest, testing::ValuesIn(GetPurgeMatchingOriginsParams()), testing::PrintToStringParamName()); -TEST_P(AsyncSharedStorageDatabasePurgeMatchingOriginsParamTest, +TEST_P(AsyncSharedStorageDatabaseImplPurgeMatchingOriginsParamTest, SinceThreshold) { url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); url::Origin kOrigin2 = url::Origin::Create(GURL("http://www.example2.test"));
diff --git a/components/services/storage/shared_storage/shared_storage_database.cc b/components/services/storage/shared_storage/shared_storage_database.cc index 923717a5..34a65fa 100644 --- a/components/services/storage/shared_storage/shared_storage_database.cc +++ b/components/services/storage/shared_storage/shared_storage_database.cc
@@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/metrics/histogram_functions.h" -#include "base/metrics/histogram_macros.h" #include "base/time/default_clock.h" #include "base/time/time.h" #include "components/services/storage/public/mojom/storage_usage_info.mojom.h" @@ -549,14 +548,13 @@ bool SharedStorageDatabase::OverrideLastUsedTimeForTesting( url::Origin context_origin, - base::Time override_last_used_time) { + base::Time new_last_used_time) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (LazyInit(DBCreationPolicy::kIgnoreIfAbsent) != InitStatus::kSuccess) return false; - return SetLastUsedTime(SerializeOrigin(context_origin), - override_last_used_time); + return SetLastUsedTime(SerializeOrigin(context_origin), new_last_used_time); } void SharedStorageDatabase::OverrideClockForTesting(base::Clock* clock) { @@ -565,10 +563,42 @@ clock_ = clock; } -bool SharedStorageDatabase::OverrideSpecialStoragePolicyForTesting( +void SharedStorageDatabase::OverrideSpecialStoragePolicyForTesting( scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); special_storage_policy_ = std::move(special_storage_policy); +} + +bool SharedStorageDatabase::PopulateDatabaseForTesting(url::Origin origin1, + url::Origin origin2, + url::Origin origin3) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + // We use `CHECK_EQ()` and `CHECK()` macros instead of early returns because + // the latter made the test coverage delta too low. + CHECK_EQ(OperationResult::kSet, + Set(origin1, u"key1", u"value1", SetBehavior::kDefault)); + + CHECK_EQ(OperationResult::kSet, + Set(origin1, u"key2", u"value1", SetBehavior::kDefault)); + + CHECK_EQ(OperationResult::kSet, + Set(origin2, u"key1", u"value2", SetBehavior::kDefault)); + + CHECK(OverrideLastUsedTimeForTesting( // IN-TEST + origin2, clock_->Now() - base::Days(1))); + + CHECK_EQ(OperationResult::kSet, + Set(origin3, u"key1", u"value1", SetBehavior::kDefault)); + + CHECK_EQ(OperationResult::kSet, + Set(origin3, u"key2", u"value2", SetBehavior::kDefault)); + + CHECK(OverrideLastUsedTimeForTesting( // IN-TEST + origin3, clock_->Now() - base::Days(60))); + + // We return a bool in order to facilitate use of `base::test::TestFuture` + // with this method. return true; } @@ -663,8 +693,8 @@ if (sql::IsErrorCatastrophic(extended_error)) { bool success = Destroy(); - UMA_HISTOGRAM_BOOLEAN("Storage.SharedStorage.Database.Destruction", - success); + base::UmaHistogramBoolean("Storage.SharedStorage.Database.Destruction", + success); if (!success) { DLOG(FATAL) << "Database destruction failed after catastrophic error:\n" << db_.GetErrorMessage();
diff --git a/components/services/storage/shared_storage/shared_storage_database.h b/components/services/storage/shared_storage/shared_storage_database.h index 413396a..972ce5c 100644 --- a/components/services/storage/shared_storage/shared_storage_database.h +++ b/components/services/storage/shared_storage/shared_storage_database.h
@@ -240,18 +240,31 @@ // Returns the `db_status_` for tests. [[nodiscard]] InitStatus DBStatusForTesting() const; - // Changes `last_used_time` to `override_last_used_time` for `context_origin`. + // Changes `last_used_time` to `new_last_used_time` for `context_origin`. [[nodiscard]] bool OverrideLastUsedTimeForTesting( url::Origin context_origin, - base::Time override_last_used_time); + base::Time new_last_used_time); // Overrides the clock used to check the time. void OverrideClockForTesting(base::Clock* clock); - // Overrides the `SpecialStoragePolicy` for tests. Returns true. - [[nodiscard]] bool OverrideSpecialStoragePolicyForTesting( + // Overrides the `SpecialStoragePolicy` for tests. + void OverrideSpecialStoragePolicyForTesting( scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy); + // Populates the database in order to test integration with + // `content::StoragePartitionImpl` while keeping in this file the parts of + // those tests that depend on implementation details of + // `SharedStorageDatabase`. + // + // Sets two example key-value pairs for `origin1`, one example pair for + // `origin2`, and two example pairs for `origin3`, while also overriding the + // `last_used_time` for `origin2` so that it is 1 day earlier and the + // `last_used_time` for `origin3` so that it is 60 days earlier. + [[nodiscard]] bool PopulateDatabaseForTesting(url::Origin origin1, + url::Origin origin2, + url::Origin origin3); + private: // Policy to tell `LazyInit()` whether or not to create a new database if a // pre-existing on-disk database is not found.
diff --git a/components/services/storage/shared_storage/shared_storage_database_unittest.cc b/components/services/storage/shared_storage/shared_storage_database_unittest.cc index 364bead..7895cba3 100644 --- a/components/services/storage/shared_storage/shared_storage_database_unittest.cc +++ b/components/services/storage/shared_storage/shared_storage_database_unittest.cc
@@ -92,15 +92,13 @@ } protected: + base::test::ScopedFeatureList scoped_feature_list_; + base::test::SingleThreadTaskEnvironment task_environment_; base::ScopedTempDir temp_dir_; base::FilePath file_name_; scoped_refptr<storage::MockSpecialStoragePolicy> special_storage_policy_; std::unique_ptr<SharedStorageDatabase> db_; - base::test::ScopedFeatureList scoped_feature_list_; base::SimpleTestClock clock_; - - private: - base::test::SingleThreadTaskEnvironment task_environment_; }; // Test loading version 1 database.
diff --git a/components/services/storage/shared_storage/shared_storage_manager.cc b/components/services/storage/shared_storage/shared_storage_manager.cc new file mode 100644 index 0000000..a97ad283 --- /dev/null +++ b/components/services/storage/shared_storage/shared_storage_manager.cc
@@ -0,0 +1,317 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/services/storage/shared_storage/shared_storage_manager.h" + +#include "base/bind.h" +#include "base/callback_helpers.h" +#include "base/files/file_path.h" +#include "base/metrics/histogram_functions.h" +#include "base/task/post_task.h" +#include "base/task/task_runner_util.h" +#include "base/task/thread_pool.h" +#include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" +#include "components/services/storage/public/mojom/storage_usage_info.mojom.h" +#include "components/services/storage/shared_storage/async_shared_storage_database_impl.h" +#include "components/services/storage/shared_storage/shared_storage_options.h" +#include "storage/browser/quota/special_storage_policy.h" +#include "url/gurl.h" + +namespace storage { + +SharedStorageManager::SharedStorageManager( + base::FilePath db_path, + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy) + : SharedStorageManager(std::move(db_path), + std::move(special_storage_policy), + SharedStorageOptions::Create()) {} + +SharedStorageManager::SharedStorageManager( + base::FilePath db_path, + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy, + std::unique_ptr<SharedStorageOptions> options) + : in_memory_(db_path.empty()), + sql_task_runner_(base::ThreadPool::CreateSequencedTaskRunner( + {base::MayBlock(), base::WithBaseSyncPrimitives(), + base::TaskShutdownBehavior::BLOCK_SHUTDOWN})), + db_path_(std::move(db_path)), + options_(std::move(options)), + special_storage_policy_(std::move(special_storage_policy)), + database_(AsyncSharedStorageDatabaseImpl::Create( + db_path_, + sql_task_runner_, + special_storage_policy_, + options_->GetDatabaseOptions())), + memory_pressure_listener_(std::make_unique<base::MemoryPressureListener>( + FROM_HERE, + base::BindRepeating(&SharedStorageManager::OnMemoryPressure, + base::Unretained(this), + base::DoNothing()))) { + timer_.Start(FROM_HERE, options_->stale_origin_purge_initial_interval, + base::BindOnce(&SharedStorageManager::PurgeStaleOrigins, + weak_ptr_factory_.GetWeakPtr())); +} + +SharedStorageManager::~SharedStorageManager() { + RecordShutdownMetrics(); +} + +void SharedStorageManager::OnMemoryPressure( + base::OnceCallback<void()> callback, + base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level) { + DCHECK(database_); + + // TODO(cammie): Check if MEMORY_PRESSURE_LEVEL_MODERATE should also be + // ignored. + if (memory_pressure_level == + base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE) { + return; + } + + database_->TrimMemory(std::move(callback)); +} + +void SharedStorageManager::OnOperationResult(OperationResult result) { + if (result != OperationResult::kSqlError && + result != OperationResult::kInitFailure) { + return; + } + + if (result == OperationResult::kSqlError) { + operation_sql_error_count_++; + return; + } + + DCHECK_EQ(result, OperationResult::kInitFailure); + if (in_memory_ && tried_to_recover_from_init_failure_) { + // We already tried to recover from init failure before---twice if the + // database was originally file-backed---but are still having problems: + // there isn't really anything left to try, so just ignore errors. + return; + } + tried_to_recover_from_init_failure_ = true; + DestroyAndRecreateDatabase(); +} + +void SharedStorageManager::Get(url::Origin context_origin, + std::u16string key, + base::OnceCallback<void(GetResult)> callback) { + DCHECK(database_); + auto new_callback = base::BindOnce( + [](base::WeakPtr<SharedStorageManager> manager, + base::OnceCallback<void(GetResult)> callback, GetResult result) { + if (manager) + manager->OnOperationResult(result.result); + std::move(callback).Run(result); + }, + weak_ptr_factory_.GetWeakPtr(), std::move(callback)); + + database_->Get(std::move(context_origin), std::move(key), + std::move(new_callback)); +} + +void SharedStorageManager::Set( + url::Origin context_origin, + std::u16string key, + std::u16string value, + base::OnceCallback<void(OperationResult)> callback, + SharedStorageDatabase::SetBehavior behavior) { + DCHECK(database_); + database_->Set(std::move(context_origin), std::move(key), std::move(value), + GetOperationResultCallback(std::move(callback)), behavior); +} + +void SharedStorageManager::Append( + url::Origin context_origin, + std::u16string key, + std::u16string value, + base::OnceCallback<void(OperationResult)> callback) { + DCHECK(database_); + database_->Append(std::move(context_origin), std::move(key), std::move(value), + GetOperationResultCallback(std::move(callback))); +} + +void SharedStorageManager::Delete( + url::Origin context_origin, + std::u16string key, + base::OnceCallback<void(OperationResult)> callback) { + DCHECK(database_); + database_->Delete(std::move(context_origin), std::move(key), + GetOperationResultCallback(std::move(callback))); +} + +void SharedStorageManager::Length(url::Origin context_origin, + base::OnceCallback<void(int)> callback) { + DCHECK(database_); + auto new_callback = base::BindOnce( + [](base::WeakPtr<SharedStorageManager> manager, + base::OnceCallback<void(int)> callback, int length) { + OperationResult result = (length != -1) ? OperationResult::kSuccess + : OperationResult::kSqlError; + if (manager) + manager->OnOperationResult(result); + std::move(callback).Run(length); + }, + weak_ptr_factory_.GetWeakPtr(), std::move(callback)); + + database_->Length(std::move(context_origin), std::move(new_callback)); +} + +void SharedStorageManager::Key(url::Origin context_origin, + int index, + base::OnceCallback<void(GetResult)> callback) { + DCHECK(database_); + auto new_callback = base::BindOnce( + [](base::WeakPtr<SharedStorageManager> manager, + base::OnceCallback<void(GetResult)> callback, GetResult result) { + if (manager) + manager->OnOperationResult(result.result); + std::move(callback).Run(result); + }, + weak_ptr_factory_.GetWeakPtr(), std::move(callback)); + + database_->Key(std::move(context_origin), index, std::move(new_callback)); +} + +void SharedStorageManager::Clear( + url::Origin context_origin, + base::OnceCallback<void(OperationResult)> callback) { + DCHECK(database_); + database_->Clear(std::move(context_origin), + GetOperationResultCallback(std::move(callback))); +} + +void SharedStorageManager::PurgeMatchingOrigins( + OriginMatcherFunction origin_matcher, + base::Time begin, + base::Time end, + base::OnceCallback<void(OperationResult)> callback, + bool perform_storage_cleanup) { + DCHECK(database_); + database_->PurgeMatchingOrigins( + std::move(origin_matcher), begin, end, + GetOperationResultCallback(std::move(callback)), perform_storage_cleanup); +} + +void SharedStorageManager::FetchOrigins( + base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> + callback) { + DCHECK(database_); + database_->FetchOrigins(std::move(callback)); +} + +void SharedStorageManager::SetOnDBDestroyedCallbackForTesting( + base::OnceCallback<void(bool)> callback) { + on_db_destroyed_callback_for_testing_ = std::move(callback); +} + +void SharedStorageManager::OverrideLastUsedTimeForTesting( + url::Origin context_origin, + base::Time new_last_used_time, + base::OnceCallback<void(bool)> callback) { + DCHECK(database_); + static_cast<AsyncSharedStorageDatabaseImpl*>(database_.get()) + ->OverrideLastUsedTimeForTesting( // IN-TEST + std::move(context_origin), new_last_used_time, std::move(callback)); +} + +void SharedStorageManager::OverrideSpecialStoragePolicyForTesting( + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy) { + DCHECK(database_); + special_storage_policy_ = special_storage_policy; + static_cast<AsyncSharedStorageDatabaseImpl*>(database_.get()) + ->OverrideSpecialStoragePolicyForTesting( // IN-TEST + special_storage_policy); +} + +void SharedStorageManager::OverrideDatabaseForTesting( + std::unique_ptr<AsyncSharedStorageDatabase> override_async_database) { + database_ = std::move(override_async_database); +} + +void SharedStorageManager::DestroyAndRecreateDatabase() { + bool recreate_in_memory = in_memory_; + + if (!in_memory_ && !tried_to_recreate_on_disk_) { + tried_to_recreate_on_disk_ = true; + } else if (!in_memory_ && tried_to_recreate_on_disk_) { + recreate_in_memory = true; + } + + // There is already no database. + if (!database_) { + OnDatabaseDestroyed(recreate_in_memory, /*success=*/true); + return; + } + + // Destroy database, and try again. + database_->Destroy(base::BindOnce(&SharedStorageManager::OnDatabaseDestroyed, + weak_ptr_factory_.GetWeakPtr(), + recreate_in_memory)); +} + +void SharedStorageManager::OnDatabaseDestroyed(bool recreate_in_memory, + bool success) { + // Even if destroying failed we still want to go ahead and try to recreate. + if (recreate_in_memory) { + db_path_ = base::FilePath(); + in_memory_ = true; + } + + database_ = AsyncSharedStorageDatabaseImpl::Create( + db_path_, sql_task_runner_, special_storage_policy_, + options_->GetDatabaseOptions()); + + if (on_db_destroyed_callback_for_testing_) + std::move(on_db_destroyed_callback_for_testing_).Run(success); + + // TODO(cammie): Log `success` in a histogram. +} + +base::OnceCallback<void(SharedStorageManager::OperationResult)> +SharedStorageManager::GetOperationResultCallback( + base::OnceCallback<void(OperationResult)> callback) { + return base::BindOnce( + [](base::WeakPtr<SharedStorageManager> manager, + base::OnceCallback<void(OperationResult)> callback, + OperationResult result) { + if (manager) + manager->OnOperationResult(result); + std::move(callback).Run(result); + }, + weak_ptr_factory_.GetWeakPtr(), std::move(callback)); +} + +void SharedStorageManager::PurgeStaleOrigins() { + DCHECK(!options_->origin_staleness_threshold.is_zero()); + DCHECK(database_); + + database_->PurgeStaleOrigins( + options_->origin_staleness_threshold, + base::BindOnce(&SharedStorageManager::OnStaleOriginsPurged, + weak_ptr_factory_.GetWeakPtr())); +} + +void SharedStorageManager::OnStaleOriginsPurged(OperationResult result) { + DCHECK(database_); + OnOperationResult(result); + + timer_.Start(FROM_HERE, options_->stale_origin_purge_recurring_interval, + base::BindOnce(&SharedStorageManager::PurgeStaleOrigins, + weak_ptr_factory_.GetWeakPtr())); +} + +void SharedStorageManager::RecordShutdownMetrics() { + base::UmaHistogramCounts1000("Storage.SharedStorage.OnShutdown.NumSqlErrors", + operation_sql_error_count_); + base::UmaHistogramBoolean( + "Storage.SharedStorage.OnShutdown.RecoveryFromInitFailureAttempted", + tried_to_recover_from_init_failure_); + base::UmaHistogramBoolean( + "Storage.SharedStorage.OnShutdown.RecoveryOnDiskAttempted", + tried_to_recreate_on_disk_); +} + +} // namespace storage
diff --git a/components/services/storage/shared_storage/shared_storage_manager.h b/components/services/storage/shared_storage/shared_storage_manager.h new file mode 100644 index 0000000..816766a --- /dev/null +++ b/components/services/storage/shared_storage/shared_storage_manager.h
@@ -0,0 +1,278 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_SERVICES_STORAGE_SHARED_STORAGE_SHARED_STORAGE_MANAGER_H_ +#define COMPONENTS_SERVICES_STORAGE_SHARED_STORAGE_SHARED_STORAGE_MANAGER_H_ + +#include <memory> +#include <queue> +#include <vector> + +#include "base/callback.h" +#include "base/files/file_path.h" +#include "base/memory/memory_pressure_listener.h" +#include "base/memory/scoped_refptr.h" +#include "base/memory/weak_ptr.h" +#include "base/timer/timer.h" +#include "components/services/storage/public/mojom/storage_usage_info.mojom-forward.h" +#include "components/services/storage/shared_storage/async_shared_storage_database.h" +#include "url/origin.h" + +namespace base { +class Time; +} // namespace base + +namespace storage { +class AsyncSharedStorageDatabase; +struct SharedStorageOptions; +class SpecialStoragePolicy; + +// Can be accessed via +// `content::StoragePartition::GetOrCreateSharedStorageManager()`. +// Provides the database connection. Wrapper around +// `AsyncSharedStorageDatabase`. +class SharedStorageManager { + public: + using InitStatus = SharedStorageDatabase::InitStatus; + using SetBehavior = SharedStorageDatabase::SetBehavior; + using OperationResult = SharedStorageDatabase::OperationResult; + using GetResult = SharedStorageDatabase::GetResult; + + // A callback type to check if a given origin matches a storage policy. + // Can be passed empty/null where used, which means the origin will always + // match. + using OriginMatcherFunction = SharedStorageDatabase::OriginMatcherFunction; + + // If only `db_path` and `special_storage_policy` are passed as parameters, + // then the members that would have been initialized from `options` are given + // the values of the corresponding constants in + // as the default from `SharedStorageOptions`, as drawn from + // third_party/blink/public/common/features.h + SharedStorageManager( + base::FilePath db_path, + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy); + SharedStorageManager( + base::FilePath db_path, + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy, + std::unique_ptr<SharedStorageOptions> options); + + SharedStorageManager(const SharedStorageManager&) = delete; + SharedStorageManager& operator=(const SharedStorageManager&) = delete; + + virtual ~SharedStorageManager(); + + AsyncSharedStorageDatabase* database() { return database_.get(); } + + bool in_memory() const { return in_memory_; } + + bool tried_to_recreate_on_disk_for_testing() const { + return tried_to_recreate_on_disk_; + } + + bool tried_to_recover_from_init_failure_for_testing() const { + return tried_to_recover_from_init_failure_; + } + + int operation_sql_error_count_for_testing() const { + return operation_sql_error_count_; + } + + base::WeakPtr<SharedStorageManager> GetWeakPtr() { + return weak_ptr_factory_.GetWeakPtr(); + } + + // Resets the `database_` pointer. + void Shutdown(); + + // Called when the system is under memory pressure. + void OnMemoryPressure( + base::OnceCallback<void()> callback, + base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level); + + // Tallies database errors, watching for consecutive ones. If the threshold + // `max_allowed_consecutive_operation_errors_` is exceeded, then the database + // is deleted and recreated in an attempt to recover. + void OnOperationResult(OperationResult result); + + // Retrieves the `value` for `context_origin` and `key`. `callback` is called + // with a string `value` if one is found, absl::nullopt otherwise. + // + // `key` must be of length at most + // `SharedStorageDatabaseOptions::max_string_length`, with the burden on the + // caller to handle errors for strings that exceed this length. + void Get(url::Origin context_origin, + std::u16string key, + base::OnceCallback<void(GetResult)> callback); + + // Sets an entry for `context_origin` and `key` to have `value`. + // If `behavior` is `kIgnoreIfPresent` and an entry already exists for + // `context_origin` and `key`, then the database table is not modified. + // The parameter of `callback` reports whether or not any entry is added. + // + // `key` and `value` must be each of length at most + // `SharedStorageDatabaseOptions::max_string_length`, with the burden on the + // caller to handle errors for strings that exceed this length. Moreover, if + // the length retrieved by `Length(context_origin, callback)` equals + // `SharedStorageDatabaseOptions::max_entries_per_origin_`, `Set()` will fail + // and the table will not be modified. + void Set(url::Origin context_origin, + std::u16string key, + std::u16string value, + base::OnceCallback<void(OperationResult)> callback, + SetBehavior behavior = SetBehavior::kDefault); + + // Appends `value` to the end of the current `value` for `context_origin` and + // `key`, if `key` exists. If `key` does not exist, creates an entry for `key` + // with value `value`. The parameter of `callback` reports whether or not any + // entry is added or modified. + // + // `key` and `value` must be each of length at most + // `SharedStorageDatabaseOptions::max_string_length`, with the burden on the + // caller to handle errors for strings that exceed this length. Moreover, if + // the length of the string obtained by concatening the current `script_value` + // (if one exists) and `value` exceeds + // `SharedStorageDatabaseOptions::max_string_length`, or if the length + // retrieved by `Length(context_origin, callback)` equals + // `SharedStorageDatabaseOptions::max_entries_per_origin_`, `Append()` will + // fail and the database table will not be modified. + void Append(url::Origin context_origin, + std::u16string key, + std::u16string value, + base::OnceCallback<void(OperationResult)> callback); + + // Deletes the entry for `context_origin` and `key`. The parameter of + // `callback` reports whether the deletion is successful. + // + // `key` must be of length at most + // `SharedStorageDatabaseOptions::max_string_length`, with the burden on the + // caller to handle errors for strings that exceed this length. + void Delete(url::Origin context_origin, + std::u16string key, + base::OnceCallback<void(OperationResult)> callback); + + // The parameter of `callback` reports the number of entries for + // `context_origin`, 0 if there are none, or -1 on operation failure. + void Length(url::Origin context_origin, + base::OnceCallback<void(int)> callback); + + // If a list of all the keys for `context_origin` are taken in lexicographic + // order, retrieves the `key` at `index` of the list and calls `callback` with + // it as a parameter; otherwise calls `callback` with the parameter + // `absl::nullopt`. + // + // TODO(crbug.com/1247861): Replace with an async iterator. + void Key(url::Origin context_origin, + int index, + base::OnceCallback<void(GetResult)> callback); + + // Clears all entries for `context_origin`. The parameter of `callback` + // reports whether the operation is successful. Can be called either as part + // of the Shared Storage API, or else by + // `browsing_data::SharedStorageHelper::DeleteOrigin()` in order to clear + // browsing data via the Settings UI. + // + // TODO(cammie): Add `browsing_data::SharedStorageHelper` and the rest of the + // clear browsing data integration. + void Clear(url::Origin context_origin, + base::OnceCallback<void(OperationResult)> callback); + + // Clears all origins that match `origin_matcher` run on the owning + // StoragePartition's `SpecialStoragePolicy` and have `last_used_time` between + // the times `begin` and `end`. If `perform_storage_cleanup` is true, vacuums + // the database afterwards. The parameter of `callback` reports whether the + // transaction was successful. Called by + // `content::StoragePartitionImpl::DataDeletionHelper::ClearDataOnUIThread()`. + // + // Note that `origin_matcher` is accessed on a different sequence than where + // it was created. + void PurgeMatchingOrigins(OriginMatcherFunction origin_matcher, + base::Time begin, + base::Time end, + base::OnceCallback<void(OperationResult)> callback, + bool perform_storage_cleanup = false); + + // Fetches a vector of `mojom::StorageUsageInfoPtr`, with one + // `mojom::StorageUsageInfoPtr` for each origin currently using shared storage + // in this profile. Called by + // `browsing_data::SharedStorageHelper::StartFetching`. + void FetchOrigins( + base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> + callback); + + void SetOnDBDestroyedCallbackForTesting( + base::OnceCallback<void(bool)> callback); + + void OverrideLastUsedTimeForTesting(url::Origin context_origin, + base::Time new_last_used_time, + base::OnceCallback<void(bool)> callback); + + void OverrideSpecialStoragePolicyForTesting( + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy); + + void OverrideDatabaseForTesting( + std::unique_ptr<AsyncSharedStorageDatabase> override_async_database); + + private: + void DestroyAndRecreateDatabase(); + void OnDatabaseDestroyed(bool recreate_in_memory, bool success); + + // Returns a new callback that also includes a call to `OnOperationResult()`. + base::OnceCallback<void(OperationResult)> GetOperationResultCallback( + base::OnceCallback<void(OperationResult)> callback); + + // Purges the data for any origins that haven't been written to or read from + // for more than the `origin_staleness_threshold_`. + void PurgeStaleOrigins(); + + // Starts the `timer_` for the next call to `PurgeStaleOrigins()`. + void OnStaleOriginsPurged(OperationResult result); + + // Records metrics, including how many SQL errors were seen, when destructor + // is called. + void RecordShutdownMetrics(); + + // Whether the database should be created in-memory only. + bool in_memory_; + + // Whether an error already caused an attempt to delete and recreate the + // database on disk. + bool tried_to_recreate_on_disk_ = false; + + // Whether we have already tried to recover from init failure by throwing the + // database away and recreating it. + bool tried_to_recover_from_init_failure_ = false; + + const scoped_refptr<base::SequencedTaskRunner> sql_task_runner_; + + // The file path for the database, if it is disk-based. An empty `db_path_` + // corresponds to an in-memory database. + base::FilePath db_path_; + + // Bundled constants that are Finch-configurable. + std::unique_ptr<SharedStorageOptions> options_; + + // The owning partition's storage policy. + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_; + + // A pointer to the database. + std::unique_ptr<AsyncSharedStorageDatabase> database_; + + // Timer for purging stale origins. + base::OneShotTimer timer_; + + // Counts operation errors due to SQL database errors. + int operation_sql_error_count_ = 0; + + // Listens for the system being under memory pressure. + std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_; + + // Callback to be run at the end of `OnDatabaseDestroyed()`. + base::OnceCallback<void(bool)> on_db_destroyed_callback_for_testing_; + + base::WeakPtrFactory<SharedStorageManager> weak_ptr_factory_{this}; +}; + +} // namespace storage + +#endif // COMPONENTS_SERVICES_STORAGE_SHARED_STORAGE_SHARED_STORAGE_MANAGER_H_
diff --git a/components/services/storage/shared_storage/shared_storage_manager_unittest.cc b/components/services/storage/shared_storage/shared_storage_manager_unittest.cc new file mode 100644 index 0000000..4938128 --- /dev/null +++ b/components/services/storage/shared_storage/shared_storage_manager_unittest.cc
@@ -0,0 +1,1629 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/services/storage/shared_storage/shared_storage_manager.h" + +#include <queue> +#include <string> + +#include "base/bind.h" +#include "base/callback_helpers.h" +#include "base/files/scoped_temp_dir.h" +#include "base/memory/memory_pressure_listener.h" +#include "base/memory/scoped_refptr.h" +#include "base/run_loop.h" +#include "base/strings/strcat.h" +#include "base/strings/string_number_conversions.h" +#include "base/task/sequenced_task_runner.h" +#include "base/task/thread_pool.h" +#include "base/test/bind.h" +#include "base/test/metrics/histogram_tester.h" +#include "base/test/scoped_feature_list.h" +#include "base/test/task_environment.h" +#include "base/test/test_future.h" +#include "base/test/test_simple_task_runner.h" +#include "base/threading/sequence_bound.h" +#include "base/threading/thread.h" +#include "components/services/storage/public/mojom/storage_usage_info.mojom.h" +#include "components/services/storage/shared_storage/async_shared_storage_database.h" +#include "components/services/storage/shared_storage/shared_storage_database.h" +#include "components/services/storage/shared_storage/shared_storage_options.h" +#include "components/services/storage/shared_storage/shared_storage_test_utils.h" +#include "storage/browser/quota/special_storage_policy.h" +#include "storage/browser/test/mock_special_storage_policy.h" +#include "testing/gmock/include/gmock/gmock-matchers.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "third_party/blink/public/common/features.h" +#include "url/gurl.h" +#include "url/origin.h" + +namespace storage { + +namespace { + +using ::testing::ElementsAre; +using InitStatus = SharedStorageDatabase::InitStatus; +using SetBehavior = SharedStorageDatabase::SetBehavior; +using OperationResult = SharedStorageDatabase::OperationResult; +using GetResult = SharedStorageDatabase::GetResult; +using OriginMatcherFunction = SharedStorageDatabase::OriginMatcherFunction; +using DBOperation = TestDatabaseOperationReceiver::DBOperation; +using Type = DBOperation::Type; +using DBType = SharedStorageTestDBType; +using MemoryPressureLevel = base::MemoryPressureListener::MemoryPressureLevel; + +std::string TimeDeltaToString(base::TimeDelta delta) { + return base::StrCat({base::NumberToString(delta.InMilliseconds()), "ms"}); +} + +class MockResultQueue { + public: + explicit MockResultQueue(std::queue<OperationResult> result_queue) + : result_queue_(std::move(result_queue)) {} + ~MockResultQueue() = default; + + void SetResultQueue(std::queue<OperationResult> result_queue) { + result_queue_ = std::move(result_queue); + } + + void DoNothing() { base::DoNothing(); } + + OperationResult NextOperationResult() { + DCHECK(!result_queue_.empty()); + OperationResult next_result = result_queue_.front(); + result_queue_.pop(); + return next_result; + } + + GetResult NextGetResult() { + DCHECK(!result_queue_.empty()); + GetResult next_result; + next_result.result = result_queue_.front(); + result_queue_.pop(); + return next_result; + } + + bool NextBool() { + DCHECK(!result_queue_.empty()); + bool next_success = (static_cast<int>(result_queue_.front()) < 3); + result_queue_.pop(); + return next_success; + } + + int NextInt() { + DCHECK(!result_queue_.empty()); + int next_length = (static_cast<int>(result_queue_.front()) < 3) ? 0 : -1; + result_queue_.pop(); + return next_length; + } + + std::vector<mojom::StorageUsageInfoPtr> NextInfos() { + DCHECK(!result_queue_.empty()); + result_queue_.pop(); + return std::vector<mojom::StorageUsageInfoPtr>(); + } + + private: + std::queue<OperationResult> result_queue_; +}; + +class MockAsyncSharedStorageDatabase : public AsyncSharedStorageDatabase { + public: + static std::unique_ptr<AsyncSharedStorageDatabase> Create() { + return absl::WrapUnique(new MockAsyncSharedStorageDatabase()); + } + + static std::unique_ptr<AsyncSharedStorageDatabase> Create( + std::queue<OperationResult> result_queue) { + return absl::WrapUnique( + new MockAsyncSharedStorageDatabase(std::move(result_queue))); + } + + ~MockAsyncSharedStorageDatabase() override = default; + + // AsyncSharedStorageDatabase + void Destroy(base::OnceCallback<void(bool)> callback) override { + Run(std::move(callback)); + } + void TrimMemory(base::OnceClosure callback) override { + Run(std::move(callback)); + } + void Get(url::Origin context_origin, + std::u16string key, + base::OnceCallback<void(GetResult)> callback) override { + Run(std::move(callback)); + } + void Set(url::Origin context_origin, + std::u16string key, + std::u16string value, + base::OnceCallback<void(OperationResult)> callback, + SetBehavior behavior = SetBehavior::kDefault) override { + Run(std::move(callback)); + } + void Append(url::Origin context_origin, + std::u16string key, + std::u16string value, + base::OnceCallback<void(OperationResult)> callback) override { + Run(std::move(callback)); + } + void Delete(url::Origin context_origin, + std::u16string key, + base::OnceCallback<void(OperationResult)> callback) override { + Run(std::move(callback)); + } + void Clear(url::Origin context_origin, + base::OnceCallback<void(OperationResult)> callback) override { + Run(std::move(callback)); + } + void Length(url::Origin context_origin, + base::OnceCallback<void(int)> callback) override { + Run(std::move(callback)); + } + void Key(url::Origin context_origin, + int index, + base::OnceCallback<void(GetResult)> callback) override { + Run(std::move(callback)); + } + void PurgeMatchingOrigins(OriginMatcherFunction origin_matcher, + base::Time begin, + base::Time end, + base::OnceCallback<void(OperationResult)> callback, + bool perform_storage_cleanup = false) override { + Run(std::move(callback)); + } + void PurgeStaleOrigins( + base::TimeDelta window_to_be_deemed_active, + base::OnceCallback<void(OperationResult)> callback) override { + Run(std::move(callback)); + } + void FetchOrigins( + base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> + callback) override { + Run(std::move(callback)); + } + void SetResultsForTesting(std::queue<OperationResult> result_queue, + base::OnceClosure callback) { + mock_result_queue_.AsyncCall(&MockResultQueue::SetResultQueue) + .WithArgs(std::move(result_queue)) + .Then(std::move(callback)); + } + + private: + MockAsyncSharedStorageDatabase() + : MockAsyncSharedStorageDatabase(std::queue<OperationResult>()) {} + + explicit MockAsyncSharedStorageDatabase( + std::queue<OperationResult> result_queue) + : mock_result_queue_( + base::ThreadPool::CreateSequencedTaskRunner( + {base::MayBlock(), base::WithBaseSyncPrimitives(), + base::TaskShutdownBehavior::BLOCK_SHUTDOWN}), + std::move(result_queue)) {} + + void Run(base::OnceClosure callback) { + DCHECK(callback); + mock_result_queue_.AsyncCall(&MockResultQueue::DoNothing) + .Then(std::move(callback)); + } + + void Run(base::OnceCallback<void(bool)> callback) { + DCHECK(callback); + mock_result_queue_.AsyncCall(&MockResultQueue::NextBool) + .Then(std::move(callback)); + } + + void Run(base::OnceCallback<void(OperationResult)> callback) { + DCHECK(callback); + mock_result_queue_.AsyncCall(&MockResultQueue::NextOperationResult) + .Then(std::move(callback)); + } + + void Run(base::OnceCallback<void(GetResult)> callback) { + DCHECK(callback); + mock_result_queue_.AsyncCall(&MockResultQueue::NextGetResult) + .Then(std::move(callback)); + } + + void Run(base::OnceCallback<void(int)> callback) { + DCHECK(callback); + mock_result_queue_.AsyncCall(&MockResultQueue::NextInt) + .Then(std::move(callback)); + } + + void Run(base::OnceCallback<void(std::vector<mojom::StorageUsageInfoPtr>)> + callback) { + DCHECK(callback); + mock_result_queue_.AsyncCall(&MockResultQueue::NextInfos) + .Then(std::move(callback)); + } + + base::SequenceBound<MockResultQueue> mock_result_queue_; +}; + +class MockSharedStorageManager : public SharedStorageManager { + public: + MockSharedStorageManager( + base::FilePath db_path, + scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy, + std::unique_ptr<SharedStorageOptions> options) + : SharedStorageManager(db_path, + std::move(special_storage_policy), + std::move(options)) { + OverrideDatabaseForTesting(MockAsyncSharedStorageDatabase::Create()); + } + + ~MockSharedStorageManager() override = default; + + void SetResultsForTesting(std::queue<OperationResult> result_queue, + base::OnceClosure callback) { + DCHECK(database()); + static_cast<MockAsyncSharedStorageDatabase*>(database()) + ->SetResultsForTesting(std::move(result_queue), std::move(callback)); + } +}; + +} // namespace + +class SharedStorageManagerTest : public testing::Test { + public: + SharedStorageManagerTest() + : special_storage_policy_( + base::MakeRefCounted<MockSpecialStoragePolicy>()), + receiver_(std::make_unique<TestDatabaseOperationReceiver>()) {} + + ~SharedStorageManagerTest() override = default; + + virtual SharedStorageManager* GetManager() { return manager_.get(); } + + void SetUp() override { + InitSharedStorageFeature(); + + if (GetType() != DBType::kInMemory) + PrepareFileBacked(); + else + EXPECT_TRUE(db_path_.empty()); + + CreateManager(); + } + + void TearDown() override { + task_environment_.RunUntilIdle(); + + if (GetType() != DBType::kInMemory) { + ResetManager(); + task_environment_.RunUntilIdle(); + EXPECT_TRUE(temp_dir_.Delete()); + } + } + + virtual void InitSharedStorageFeature() { + scoped_feature_list_.InitAndEnableFeatureWithParameters( + {blink::features::kSharedStorageAPI}, + // Set these intervals to be long enough not to interfere with the + // basic tests. + {{"SharedStorageStaleOriginPurgeInitialInterval", + TimeDeltaToString(base::Hours(1))}, + {"SharedStorageStaleOriginPurgeRecurringInterval", + TimeDeltaToString(base::Hours(2))}, + {"SharedStorageOriginStalenessThreshold", + TimeDeltaToString(base::Hours(4))}}); + } + + // Return the relative file path in the "storage/" subdirectory of test data + // for the SQL file from which to initialize an async shared storage database + // instance. + virtual const char* GetRelativeFilePath() { return nullptr; } + + virtual DBType GetType() { return DBType::kInMemory; } + + virtual void CreateManager() { + manager_ = std::make_unique<SharedStorageManager>( + db_path_, special_storage_policy_, SharedStorageOptions::Create()); + } + + virtual void ResetManager() { + if (manager_) + manager_.reset(); + } + + void PrepareFileBacked() { + // Get a temporary directory for the test DB files. + ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); + db_path_ = temp_dir_.GetPath().AppendASCII("TestSharedStorage.db"); + if (GetType() == DBType::kFileBackedFromExisting) + ASSERT_TRUE(CreateDatabaseFromSQL(db_path_, GetRelativeFilePath())); + EXPECT_FALSE(db_path_.empty()); + } + + bool is_finished() const { + DCHECK(receiver_); + return receiver_->is_finished(); + } + + void SetExpectedOperationList(std::queue<DBOperation> expected_operations) { + DCHECK(receiver_); + receiver_->set_expected_operations(std::move(expected_operations)); + } + + void WaitForOperations() { + DCHECK(receiver_); + receiver_->WaitForOperations(); + } + + void SetDestroyCallback() { + DCHECK(GetManager()); + destroy_loop_ = std::make_unique<base::RunLoop>(); + destroy_success_ = false; + GetManager()->SetOnDBDestroyedCallbackForTesting(base::BindOnce( + [](base::OnceClosure callback, bool* out_success, bool success) { + DCHECK(out_success); + *out_success = success; + std::move(callback).Run(); + }, + destroy_loop_->QuitClosure(), &destroy_success_)); + } + + void VerifyDestroyAndRecreateDatabaseSync() { + destroy_loop_->Run(); + EXPECT_TRUE(destroy_success_); + EXPECT_TRUE(GetManager()->tried_to_recover_from_init_failure_for_testing()); + EXPECT_TRUE(GetManager()->database()); + } + + void OnMemoryPressure(MemoryPressureLevel memory_pressure_level) { + DCHECK(GetManager()); + DCHECK(receiver_); + + auto callback = receiver_->MakeOnceClosureFromClosure( + DBOperation( + Type::DB_ON_MEMORY_PRESSURE, + {TestDatabaseOperationReceiver::SerializeMemoryPressureLevel( + memory_pressure_level)}), + base::BindLambdaForTesting([&]() { memory_trimmed_ = true; })); + GetManager()->OnMemoryPressure(std::move(callback), memory_pressure_level); + } + + void Get(url::Origin context_origin, + std::u16string key, + GetResult* out_value) { + DCHECK(out_value); + DCHECK(GetManager()); + DCHECK(receiver_); + + auto callback = receiver_->MakeGetResultCallback( + DBOperation(Type::DB_GET, context_origin, {key}), out_value); + GetManager()->Get(std::move(context_origin), std::move(key), + std::move(callback)); + } + + GetResult GetSync(url::Origin context_origin, std::u16string key) { + DCHECK(GetManager()); + base::test::TestFuture<GetResult> future; + GetManager()->Get(std::move(context_origin), std::move(key), + future.GetCallback()); + return future.Get(); + } + + void Set(url::Origin context_origin, + std::u16string key, + std::u16string value, + OperationResult* out_result, + SetBehavior behavior = SetBehavior::kDefault) { + DCHECK(out_result); + DCHECK(GetManager()); + DCHECK(receiver_); + + *out_result = OperationResult::kSqlError; + auto callback = receiver_->MakeOperationResultCallback( + DBOperation( + Type::DB_SET, context_origin, + {key, value, + TestDatabaseOperationReceiver::SerializeSetBehavior(behavior)}), + out_result); + GetManager()->Set(std::move(context_origin), std::move(key), + std::move(value), std::move(callback), behavior); + } + + OperationResult SetSync(url::Origin context_origin, + std::u16string key, + std::u16string value, + SetBehavior behavior = SetBehavior::kDefault) { + DCHECK(GetManager()); + base::test::TestFuture<OperationResult> future; + GetManager()->Set(std::move(context_origin), std::move(key), + std::move(value), future.GetCallback(), behavior); + return future.Get(); + } + + void Append(url::Origin context_origin, + std::u16string key, + std::u16string value, + OperationResult* out_result) { + DCHECK(out_result); + DCHECK(GetManager()); + DCHECK(receiver_); + + *out_result = OperationResult::kSqlError; + auto callback = receiver_->MakeOperationResultCallback( + DBOperation(Type::DB_APPEND, context_origin, {key, value}), out_result); + GetManager()->Append(std::move(context_origin), std::move(key), + std::move(value), std::move(callback)); + } + + OperationResult AppendSync(url::Origin context_origin, + std::u16string key, + std::u16string value) { + DCHECK(GetManager()); + base::test::TestFuture<OperationResult> future; + GetManager()->Append(std::move(context_origin), std::move(key), + std::move(value), future.GetCallback()); + return future.Get(); + } + + void Delete(url::Origin context_origin, + std::u16string key, + OperationResult* out_result) { + DCHECK(out_result); + DCHECK(GetManager()); + DCHECK(receiver_); + + *out_result = OperationResult::kSqlError; + auto callback = receiver_->MakeOperationResultCallback( + DBOperation(Type::DB_DELETE, context_origin, {key}), out_result); + GetManager()->Delete(std::move(context_origin), std::move(key), + std::move(callback)); + } + + OperationResult DeleteSync(url::Origin context_origin, std::u16string key) { + DCHECK(GetManager()); + base::test::TestFuture<OperationResult> future; + GetManager()->Delete(std::move(context_origin), std::move(key), + future.GetCallback()); + return future.Get(); + } + + void Length(url::Origin context_origin, int* out_length) { + DCHECK(out_length); + DCHECK(GetManager()); + DCHECK(receiver_); + + *out_length = -1; + auto callback = receiver_->MakeIntCallback( + DBOperation(Type::DB_LENGTH, context_origin), out_length); + GetManager()->Length(std::move(context_origin), std::move(callback)); + } + + int LengthSync(url::Origin context_origin) { + DCHECK(GetManager()); + base::test::TestFuture<int> future; + GetManager()->Length(std::move(context_origin), future.GetCallback()); + return future.Get(); + } + + void Key(url::Origin context_origin, int index, GetResult* out_key) { + DCHECK(out_key); + DCHECK(GetManager()); + DCHECK(receiver_); + + auto callback = receiver_->MakeGetResultCallback( + DBOperation(Type::DB_KEY, context_origin, + {base::NumberToString16(index)}), + out_key); + GetManager()->Key(std::move(context_origin), index, std::move(callback)); + } + + GetResult KeySync(url::Origin context_origin, int index) { + DCHECK(GetManager()); + base::test::TestFuture<GetResult> future; + GetManager()->Key(std::move(context_origin), index, future.GetCallback()); + return future.Get(); + } + + void Clear(url::Origin context_origin, OperationResult* out_result) { + DCHECK(out_result); + DCHECK(GetManager()); + DCHECK(receiver_); + + *out_result = OperationResult::kSqlError; + auto callback = receiver_->MakeOperationResultCallback( + DBOperation(Type::DB_CLEAR, context_origin), out_result); + GetManager()->Clear(std::move(context_origin), std::move(callback)); + } + + OperationResult ClearSync(url::Origin context_origin) { + DCHECK(GetManager()); + base::test::TestFuture<OperationResult> future; + GetManager()->Clear(std::move(context_origin), future.GetCallback()); + return future.Get(); + } + + void FetchOrigins(std::vector<mojom::StorageUsageInfoPtr>* out_result) { + DCHECK(out_result); + DCHECK(GetManager()); + DCHECK(receiver_); + + auto callback = receiver_->MakeInfosCallback( + DBOperation(Type::DB_FETCH_ORIGINS), out_result); + GetManager()->FetchOrigins(std::move(callback)); + } + + std::vector<mojom::StorageUsageInfoPtr> FetchOriginsSync() { + DCHECK(GetManager()); + base::test::TestFuture<std::vector<mojom::StorageUsageInfoPtr>> future; + GetManager()->FetchOrigins(future.GetCallback()); + return future.Take(); + } + + void PurgeMatchingOrigins(OriginMatcherFunctionUtility* matcher_utility, + size_t matcher_id, + base::Time begin, + base::Time end, + OperationResult* out_result, + bool perform_storage_cleanup = false) { + DCHECK(out_result); + DCHECK(GetManager()); + DCHECK(receiver_); + DCHECK(matcher_utility); + DCHECK(!(*matcher_utility).is_empty()); + DCHECK_LT(matcher_id, (*matcher_utility).size()); + + std::vector<std::u16string> params( + {base::NumberToString16(matcher_id), + TestDatabaseOperationReceiver::SerializeTime(begin), + TestDatabaseOperationReceiver::SerializeTime(end), + TestDatabaseOperationReceiver::SerializeBool( + perform_storage_cleanup)}); + auto callback = receiver_->MakeOperationResultCallback( + DBOperation(Type::DB_PURGE_MATCHING, std::move(params)), out_result); + GetManager()->PurgeMatchingOrigins( + matcher_utility->TakeMatcherFunctionForId(matcher_id), begin, end, + std::move(callback), perform_storage_cleanup); + } + + OperationResult PurgeMatchingOriginsSync(OriginMatcherFunction origin_matcher, + base::Time begin, + base::Time end, + bool perform_storage_cleanup) { + DCHECK(GetManager()); + base::test::TestFuture<OperationResult> future; + GetManager()->PurgeMatchingOrigins(std::move(origin_matcher), begin, end, + future.GetCallback(), + perform_storage_cleanup); + return future.Get(); + } + + void OverrideLastUsedTime(url::Origin context_origin, + base::Time new_last_used_time, + bool* out_success) { + DCHECK(out_success); + DCHECK(GetManager()); + DCHECK(receiver_); + + auto callback = receiver_->MakeBoolCallback( + DBOperation( + Type::DB_OVERRIDE_TIME, context_origin, + {TestDatabaseOperationReceiver::SerializeTime(new_last_used_time)}), + out_success); + GetManager()->OverrideLastUsedTimeForTesting( + std::move(context_origin), new_last_used_time, std::move(callback)); + } + + protected: + base::test::ScopedFeatureList scoped_feature_list_; + base::test::TaskEnvironment task_environment_{ + base::test::TaskEnvironment::TimeSource::MOCK_TIME}; + base::ScopedTempDir temp_dir_; + base::FilePath db_path_; + scoped_refptr<storage::MockSpecialStoragePolicy> special_storage_policy_; + std::unique_ptr<SharedStorageManager> manager_; + std::unique_ptr<TestDatabaseOperationReceiver> receiver_; + base::HistogramTester histogram_tester_; + std::unique_ptr<base::RunLoop> destroy_loop_; + bool destroy_success_ = false; + bool memory_trimmed_ = false; +}; + +class SharedStorageManagerFromFileV1Test : public SharedStorageManagerTest { + public: + DBType GetType() override { return DBType::kFileBackedFromExisting; } + + const char* GetRelativeFilePath() override { return "shared_storage.v1.sql"; } +}; + +// Test loading version 1 database. +TEST_F(SharedStorageManagerFromFileV1Test, Version1_LoadFromFile) { + url::Origin google_com = url::Origin::Create(GURL("http://google.com/")); + EXPECT_EQ(GetSync(google_com, u"key1").data, u"value1"); + EXPECT_EQ(GetSync(google_com, u"key2").data, u"value2"); + + url::Origin youtube_com = url::Origin::Create(GURL("http://youtube.com/")); + EXPECT_EQ(1L, LengthSync(youtube_com)); + + url::Origin chromium_org = url::Origin::Create(GURL("http://chromium.org/")); + EXPECT_EQ(GetSync(chromium_org, u"a").data, u""); + EXPECT_EQ(KeySync(chromium_org, 2UL).data, u"c"); + + url::Origin google_org = url::Origin::Create(GURL("http://google.org/")); + EXPECT_EQ( + GetSync(google_org, u"1").data, + u"fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffff"); + EXPECT_EQ(GetSync(google_org, + u"ffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "fffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff") + .data, + u"k"); + + std::vector<mojom::StorageUsageInfoPtr> infos = FetchOriginsSync(); + std::vector<url::Origin> origins; + for (const auto& info : infos) + origins.push_back(info->origin); + EXPECT_THAT( + origins, + testing::UnorderedElementsAre( + url::Origin::Create(GURL("http://abc.xyz")), chromium_org, google_com, + google_org, url::Origin::Create(GURL("http://growwithgoogle.com")), + url::Origin::Create(GURL("http://gv.com")), + url::Origin::Create(GURL("http://waymo.com")), + url::Origin::Create(GURL("http://withgoogle.com")), youtube_com)); +} + +class SharedStorageManagerParamTest + : public SharedStorageManagerTest, + public testing::WithParamInterface<SharedStorageWrappedBool> { + public: + DBType GetType() override { + return GetParam().in_memory_only ? DBType::kInMemory + : DBType::kFileBackedFromNew; + } +}; + +INSTANTIATE_TEST_SUITE_P(All, + SharedStorageManagerParamTest, + testing::ValuesIn(GetSharedStorageWrappedBools()), + testing::PrintToStringParamName()); + +TEST_P(SharedStorageManagerParamTest, BasicOperations) { + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key1", u"value1")); + EXPECT_EQ(GetSync(kOrigin1, u"key1").data, u"value1"); + + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key1", u"value2")); + EXPECT_EQ(GetSync(kOrigin1, u"key1").data, u"value2"); + + EXPECT_EQ(OperationResult::kSuccess, DeleteSync(kOrigin1, u"key1")); + EXPECT_FALSE(GetSync(kOrigin1, u"key1").data); +} + +TEST_P(SharedStorageManagerParamTest, IgnoreIfPresent) { + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key1", u"value1")); + EXPECT_EQ(GetSync(kOrigin1, u"key1").data, u"value1"); + + EXPECT_EQ(OperationResult::kIgnored, SetSync(kOrigin1, u"key1", u"value2", + SetBehavior::kIgnoreIfPresent)); + EXPECT_EQ(GetSync(kOrigin1, u"key1").data, u"value1"); + + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key2", u"value1")); + EXPECT_EQ(GetSync(kOrigin1, u"key2").data, u"value1"); + + EXPECT_EQ(OperationResult::kSet, + SetSync(kOrigin1, u"key2", u"value2", SetBehavior::kDefault)); + EXPECT_EQ(GetSync(kOrigin1, u"key2").data, u"value2"); +} + +TEST_P(SharedStorageManagerParamTest, Append) { + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + EXPECT_EQ(OperationResult::kSet, AppendSync(kOrigin1, u"key1", u"value1")); + EXPECT_EQ(GetSync(kOrigin1, u"key1").data, u"value1"); + + EXPECT_EQ(OperationResult::kSet, AppendSync(kOrigin1, u"key1", u"value1")); + std::u16string expected_value = base::StrCat({u"value1", u"value1"}); + EXPECT_EQ(GetSync(kOrigin1, u"key1").data, expected_value); + + EXPECT_EQ(OperationResult::kSet, AppendSync(kOrigin1, u"key1", u"value1")); + expected_value = base::StrCat({std::move(expected_value), u"value1"}); + EXPECT_EQ(GetSync(kOrigin1, u"key1").data, expected_value); +} + +TEST_P(SharedStorageManagerParamTest, Length) { + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + EXPECT_EQ(0, LengthSync(kOrigin1)); + + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key1", u"value1")); + EXPECT_EQ(1, LengthSync(kOrigin1)); + + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key2", u"value2")); + EXPECT_EQ(2, LengthSync(kOrigin1)); + + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key2", u"value3")); + EXPECT_EQ(2, LengthSync(kOrigin1)); + + url::Origin kOrigin2 = url::Origin::Create(GURL("http://www.example2.test")); + EXPECT_EQ(0, LengthSync(kOrigin2)); + + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin2, u"key1", u"value1")); + EXPECT_EQ(1, LengthSync(kOrigin2)); + EXPECT_EQ(2, LengthSync(kOrigin1)); + + EXPECT_EQ(OperationResult::kSuccess, DeleteSync(kOrigin2, u"key1")); + EXPECT_EQ(0, LengthSync(kOrigin2)); + EXPECT_EQ(2, LengthSync(kOrigin1)); + + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key3", u"value3")); + EXPECT_EQ(3, LengthSync(kOrigin1)); + EXPECT_EQ(0, LengthSync(kOrigin2)); +} + +TEST_P(SharedStorageManagerParamTest, Key) { + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + EXPECT_FALSE(KeySync(kOrigin1, 0).data); + + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key1", u"value1")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key2", u"value2")); + EXPECT_EQ(KeySync(kOrigin1, 0).data, u"key1"); + EXPECT_EQ(KeySync(kOrigin1, 1).data, u"key2"); + EXPECT_FALSE(KeySync(kOrigin1, 2).data); + + url::Origin kOrigin2 = url::Origin::Create(GURL("http://www.example2.test")); + EXPECT_FALSE(KeySync(kOrigin2, 0).data); + + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin2, u"key2", u"value2")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin2, u"key1", u"value1")); + EXPECT_EQ(KeySync(kOrigin2, 0).data, u"key1"); + EXPECT_EQ(KeySync(kOrigin2, 1).data, u"key2"); + + EXPECT_EQ(OperationResult::kSuccess, DeleteSync(kOrigin2, u"key2")); + EXPECT_EQ(KeySync(kOrigin2, 0).data, u"key1"); + EXPECT_FALSE(KeySync(kOrigin2, 1).data); +} + +TEST_P(SharedStorageManagerParamTest, Clear) { + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key1", u"value1")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key2", u"value2")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key3", u"value3")); + + EXPECT_EQ(3, LengthSync(kOrigin1)); + + url::Origin kOrigin2 = url::Origin::Create(GURL("http://www.example2.test")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin2, u"key1", u"value1")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin2, u"key2", u"value2")); + + EXPECT_EQ(2, LengthSync(kOrigin2)); + + EXPECT_EQ(OperationResult::kSuccess, ClearSync(kOrigin1)); + EXPECT_EQ(0, LengthSync(kOrigin1)); + EXPECT_EQ(2, LengthSync(kOrigin2)); + + EXPECT_EQ(OperationResult::kSuccess, ClearSync(kOrigin2)); + EXPECT_EQ(0, LengthSync(kOrigin2)); +} + +TEST_P(SharedStorageManagerParamTest, + FetchOriginsAndSimplePurgeMatchingOrigins) { + EXPECT_TRUE(FetchOriginsSync().empty()); + + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key1", u"value1")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key2", u"value2")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key3", u"value3")); + + EXPECT_EQ(3, LengthSync(kOrigin1)); + + std::vector<url::Origin> origins; + for (const auto& info : FetchOriginsSync()) + origins.push_back(info->origin); + EXPECT_THAT(origins, ElementsAre(kOrigin1)); + + url::Origin kOrigin2 = url::Origin::Create(GURL("http://www.example2.test")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin2, u"key1", u"value1")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin2, u"key2", u"value2")); + + EXPECT_EQ(2, LengthSync(kOrigin2)); + + origins.clear(); + for (const auto& info : FetchOriginsSync()) + origins.push_back(info->origin); + EXPECT_THAT(origins, ElementsAre(kOrigin1, kOrigin2)); + + OriginMatcherFunctionUtility matcher_utility; + EXPECT_EQ( + OperationResult::kSuccess, + PurgeMatchingOriginsSync(matcher_utility.MakeMatcherFunction({kOrigin1}), + base::Time::Min(), base::Time::Max(), + /*perform_storage_cleanup=*/true)); + + origins.clear(); + for (const auto& info : FetchOriginsSync()) + origins.push_back(info->origin); + EXPECT_THAT(origins, ElementsAre(kOrigin2)); + + EXPECT_EQ(OperationResult::kSuccess, + PurgeMatchingOriginsSync( + matcher_utility.MakeMatcherFunction({kOrigin1, kOrigin2}), + base::Time::Min(), base::Time::Max(), + /*perform_storage_cleanup=*/true)); + + EXPECT_TRUE(FetchOriginsSync().empty()); +} + +TEST_P(SharedStorageManagerParamTest, AdvanceTime_StaleOriginsPurged) { + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key1", u"value1")); + EXPECT_FALSE(FetchOriginsSync().empty()); + + // Initial interval for checking origin staleness is 1 hour for this test. + task_environment_.FastForwardBy(base::Hours(1)); + EXPECT_FALSE(FetchOriginsSync().empty()); + + // Subsequent intervals are 2 hours each. + task_environment_.FastForwardBy(base::Hours(2)); + EXPECT_FALSE(FetchOriginsSync().empty()); + + // We have set the staleness threshold to 4 hours for this test. So `kOrigin1` + // should now be cleared. + task_environment_.FastForwardBy(base::Hours(2)); + EXPECT_TRUE(FetchOriginsSync().empty()); +} + +class SharedStorageManagerErrorParamTest + : public SharedStorageManagerTest, + public testing::WithParamInterface<SharedStorageWrappedBool> { + public: + SharedStorageManagerErrorParamTest() = default; + + ~SharedStorageManagerErrorParamTest() override = default; + + SharedStorageManager* GetManager() override { return mock_manager_.get(); } + + DBType GetType() override { + return GetParam().in_memory_only ? DBType::kInMemory + : DBType::kFileBackedFromNew; + } + + void CreateManager() override { + mock_manager_ = std::make_unique<MockSharedStorageManager>( + db_path_, special_storage_policy_, SharedStorageOptions::Create()); + } + + void ResetManager() override { + if (mock_manager_) + mock_manager_.reset(); + } + + void SetResults(std::queue<OperationResult> result_queue) { + DCHECK(mock_manager_); + base::RunLoop loop; + mock_manager_->SetResultsForTesting(std::move(result_queue), + loop.QuitClosure()); + loop.Run(); + } + + protected: + std::unique_ptr<MockSharedStorageManager> mock_manager_; +}; + +INSTANTIATE_TEST_SUITE_P(All, + SharedStorageManagerErrorParamTest, + testing::ValuesIn(GetSharedStorageWrappedBools()), + testing::PrintToStringParamName()); + +TEST_P(SharedStorageManagerErrorParamTest, SqlErrors_ShutdownMetricsReported) { + ASSERT_TRUE(GetManager()); + ASSERT_TRUE(GetManager()->database()); + + // Note that the result queue needs to contain the int result -1 for + // `AsyncSharedStorageDatabase::Length()` cast to an `OperationResult`. + std::queue<OperationResult> result_queue1( + {OperationResult::kSuccess, OperationResult::kSqlError, + OperationResult::kSuccess, OperationResult::kSqlError, + OperationResult::kSqlError, OperationResult::kSqlError, + OperationResult::kSet, OperationResult::kSqlError /* -> -1 */, + OperationResult::kSqlError, OperationResult::kSqlError, + OperationResult::kSuccess}); + SetResults(std::move(result_queue1)); + + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + EXPECT_FALSE(GetManager()->tried_to_recover_from_init_failure_for_testing()); + + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + EXPECT_EQ(OperationResult::kSuccess, GetSync(kOrigin1, u"key1").result); + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kSqlError, + AppendSync(kOrigin1, u"key1", u"value1")); + EXPECT_EQ(1, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kSuccess, DeleteSync(kOrigin1, u"key1")); + EXPECT_EQ(1, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kSqlError, SetSync(kOrigin1, u"key1", u"value1")); + EXPECT_EQ(2, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kSqlError, DeleteSync(kOrigin1, u"key1")); + EXPECT_EQ(3, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kSqlError, ClearSync(kOrigin1)); + EXPECT_EQ(4, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kSet, SetSync(kOrigin1, u"key1", u"value1")); + EXPECT_EQ(4, GetManager()->operation_sql_error_count_for_testing()); + + // -1 is an error for `Length()`. + EXPECT_EQ(-1, LengthSync(kOrigin1)); + EXPECT_EQ(5, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kSqlError, KeySync(kOrigin1, 0).result); + EXPECT_EQ(6, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kSqlError, + AppendSync(kOrigin1, u"key1", u"value1")); + EXPECT_EQ(7, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kSuccess, ClearSync(kOrigin1)); + EXPECT_EQ(7, GetManager()->operation_sql_error_count_for_testing()); + + ResetManager(); + histogram_tester_.ExpectUniqueSample( + "Storage.SharedStorage.OnShutdown.NumSqlErrors", 7, 1); + histogram_tester_.ExpectUniqueSample( + "Storage.SharedStorage.OnShutdown.RecoveryFromInitFailureAttempted", + false, 1); + histogram_tester_.ExpectUniqueSample( + "Storage.SharedStorage.OnShutdown.RecoveryOnDiskAttempted", false, 1); +} + +TEST_P(SharedStorageManagerErrorParamTest, + InitFailure_DestroyAndRecreateDatabase) { + ASSERT_TRUE(GetManager()); + ASSERT_TRUE(GetManager()->database()); + SetDestroyCallback(); + + // Note that the result queue needs to contain the bool result true for + // `AsyncSharedStorageDatabase::Destroy()` cast to an + // `OperationResult::kSuccess`. + std::queue<OperationResult> result_queue1( + {OperationResult::kInitFailure, OperationResult::kSuccess /* -> true */}); + SetResults(std::move(result_queue1)); + + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + EXPECT_FALSE(GetManager()->tried_to_recover_from_init_failure_for_testing()); + + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + EXPECT_EQ(OperationResult::kInitFailure, + AppendSync(kOrigin1, u"key1", u"value1")); + + // `OperationResult::kInitFailure` is not added to the error tally. + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + VerifyDestroyAndRecreateDatabaseSync(); + EXPECT_EQ(!GetParam().in_memory_only, + GetManager()->tried_to_recreate_on_disk_for_testing()); + + // Reset the callback. + SetDestroyCallback(); + + // Since the database has been recreated, we need to override it again in + // order to use a `MockAsyncSharedStorageDatabase` so that we can force + // errors. + // + // Note that the result queue needs to contain the bool result true for + // `AsyncSharedStorageDatabase::Destroy()` cast to an + // `OperationResult::kSuccess`. + std::queue<OperationResult> result_queue2( + {OperationResult::kInitFailure, OperationResult::kSuccess /* -> true */}); + GetManager()->OverrideDatabaseForTesting( + MockAsyncSharedStorageDatabase::Create(std::move(result_queue2))); + ASSERT_TRUE(GetManager()->database()); + + EXPECT_EQ(OperationResult::kInitFailure, + SetSync(kOrigin1, u"key1", u"value1")); + + // Again, `OperationResult::kInitFailure` is not added to the error tally. + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + + // If in memory, we do nothing because we have already recreated the database + // once. Otherwise we `DestroyAndRecreateDatabase()` again`, this time in + // memory. + if (!GetParam().in_memory_only) + VerifyDestroyAndRecreateDatabaseSync(); + EXPECT_EQ(!GetParam().in_memory_only, destroy_success_); + EXPECT_TRUE(GetManager()->in_memory()); + + EXPECT_EQ(OperationResult::kSuccess, ClearSync(kOrigin1)); + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + + ResetManager(); + histogram_tester_.ExpectUniqueSample( + "Storage.SharedStorage.OnShutdown.NumSqlErrors", 0, 1); + histogram_tester_.ExpectUniqueSample( + "Storage.SharedStorage.OnShutdown.RecoveryFromInitFailureAttempted", true, + 1); + histogram_tester_.ExpectUniqueSample( + "Storage.SharedStorage.OnShutdown.RecoveryOnDiskAttempted", + !GetParam().in_memory_only, 1); +} + +TEST_P(SharedStorageManagerErrorParamTest, + OtherOperationResults_NoErrorsAdded) { + ASSERT_TRUE(GetManager()); + ASSERT_TRUE(GetManager()->database()); + SetDestroyCallback(); + + std::queue<OperationResult> result_queue1( + {OperationResult::kSuccess, OperationResult::kSet, + OperationResult::kIgnored, OperationResult::kNoCapacity, + OperationResult::kInvalidAppend}); + SetResults(std::move(result_queue1)); + + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + EXPECT_FALSE(GetManager()->tried_to_recover_from_init_failure_for_testing()); + + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + EXPECT_EQ(OperationResult::kSuccess, GetSync(kOrigin1, u"key1").result); + + // `OperationResult::kSuccess` is not added to the error tally. + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kSet, AppendSync(kOrigin1, u"key1", u"value1")); + + // `OperationResult::kSet` is not added to the error tally. + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kIgnored, SetSync(kOrigin1, u"key1", u"value1", + SetBehavior::kIgnoreIfPresent)); + + // `OperationResult::kIgnored` is not added to the error tally. + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kNoCapacity, + SetSync(kOrigin1, u"key1", u"value1")); + + // `OperationResult::kNoCapacity` is not added to the error tally. + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_EQ(OperationResult::kInvalidAppend, + AppendSync(kOrigin1, u"key1", u"value1")); + + // `OperationResult::kInvalidAppend` is not added to the error tally. + EXPECT_EQ(0, GetManager()->operation_sql_error_count_for_testing()); + + EXPECT_FALSE(GetManager()->tried_to_recover_from_init_failure_for_testing()); + EXPECT_FALSE(destroy_success_); + + ResetManager(); + histogram_tester_.ExpectUniqueSample( + "Storage.SharedStorage.OnShutdown.NumSqlErrors", 0, 1); + histogram_tester_.ExpectUniqueSample( + "Storage.SharedStorage.OnShutdown.RecoveryFromInitFailureAttempted", + false, 1); + histogram_tester_.ExpectUniqueSample( + "Storage.SharedStorage.OnShutdown.RecoveryOnDiskAttempted", false, 1); +} + +// Verifies that the async operations are executed in order and without races. +TEST_P(SharedStorageManagerParamTest, AsyncOperations) { + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + + std::queue<DBOperation> operation_list( + {{Type::DB_SET, + kOrigin1, + {u"key1", u"value1", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)}}, + {Type::DB_GET, kOrigin1, {u"key1"}}, + {Type::DB_SET, + kOrigin1, + {u"key1", u"value2", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)}}, + {Type::DB_GET, kOrigin1, {u"key1"}}, + {Type::DB_SET, + kOrigin1, + {u"key2", u"value1", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)}}, + {Type::DB_GET, kOrigin1, {u"key2"}}, + {Type::DB_LENGTH, kOrigin1}, + {Type::DB_DELETE, kOrigin1, {u"key1"}}, + {Type::DB_LENGTH, kOrigin1}, + {Type::DB_APPEND, kOrigin1, {u"key1", u"value1"}}, + {Type::DB_GET, kOrigin1, {u"key1"}}, + {Type::DB_LENGTH, kOrigin1}, + {Type::DB_APPEND, kOrigin1, {u"key1", u"value1"}}, + {Type::DB_GET, kOrigin1, {u"key1"}}, + {Type::DB_LENGTH, kOrigin1}, + {Type::DB_KEY, kOrigin1, {base::NumberToString16(0)}}, + {Type::DB_KEY, kOrigin1, {base::NumberToString16(1)}}, + {Type::DB_CLEAR, kOrigin1}, + {Type::DB_LENGTH, kOrigin1}, + {Type::DB_ON_MEMORY_PRESSURE, + {TestDatabaseOperationReceiver::SerializeMemoryPressureLevel( + MemoryPressureLevel::MEMORY_PRESSURE_LEVEL_CRITICAL)}}}); + + SetExpectedOperationList(std::move(operation_list)); + ASSERT_TRUE(GetManager()); + ASSERT_TRUE(GetManager()->database()); + + OperationResult result1 = OperationResult::kSqlError; + Set(kOrigin1, u"key1", u"value1", &result1); + GetResult value1; + Get(kOrigin1, u"key1", &value1); + OperationResult result2 = OperationResult::kSqlError; + Set(kOrigin1, u"key1", u"value2", &result2); + GetResult value2; + Get(kOrigin1, u"key1", &value2); + OperationResult result3 = OperationResult::kSqlError; + Set(kOrigin1, u"key2", u"value1", &result3); + GetResult value3; + Get(kOrigin1, u"key2", &value3); + int length1 = -1; + Length(kOrigin1, &length1); + + OperationResult result4 = OperationResult::kSqlError; + Delete(kOrigin1, u"key1", &result4); + int length2 = -1; + Length(kOrigin1, &length2); + + OperationResult result5 = OperationResult::kSqlError; + Append(kOrigin1, u"key1", u"value1", &result5); + GetResult value4; + Get(kOrigin1, u"key1", &value4); + int length3 = -1; + Length(kOrigin1, &length3); + + OperationResult result6 = OperationResult::kSqlError; + Append(kOrigin1, u"key1", u"value1", &result6); + GetResult value5; + Get(kOrigin1, u"key1", &value5); + int length4 = -1; + Length(kOrigin1, &length4); + + GetResult key1; + Key(kOrigin1, 0, &key1); + GetResult key2; + Key(kOrigin1, 1, &key2); + + OperationResult result7 = OperationResult::kSqlError; + Clear(kOrigin1, &result7); + int length5 = -1; + Length(kOrigin1, &length5); + + EXPECT_FALSE(memory_trimmed_); + OnMemoryPressure(MemoryPressureLevel::MEMORY_PRESSURE_LEVEL_CRITICAL); + + WaitForOperations(); + EXPECT_TRUE(is_finished()); + + EXPECT_EQ(OperationResult::kSet, result1); + EXPECT_EQ(value1.data, u"value1"); + EXPECT_EQ(OperationResult::kSet, result2); + EXPECT_EQ(value2.data, u"value2"); + EXPECT_EQ(OperationResult::kSet, result3); + EXPECT_EQ(value3.data, u"value1"); + EXPECT_EQ(2, length1); + + EXPECT_EQ(OperationResult::kSuccess, result4); + EXPECT_EQ(1, length2); + + EXPECT_EQ(OperationResult::kSet, result5); + EXPECT_EQ(value4.data, u"value1"); + EXPECT_EQ(2, length3); + + EXPECT_EQ(OperationResult::kSet, result6); + EXPECT_EQ(value5.data, u"value1value1"); + EXPECT_EQ(2, length4); + + EXPECT_EQ(key1.data, u"key1"); + EXPECT_EQ(key2.data, u"key2"); + + EXPECT_EQ(OperationResult::kSuccess, result7); + EXPECT_EQ(0, length5); + + EXPECT_TRUE(memory_trimmed_); +} + +class SharedStorageManagerPurgeMatchingOriginsParamTest + : public SharedStorageManagerTest, + public testing::WithParamInterface<PurgeMatchingOriginsParams> { + public: + DBType GetType() override { + return GetParam().in_memory_only ? DBType::kInMemory + : DBType::kFileBackedFromNew; + } +}; + +INSTANTIATE_TEST_SUITE_P(All, + SharedStorageManagerPurgeMatchingOriginsParamTest, + testing::ValuesIn(GetPurgeMatchingOriginsParams()), + testing::PrintToStringParamName()); + +TEST_P(SharedStorageManagerPurgeMatchingOriginsParamTest, SinceThreshold) { + url::Origin kOrigin1 = url::Origin::Create(GURL("http://www.example1.test")); + url::Origin kOrigin2 = url::Origin::Create(GURL("http://www.example2.test")); + url::Origin kOrigin3 = url::Origin::Create(GURL("http://www.example3.test")); + url::Origin kOrigin4 = url::Origin::Create(GURL("http://www.example4.test")); + url::Origin kOrigin5 = url::Origin::Create(GURL("http://www.example5.test")); + + std::queue<DBOperation> operation_list; + operation_list.push(DBOperation(Type::DB_FETCH_ORIGINS)); + + base::Time threshold1 = base::Time::Now(); + OriginMatcherFunctionUtility matcher_utility; + size_t matcher_id1 = matcher_utility.RegisterMatcherFunction({kOrigin1}); + + operation_list.push(DBOperation( + Type::DB_PURGE_MATCHING, + {base::NumberToString16(matcher_id1), + TestDatabaseOperationReceiver::SerializeTime(threshold1), + TestDatabaseOperationReceiver::SerializeTime(base::Time::Max()), + TestDatabaseOperationReceiver::SerializeBool( + GetParam().perform_storage_cleanup)})); + + operation_list.push( + DBOperation(Type::DB_SET, kOrigin1, + {u"key1", u"value1", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)})); + + operation_list.push( + DBOperation(Type::DB_SET, kOrigin1, + {u"key2", u"value2", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)})); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin1)); + + operation_list.push( + DBOperation(Type::DB_SET, kOrigin2, + {u"key1", u"value1", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)})); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin2)); + + operation_list.push( + DBOperation(Type::DB_SET, kOrigin3, + {u"key1", u"value1", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)})); + operation_list.push( + DBOperation(Type::DB_SET, kOrigin3, + {u"key2", u"value2", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)})); + operation_list.push( + DBOperation(Type::DB_SET, kOrigin3, + {u"key3", u"value3", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)})); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin3)); + + operation_list.push( + DBOperation(Type::DB_SET, kOrigin4, + {u"key1", u"value1", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)})); + operation_list.push( + DBOperation(Type::DB_SET, kOrigin4, + {u"key2", u"value2", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)})); + operation_list.push( + DBOperation(Type::DB_SET, kOrigin4, + {u"key3", u"value3", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)})); + operation_list.push( + DBOperation(Type::DB_SET, kOrigin4, + {u"key4", u"value4", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)})); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin4)); + + operation_list.push( + DBOperation(Type::DB_SET, kOrigin5, + {u"key1", u"value1", + TestDatabaseOperationReceiver::SerializeSetBehavior( + SetBehavior::kDefault)})); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin5)); + + operation_list.push(DBOperation(Type::DB_FETCH_ORIGINS)); + + base::Time threshold2 = base::Time::Now() + base::Days(1); + base::Time override_time1 = threshold2 + base::Milliseconds(5); + operation_list.push(DBOperation( + Type::DB_OVERRIDE_TIME, kOrigin1, + {TestDatabaseOperationReceiver::SerializeTime(override_time1)})); + + size_t matcher_id2 = + matcher_utility.RegisterMatcherFunction({kOrigin1, kOrigin2, kOrigin5}); + operation_list.push(DBOperation( + Type::DB_PURGE_MATCHING, + {base::NumberToString16(matcher_id2), + TestDatabaseOperationReceiver::SerializeTime(threshold2), + TestDatabaseOperationReceiver::SerializeTime(base::Time::Max()), + TestDatabaseOperationReceiver::SerializeBool( + GetParam().perform_storage_cleanup)})); + + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin1)); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin2)); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin3)); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin4)); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin5)); + + operation_list.push(DBOperation(Type::DB_FETCH_ORIGINS)); + + base::Time threshold3 = threshold2 + base::Days(1); + operation_list.push( + DBOperation(Type::DB_OVERRIDE_TIME, kOrigin3, + {TestDatabaseOperationReceiver::SerializeTime(threshold3)})); + + base::Time threshold4 = threshold3 + base::Seconds(100); + operation_list.push( + DBOperation(Type::DB_OVERRIDE_TIME, kOrigin5, + {TestDatabaseOperationReceiver::SerializeTime(threshold4)})); + + size_t matcher_id3 = matcher_utility.RegisterMatcherFunction( + {kOrigin2, kOrigin3, kOrigin4, kOrigin5}); + operation_list.push( + DBOperation(Type::DB_PURGE_MATCHING, + {base::NumberToString16(matcher_id3), + TestDatabaseOperationReceiver::SerializeTime(threshold3), + TestDatabaseOperationReceiver::SerializeTime(threshold4), + TestDatabaseOperationReceiver::SerializeBool( + GetParam().perform_storage_cleanup)})); + + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin1)); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin2)); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin3)); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin4)); + operation_list.push(DBOperation(Type::DB_LENGTH, kOrigin5)); + + operation_list.push( + DBOperation(Type::DB_ON_MEMORY_PRESSURE, + {TestDatabaseOperationReceiver::SerializeMemoryPressureLevel( + MemoryPressureLevel::MEMORY_PRESSURE_LEVEL_CRITICAL)})); + + operation_list.push(DBOperation(Type::DB_FETCH_ORIGINS)); + + operation_list.push(DBOperation(Type::DB_GET, kOrigin2, {u"key1"})); + operation_list.push(DBOperation(Type::DB_GET, kOrigin4, {u"key1"})); + operation_list.push(DBOperation(Type::DB_GET, kOrigin4, {u"key2"})); + operation_list.push(DBOperation(Type::DB_GET, kOrigin4, {u"key3"})); + operation_list.push(DBOperation(Type::DB_GET, kOrigin4, {u"key4"})); + + SetExpectedOperationList(std::move(operation_list)); + + // Check that origin list is initially empty due to the database not being + // initialized. + std::vector<mojom::StorageUsageInfoPtr> infos1; + FetchOrigins(&infos1); + + OperationResult result1 = OperationResult::kSqlError; + PurgeMatchingOrigins(&matcher_utility, matcher_id1, threshold1, + base::Time::Max(), &result1, + GetParam().perform_storage_cleanup); + + OperationResult result2 = OperationResult::kSqlError; + Set(kOrigin1, u"key1", u"value1", &result2); + + OperationResult result3 = OperationResult::kSqlError; + Set(kOrigin1, u"key2", u"value2", &result3); + int length1 = -1; + Length(kOrigin1, &length1); + + OperationResult result4 = OperationResult::kSqlError; + Set(kOrigin2, u"key1", u"value1", &result4); + int length2 = -1; + Length(kOrigin2, &length2); + + OperationResult result5 = OperationResult::kSqlError; + Set(kOrigin3, u"key1", u"value1", &result5); + OperationResult result6 = OperationResult::kSqlError; + Set(kOrigin3, u"key2", u"value2", &result6); + OperationResult result7 = OperationResult::kSqlError; + Set(kOrigin3, u"key3", u"value3", &result7); + int length3 = -1; + Length(kOrigin3, &length3); + + OperationResult result8 = OperationResult::kSqlError; + Set(kOrigin4, u"key1", u"value1", &result8); + OperationResult result9 = OperationResult::kSqlError; + Set(kOrigin4, u"key2", u"value2", &result9); + OperationResult result10 = OperationResult::kSqlError; + Set(kOrigin4, u"key3", u"value3", &result10); + OperationResult result11 = OperationResult::kSqlError; + Set(kOrigin4, u"key4", u"value4", &result11); + int length4 = -1; + Length(kOrigin4, &length4); + + OperationResult result12 = OperationResult::kSqlError; + Set(kOrigin5, u"key1", u"value1", &result12); + int length5 = -1; + Length(kOrigin5, &length5); + + std::vector<mojom::StorageUsageInfoPtr> infos2; + FetchOrigins(&infos2); + + bool success1 = false; + OverrideLastUsedTime(kOrigin1, override_time1, &success1); + + // Verify that the only match we get is for `kOrigin1`, whose `last_used_time` + // is between the time parameters. + OperationResult result13 = OperationResult::kSqlError; + PurgeMatchingOrigins(&matcher_utility, matcher_id2, threshold2, + base::Time::Max(), &result13, + GetParam().perform_storage_cleanup); + + int length6 = -1; + Length(kOrigin1, &length6); + int length7 = -1; + Length(kOrigin2, &length7); + int length8 = -1; + Length(kOrigin3, &length8); + int length9 = -1; + Length(kOrigin4, &length9); + int length10 = -1; + Length(kOrigin5, &length10); + + std::vector<mojom::StorageUsageInfoPtr> infos3; + FetchOrigins(&infos3); + + bool success2 = false; + OverrideLastUsedTime(kOrigin3, threshold3, &success2); + bool success3 = false; + OverrideLastUsedTime(kOrigin5, threshold4, &success3); + + // Verify that we still get matches for `kOrigin3`, whose `last_used_time` is + // exactly at the `begin` time, as well as for `kOrigin5`, whose + // `last_used_time` is exactly at the `end` time. + OperationResult result14 = OperationResult::kSqlError; + PurgeMatchingOrigins(&matcher_utility, matcher_id3, threshold3, threshold4, + &result14, GetParam().perform_storage_cleanup); + + int length11 = -1; + Length(kOrigin1, &length11); + int length12 = -1; + Length(kOrigin2, &length12); + int length13 = -1; + Length(kOrigin3, &length13); + int length14 = -1; + Length(kOrigin4, &length14); + int length15 = -1; + Length(kOrigin5, &length15); + + EXPECT_FALSE(memory_trimmed_); + OnMemoryPressure(MemoryPressureLevel::MEMORY_PRESSURE_LEVEL_CRITICAL); + + std::vector<mojom::StorageUsageInfoPtr> infos4; + FetchOrigins(&infos4); + + GetResult value1; + Get(kOrigin2, u"key1", &value1); + GetResult value2; + Get(kOrigin4, u"key1", &value2); + GetResult value3; + Get(kOrigin4, u"key2", &value3); + GetResult value4; + Get(kOrigin4, u"key3", &value4); + GetResult value5; + Get(kOrigin4, u"key4", &value5); + + WaitForOperations(); + EXPECT_TRUE(is_finished()); + + // No error from calling `PurgeMatchingOrigins()` on an uninitialized + // database. + EXPECT_EQ(OperationResult::kSuccess, result1); + + // The call to `Set()` initializes the database. + EXPECT_EQ(OperationResult::kSet, result2); + + EXPECT_EQ(OperationResult::kSet, result3); + EXPECT_EQ(2, length1); + + EXPECT_EQ(OperationResult::kSet, result4); + EXPECT_EQ(1, length2); + + EXPECT_EQ(OperationResult::kSet, result5); + EXPECT_EQ(OperationResult::kSet, result6); + EXPECT_EQ(OperationResult::kSet, result7); + EXPECT_EQ(3, length3); + + EXPECT_EQ(OperationResult::kSet, result8); + EXPECT_EQ(OperationResult::kSet, result9); + EXPECT_EQ(OperationResult::kSet, result10); + EXPECT_EQ(OperationResult::kSet, result11); + EXPECT_EQ(4, length4); + + EXPECT_EQ(OperationResult::kSet, result12); + EXPECT_EQ(1, length5); + + std::vector<url::Origin> origins; + for (const auto& info : infos2) + origins.push_back(info->origin); + EXPECT_THAT(origins, + ElementsAre(kOrigin1, kOrigin2, kOrigin3, kOrigin4, kOrigin5)); + + EXPECT_EQ(value1.data, u"value1"); + EXPECT_EQ(OperationResult::kSuccess, value1.result); + + EXPECT_TRUE(success1); + EXPECT_EQ(OperationResult::kSuccess, result13); + + // `kOrigin1` is cleared. The other origins are not. + EXPECT_EQ(0, length6); + EXPECT_EQ(1, length7); + EXPECT_EQ(3, length8); + EXPECT_EQ(4, length9); + EXPECT_EQ(1, length10); + + origins.clear(); + for (const auto& info : infos3) + origins.push_back(info->origin); + EXPECT_THAT(origins, ElementsAre(kOrigin2, kOrigin3, kOrigin4, kOrigin5)); + + EXPECT_TRUE(success2); + EXPECT_TRUE(success3); + + EXPECT_EQ(OperationResult::kSuccess, result14); + + // `kOrigin3` and `kOrigin5` are cleared. The others weren't modified within + // the given time period. + EXPECT_EQ(0, length11); + EXPECT_EQ(1, length12); + EXPECT_EQ(0, length13); + EXPECT_EQ(4, length14); + EXPECT_EQ(0, length15); + + EXPECT_TRUE(memory_trimmed_); + + origins.clear(); + for (const auto& info : infos4) + origins.push_back(info->origin); + EXPECT_THAT(origins, ElementsAre(kOrigin2, kOrigin4)); + + // Database is still intact after trimming memory (and possibly performing + // storage cleanup). + EXPECT_EQ(value1.data, u"value1"); + EXPECT_EQ(OperationResult::kSuccess, value1.result); + EXPECT_EQ(value2.data, u"value1"); + EXPECT_EQ(OperationResult::kSuccess, value2.result); + EXPECT_EQ(value3.data, u"value2"); + EXPECT_EQ(OperationResult::kSuccess, value3.result); + EXPECT_EQ(value4.data, u"value3"); + EXPECT_EQ(OperationResult::kSuccess, value4.result); + EXPECT_EQ(value5.data, u"value4"); + EXPECT_EQ(OperationResult::kSuccess, value5.result); +} + +} // namespace storage
diff --git a/components/services/storage/shared_storage/shared_storage_options.cc b/components/services/storage/shared_storage/shared_storage_options.cc index fcbb0343..06b4f00f 100644 --- a/components/services/storage/shared_storage/shared_storage_options.cc +++ b/components/services/storage/shared_storage/shared_storage_options.cc
@@ -27,7 +27,6 @@ blink::features::kMaxSharedStorageEntriesPerOrigin.Get(), blink::features::kMaxSharedStorageStringLength.Get(), blink::features::kMaxSharedStorageInitTries.Get(), - blink::features::kMaxSharedStorageConsecutiveOperationErrorsAllowed.Get(), blink::features::kSharedStorageStaleOriginPurgeInitialInterval.Get(), blink::features::kSharedStorageStaleOriginPurgeRecurringInterval.Get(), blink::features::kSharedStorageOriginStalenessThreshold.Get()); @@ -39,7 +38,6 @@ int max_entries_per_origin, int max_string_length, int max_init_tries, - int max_allowed_consecutive_errors, base::TimeDelta stale_origin_purge_initial_interval, base::TimeDelta stale_origin_purge_recurring_interval, base::TimeDelta origin_staleness_threshold) @@ -48,7 +46,6 @@ max_entries_per_origin(max_entries_per_origin), max_string_length(max_string_length), max_init_tries(max_init_tries), - max_allowed_consecutive_errors(max_allowed_consecutive_errors), stale_origin_purge_initial_interval(stale_origin_purge_initial_interval), stale_origin_purge_recurring_interval( stale_origin_purge_recurring_interval),
diff --git a/components/services/storage/shared_storage/shared_storage_options.h b/components/services/storage/shared_storage/shared_storage_options.h index 751662e..bfa12a9 100644 --- a/components/services/storage/shared_storage/shared_storage_options.h +++ b/components/services/storage/shared_storage/shared_storage_options.h
@@ -25,7 +25,6 @@ int max_entries_per_origin, int max_string_length, int max_init_tries, - int max_allowed_consecutive_errors, base::TimeDelta stale_origin_purge_initial_interval, base::TimeDelta stale_origin_purge_recurring_interval, base::TimeDelta origin_staleness_threshold); @@ -51,10 +50,6 @@ // initialize the SQL database. const int max_init_tries; - // Maximum number of consecutive operation errors allowed before the database - // is deleted and recreated. - const int max_allowed_consecutive_errors; - // The initial interval at which stale origins are purged. const base::TimeDelta stale_origin_purge_initial_interval;
diff --git a/components/services/storage/shared_storage/shared_storage_test_utils.cc b/components/services/storage/shared_storage/shared_storage_test_utils.cc index 2c13bbf..466713e 100644 --- a/components/services/storage/shared_storage/shared_storage_test_utils.cc +++ b/components/services/storage/shared_storage/shared_storage_test_utils.cc
@@ -27,7 +27,7 @@ : type(type) { DCHECK(type == Type::DB_IS_OPEN || type == Type::DB_STATUS || type == Type::DB_DESTROY || type == Type::DB_TRIM_MEMORY || - type == Type::DB_FETCH_ORIGINS); + type == Type::DB_FETCH_ORIGINS || type == Type::DB_PURGE_STALE); } TestDatabaseOperationReceiver::DBOperation::DBOperation(Type type, @@ -50,7 +50,8 @@ Type type, std::vector<std::u16string> params) : type(type), params(std::move(params)) { - DCHECK(type == Type::DB_PURGE_MATCHING || type == Type::DB_PURGE_STALE); + DCHECK(type == Type::DB_ON_MEMORY_PRESSURE || + type == Type::DB_PURGE_MATCHING || type == Type::DB_PURGE_STALE); } TestDatabaseOperationReceiver::DBOperation::~DBOperation() = default; @@ -122,6 +123,12 @@ return base::NumberToString16(static_cast<int>(behavior)); } +// static +std::u16string TestDatabaseOperationReceiver::SerializeMemoryPressureLevel( + MemoryPressureLevel level) { + return base::NumberToString16(static_cast<int>(level)); +} + void TestDatabaseOperationReceiver::WaitForOperations() { finished_ = false; loop_.Run(); @@ -254,6 +261,23 @@ base::Unretained(this), current_operation); } +void TestDatabaseOperationReceiver::OnceClosureFromClosureBase( + const DBOperation& current_operation, + base::OnceClosure callback) { + if (ExpectationsMet(current_operation) && loop_.running()) + Finish(); + if (callback) + std::move(callback).Run(); +} + +base::OnceClosure TestDatabaseOperationReceiver::MakeOnceClosureFromClosure( + const DBOperation& current_operation, + base::OnceClosure callback) { + return base::BindOnce( + &TestDatabaseOperationReceiver::OnceClosureFromClosureBase, + base::Unretained(this), current_operation, std::move(callback)); +} + bool TestDatabaseOperationReceiver::ExpectationsMet( const DBOperation& current_operation) { EXPECT_FALSE(expected_operations_.empty());
diff --git a/components/services/storage/shared_storage/shared_storage_test_utils.h b/components/services/storage/shared_storage/shared_storage_test_utils.h index b518d06..761cfc1 100644 --- a/components/services/storage/shared_storage/shared_storage_test_utils.h +++ b/components/services/storage/shared_storage/shared_storage_test_utils.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/memory/memory_pressure_listener.h" #include "components/services/storage/public/mojom/storage_usage_info.mojom-forward.h" #include "components/services/storage/shared_storage/shared_storage_database.h" #include "url/origin.h" @@ -29,6 +30,14 @@ using SetBehavior = SharedStorageDatabase::SetBehavior; using OperationResult = SharedStorageDatabase::OperationResult; using GetResult = SharedStorageDatabase::GetResult; +using MemoryPressureLevel = base::MemoryPressureListener::MemoryPressureLevel; + +// For categorizing test databases. +enum class SharedStorageTestDBType { + kInMemory = 0, + kFileBackedFromNew = 1, + kFileBackedFromExisting = 2, +}; // Helper class for testing async operations, accessible here for unit tests // of both `AsyncSharedStorageDatabase` and `SharedStorageManager`. @@ -38,19 +47,20 @@ enum class Type { DB_DESTROY = 0, DB_TRIM_MEMORY = 1, - DB_GET = 2, - DB_SET = 3, - DB_APPEND = 4, - DB_DELETE = 5, - DB_CLEAR = 6, - DB_LENGTH = 7, - DB_KEY = 8, - DB_PURGE_MATCHING = 9, - DB_PURGE_STALE = 10, - DB_FETCH_ORIGINS = 11, - DB_IS_OPEN = 12, - DB_STATUS = 13, - DB_OVERRIDE_TIME = 14, + DB_ON_MEMORY_PRESSURE = 2, + DB_GET = 3, + DB_SET = 4, + DB_APPEND = 5, + DB_DELETE = 6, + DB_CLEAR = 7, + DB_LENGTH = 8, + DB_KEY = 9, + DB_PURGE_MATCHING = 10, + DB_PURGE_STALE = 11, + DB_FETCH_ORIGINS = 12, + DB_IS_OPEN = 13, + DB_STATUS = 14, + DB_OVERRIDE_TIME = 15, } type; url::Origin origin; std::vector<std::u16string> params; @@ -77,6 +87,7 @@ static std::u16string SerializeTimeDelta(base::TimeDelta delta); static std::u16string SerializeBool(bool b); static std::u16string SerializeSetBehavior(SetBehavior behavior); + static std::u16string SerializeMemoryPressureLevel(MemoryPressureLevel level); bool is_finished() const { return finished_; } @@ -131,6 +142,12 @@ void OnceClosureBase(const DBOperation& current_operation); base::OnceClosure MakeOnceClosure(const DBOperation& current_operation); + void OnceClosureFromClosureBase(const DBOperation& current_operation, + base::OnceClosure callback); + base::OnceClosure MakeOnceClosureFromClosure( + const DBOperation& current_operation, + base::OnceClosure callback); + private: bool ExpectationsMet(const DBOperation& current_operation); void Finish();
diff --git a/components/services/storage/storage_service_impl.cc b/components/services/storage/storage_service_impl.cc index d848fb3..2abf1154 100644 --- a/components/services/storage/storage_service_impl.cc +++ b/components/services/storage/storage_service_impl.cc
@@ -5,7 +5,6 @@ #include "components/services/storage/storage_service_impl.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "build/build_config.h" #include "components/services/storage/dom_storage/storage_area_impl.h"
diff --git a/components/services/unzip/in_process_unzipper.cc b/components/services/unzip/in_process_unzipper.cc index 87ef2402..605f7e8 100644 --- a/components/services/unzip/in_process_unzipper.cc +++ b/components/services/unzip/in_process_unzipper.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/services/unzip/unzipper_impl.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h"
diff --git a/components/services/unzip/public/cpp/unzip.cc b/components/services/unzip/public/cpp/unzip.cc index 817c624..aa2e09e 100644 --- a/components/services/unzip/public/cpp/unzip.cc +++ b/components/services/unzip/public/cpp/unzip.cc
@@ -17,7 +17,6 @@ #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/sessions/core/command_storage_backend_unittest.cc b/components/sessions/core/command_storage_backend_unittest.cc index f3a13d6b..c083a5f 100644 --- a/components/sessions/core/command_storage_backend_unittest.cc +++ b/components/sessions/core/command_storage_backend_unittest.cc
@@ -19,6 +19,7 @@ #include "base/strings/string_util.h" #include "base/test/bind.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/sessions/core/command_storage_manager.h" #include "components/sessions/core/session_constants.h" #include "components/sessions/core/session_service_commands.h"
diff --git a/components/sessions/core/command_storage_manager.cc b/components/sessions/core/command_storage_manager.cc index 0bf4bef1..0eadffe0 100644 --- a/components/sessions/core/command_storage_manager.cc +++ b/components/sessions/core/command_storage_manager.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/signin/core/browser/about_signin_internals.h b/components/signin/core/browser/about_signin_internals.h index 7bfaed3..a846081 100644 --- a/components/signin/core/browser/about_signin_internals.h +++ b/components/signin/core/browser/about_signin_internals.h
@@ -14,6 +14,7 @@ #include "base/memory/raw_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/values.h" #include "components/content_settings/core/browser/content_settings_observer.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/components/signin/core/browser/account_investigator.h b/components/signin/core/browser/account_investigator.h index a204b96..32b1047 100644 --- a/components/signin/core/browser/account_investigator.h +++ b/components/signin/core/browser/account_investigator.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/keyed_service/core/keyed_service.h" #include "components/signin/public/identity_manager/identity_manager.h"
diff --git a/components/signin/core/browser/account_investigator_unittest.cc b/components/signin/core/browser/account_investigator_unittest.cc index a43cd77d..9316182 100644 --- a/components/signin/core/browser/account_investigator_unittest.cc +++ b/components/signin/core/browser/account_investigator_unittest.cc
@@ -9,6 +9,7 @@ #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/prefs/pref_registry_simple.h" #include "components/signin/public/base/signin_metrics.h"
diff --git a/components/signin/internal/identity_manager/account_tracker_service.cc b/components/signin/internal/identity_manager/account_tracker_service.cc index 3aaedd8..49a1dba 100644 --- a/components/signin/internal/identity_manager/account_tracker_service.cc +++ b/components/signin/internal/identity_manager/account_tracker_service.cc
@@ -21,7 +21,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/components/signin/internal/identity_manager/gaia_cookie_manager_service.h b/components/signin/internal/identity_manager/gaia_cookie_manager_service.h index 44369e12..53e24012 100644 --- a/components/signin/internal/identity_manager/gaia_cookie_manager_service.h +++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service.h
@@ -15,6 +15,7 @@ #include "base/containers/circular_deque.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/prefs/pref_registry_simple.h" #include "components/signin/internal/identity_manager/profile_oauth2_token_service.h"
diff --git a/components/signin/public/identity_manager/diagnostics_provider_unittest.cc b/components/signin/public/identity_manager/diagnostics_provider_unittest.cc index 18537058..78aebaa 100644 --- a/components/signin/public/identity_manager/diagnostics_provider_unittest.cc +++ b/components/signin/public/identity_manager/diagnostics_provider_unittest.cc
@@ -6,6 +6,7 @@ #include "base/callback_helpers.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/signin/public/identity_manager/accounts_cookie_mutator.h" #include "components/signin/public/identity_manager/identity_test_environment.h" #include "components/signin/public/identity_manager/load_credentials_state.h"
diff --git a/components/site_engagement/content/site_engagement_score_unittest.cc b/components/site_engagement/content/site_engagement_score_unittest.cc index 95abd202..74e91647 100644 --- a/components/site_engagement/content/site_engagement_score_unittest.cc +++ b/components/site_engagement/content/site_engagement_score_unittest.cc
@@ -7,6 +7,7 @@ #include <utility> #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "components/site_engagement/core/mojom/site_engagement_details.mojom.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/site_isolation/site_isolation_policy_unittest.cc b/components/site_isolation/site_isolation_policy_unittest.cc index 808e57c8..c9cf70c4 100644 --- a/components/site_isolation/site_isolation_policy_unittest.cc +++ b/components/site_isolation/site_isolation_policy_unittest.cc
@@ -13,6 +13,7 @@ #include "base/test/mock_entropy_provider.h" #include "base/test/scoped_feature_list.h" #include "base/test/scoped_field_trial_list_resetter.h" +#include "base/time/time.h" #include "build/branding_buildflags.h" #include "build/build_config.h" #include "components/prefs/pref_registry_simple.h"
diff --git a/components/spellcheck/browser/spellcheck_platform_win.cc b/components/spellcheck/browser/spellcheck_platform_win.cc index a8656471..a30639f 100644 --- a/components/spellcheck/browser/spellcheck_platform_win.cc +++ b/components/spellcheck/browser/spellcheck_platform_win.cc
@@ -7,7 +7,6 @@ #include <string> #include "base/callback.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "components/spellcheck/browser/windows_spell_checker.h"
diff --git a/components/spellcheck/browser/windows_spell_checker.cc b/components/spellcheck/browser/windows_spell_checker.cc index b663083..6384e41 100644 --- a/components/spellcheck/browser/windows_spell_checker.cc +++ b/components/spellcheck/browser/windows_spell_checker.cc
@@ -22,7 +22,6 @@ #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner_thread_mode.h" #include "base/task/task_runner_util.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/spellcheck/browser/windows_spell_checker_unittest.cc b/components/spellcheck/browser/windows_spell_checker_unittest.cc index 34df4abf..bfdf981 100644 --- a/components/spellcheck/browser/windows_spell_checker_unittest.cc +++ b/components/spellcheck/browser/windows_spell_checker_unittest.cc
@@ -13,7 +13,6 @@ #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/scoped_feature_list.h"
diff --git a/components/sqlite_proto/key_value_data.h b/components/sqlite_proto/key_value_data.h index 5f2f006..25f0781 100644 --- a/components/sqlite_proto/key_value_data.h +++ b/components/sqlite_proto/key_value_data.h
@@ -18,6 +18,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/sqlite_proto/key_value_table.h" #include "components/sqlite_proto/table_manager.h"
diff --git a/components/sqlite_proto/key_value_data_unittest.cc b/components/sqlite_proto/key_value_data_unittest.cc index 79ff74e6..4f56161 100644 --- a/components/sqlite_proto/key_value_data_unittest.cc +++ b/components/sqlite_proto/key_value_data_unittest.cc
@@ -5,7 +5,6 @@ #include "components/sqlite_proto/key_value_data.h" #include "base/memory/scoped_refptr.h" -#include "base/task/post_task.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "components/sqlite_proto/table_manager.h"
diff --git a/components/sqlite_proto/proto_table_manager_unittest.cc b/components/sqlite_proto/proto_table_manager_unittest.cc index a3da93509..ab5b4bb7 100644 --- a/components/sqlite_proto/proto_table_manager_unittest.cc +++ b/components/sqlite_proto/proto_table_manager_unittest.cc
@@ -8,7 +8,6 @@ #include "base/memory/scoped_refptr.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "components/sqlite_proto/key_value_data.h"
diff --git a/components/storage_monitor/image_capture_device.mm b/components/storage_monitor/image_capture_device.mm index d66dd56a..412e640 100644 --- a/components/storage_monitor/image_capture_device.mm +++ b/components/storage_monitor/image_capture_device.mm
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/containers/adapters.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_thread.h"
diff --git a/components/storage_monitor/media_storage_util.cc b/components/storage_monitor/media_storage_util.cc index 12d1f6cf..5019be8 100644 --- a/components/storage_monitor/media_storage_util.cc +++ b/components/storage_monitor/media_storage_util.cc
@@ -12,7 +12,6 @@ #include "base/files/file_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/components/storage_monitor/media_storage_util_unittest.cc b/components/storage_monitor/media_storage_util_unittest.cc index 5a999394..02d779b 100644 --- a/components/storage_monitor/media_storage_util_unittest.cc +++ b/components/storage_monitor/media_storage_util_unittest.cc
@@ -11,7 +11,6 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/storage_monitor/media_storage_util.h" #include "components/storage_monitor/removable_device_constants.h"
diff --git a/components/storage_monitor/portable_device_watcher_win.cc b/components/storage_monitor/portable_device_watcher_win.cc index b61cbb8..a4fdec5 100644 --- a/components/storage_monitor/portable_device_watcher_win.cc +++ b/components/storage_monitor/portable_device_watcher_win.cc
@@ -19,7 +19,6 @@ #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/win/scoped_co_mem.h"
diff --git a/components/storage_monitor/storage_monitor_chromeos.cc b/components/storage_monitor/storage_monitor_chromeos.cc index 615917c..bc77b39 100644 --- a/components/storage_monitor/storage_monitor_chromeos.cc +++ b/components/storage_monitor/storage_monitor_chromeos.cc
@@ -16,7 +16,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner_util.h"
diff --git a/components/storage_monitor/storage_monitor_linux.cc b/components/storage_monitor/storage_monitor_linux.cc index 99c7998..2e9ea9cfb 100644 --- a/components/storage_monitor/storage_monitor_linux.cc +++ b/components/storage_monitor/storage_monitor_linux.cc
@@ -27,7 +27,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/components/storage_monitor/volume_mount_watcher_win.cc b/components/storage_monitor/volume_mount_watcher_win.cc index e95259d..9bd8f2b3 100644 --- a/components/storage_monitor/volume_mount_watcher_win.cc +++ b/components/storage_monitor/volume_mount_watcher_win.cc
@@ -25,7 +25,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/components/subresource_filter/content/browser/ads_intervention_manager.h b/components/subresource_filter/content/browser/ads_intervention_manager.h index dc657bb..69fbd70 100644 --- a/components/subresource_filter/content/browser/ads_intervention_manager.h +++ b/components/subresource_filter/content/browser/ads_intervention_manager.h
@@ -6,6 +6,7 @@ #define COMPONENTS_SUBRESOURCE_FILTER_CONTENT_BROWSER_ADS_INTERVENTION_MANAGER_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "components/subresource_filter/content/browser/subresource_filter_content_settings_manager.h" #include "components/subresource_filter/core/mojom/subresource_filter.mojom.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/components/subresource_filter/content/browser/ruleset_service.cc index 06e33d5..bb66d82 100644 --- a/components/subresource_filter/content/browser/ruleset_service.cc +++ b/components/subresource_filter/content/browser/ruleset_service.cc
@@ -15,7 +15,6 @@ #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle_unittest.cc b/components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle_unittest.cc index 8caa369f..36e52fbb 100644 --- a/components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle_unittest.cc +++ b/components/subresource_filter/content/browser/subresource_filter_safe_browsing_activation_throttle_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/test_mock_time_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/infobars/content/content_infobar_manager.h" #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/components/subresource_filter/content/browser/subresource_filter_test_harness.cc b/components/subresource_filter/content/browser/subresource_filter_test_harness.cc index 77b7f2e..0bda150 100644 --- a/components/subresource_filter/content/browser/subresource_filter_test_harness.cc +++ b/components/subresource_filter/content/browser/subresource_filter_test_harness.cc
@@ -7,7 +7,6 @@ #include "base/feature_list.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "components/content_settings/browser/page_specific_content_settings.h" #include "components/infobars/content/content_infobar_manager.h"
diff --git a/components/subresource_filter/core/browser/subresource_filter_features.h b/components/subresource_filter/core/browser/subresource_filter_features.h index 679f072..3a37d81 100644 --- a/components/subresource_filter/core/browser/subresource_filter_features.h +++ b/components/subresource_filter/core/browser/subresource_filter_features.h
@@ -13,6 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/metrics/field_trial_params.h" #include "base/strings/string_piece.h" +#include "base/time/time.h" #include "components/subresource_filter/core/common/activation_list.h" #include "components/subresource_filter/core/common/activation_scope.h" #include "components/subresource_filter/core/mojom/subresource_filter.mojom.h"
diff --git a/components/sync/driver/glue/sync_engine_backend.h b/components/sync/driver/glue/sync_engine_backend.h index 44965cd..183119e 100644 --- a/components/sync/driver/glue/sync_engine_backend.h +++ b/components/sync/driver/glue/sync_engine_backend.h
@@ -13,6 +13,7 @@ #include "base/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "components/invalidation/public/invalidation.h" #include "components/invalidation/public/invalidator_state.h" #include "components/invalidation/public/topic_invalidation_map.h"
diff --git a/components/sync/driver/sync_service_crypto.h b/components/sync/driver/sync_service_crypto.h index 59e214a..e27a6fca 100644 --- a/components/sync/driver/sync_service_crypto.h +++ b/components/sync/driver/sync_service_crypto.h
@@ -12,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/sync/base/model_type.h" #include "components/sync/driver/data_type_encryption_handler.h"
diff --git a/components/sync/driver/sync_session_durations_metrics_recorder.cc b/components/sync/driver/sync_session_durations_metrics_recorder.cc index 078dcd5e..e10511d 100644 --- a/components/sync/driver/sync_session_durations_metrics_recorder.cc +++ b/components/sync/driver/sync_session_durations_metrics_recorder.cc
@@ -7,6 +7,7 @@ #include <string> #include "base/metrics/histogram_functions.h" +#include "base/time/time.h" #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" #include "components/sync/engine/cycle/sync_cycle_snapshot.h"
diff --git a/components/sync/engine/get_updates_processor_unittest.cc b/components/sync/engine/get_updates_processor_unittest.cc index 325bd10..2a7fad19 100644 --- a/components/sync/engine/get_updates_processor_unittest.cc +++ b/components/sync/engine/get_updates_processor_unittest.cc
@@ -12,6 +12,7 @@ #include <utility> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "components/sync/base/model_type_test_util.h" #include "components/sync/engine/cycle/debug_info_getter.h" #include "components/sync/engine/cycle/mock_debug_info_getter.h"
diff --git a/components/sync/engine/loopback_server/loopback_server.cc b/components/sync/engine/loopback_server/loopback_server.cc index b155c303..f2070b7 100644 --- a/components/sync/engine/loopback_server/loopback_server.cc +++ b/components/sync/engine/loopback_server/loopback_server.cc
@@ -20,7 +20,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/sync/engine/model_type_worker_unittest.cc b/components/sync/engine/model_type_worker_unittest.cc index d6ab9201..7383cf6 100644 --- a/components/sync/engine/model_type_worker_unittest.cc +++ b/components/sync/engine/model_type_worker_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "components/sync/base/client_tag_hash.h" #include "components/sync/base/features.h" #include "components/sync/base/unique_position.h"
diff --git a/components/sync/engine/net/http_bridge.cc b/components/sync/engine/net/http_bridge.cc index a7b5426..c22d5be5 100644 --- a/components/sync/engine/net/http_bridge.cc +++ b/components/sync/engine/net/http_bridge.cc
@@ -14,7 +14,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "components/variations/net/variations_http_headers.h"
diff --git a/components/sync/engine/net/http_bridge.h b/components/sync/engine/net/http_bridge.h index 16f20858..9686508 100644 --- a/components/sync/engine/net/http_bridge.h +++ b/components/sync/engine/net/http_bridge.h
@@ -16,6 +16,7 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/sync/engine/net/http_post_provider.h" #include "components/sync/engine/net/http_post_provider_factory.h"
diff --git a/components/sync/engine/net/http_bridge_unittest.cc b/components/sync/engine/net/http_bridge_unittest.cc index c315731..27e2601b 100644 --- a/components/sync/engine/net/http_bridge_unittest.cc +++ b/components/sync/engine/net/http_bridge_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/sync/engine/cancelation_signal.h" #include "components/variations/scoped_variations_ids_provider.h"
diff --git a/components/sync/engine/nigori/nigori_unittest.cc b/components/sync/engine/nigori/nigori_unittest.cc index bf40eef..21e6b39 100644 --- a/components/sync/engine/nigori/nigori_unittest.cc +++ b/components/sync/engine/nigori/nigori_unittest.cc
@@ -10,6 +10,7 @@ #include "base/strings/string_util.h" #include "base/test/metrics/histogram_tester.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "components/sync/engine/nigori/key_derivation_params.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/sync/engine/sync_manager.h b/components/sync/engine/sync_manager.h index 941b5ec..294de572 100644 --- a/components/sync/engine/sync_manager.h +++ b/components/sync/engine/sync_manager.h
@@ -17,6 +17,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/task_runner.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "components/sync/base/model_type.h" #include "components/sync/base/sync_invalidation.h" #include "components/sync/base/weak_handle.h"
diff --git a/components/sync/engine/sync_scheduler_impl_unittest.cc b/components/sync/engine/sync_scheduler_impl_unittest.cc index ed160af..9b80eb2 100644 --- a/components/sync/engine/sync_scheduler_impl_unittest.cc +++ b/components/sync/engine/sync_scheduler_impl_unittest.cc
@@ -20,6 +20,7 @@ #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "components/sync/base/extensions_activity.h" #include "components/sync/base/features.h" #include "components/sync/base/model_type_test_util.h"
diff --git a/components/sync/model/model_type_store_service_impl.cc b/components/sync/model/model_type_store_service_impl.cc index 827334ee..02ca08a 100644 --- a/components/sync/model/model_type_store_service_impl.cc +++ b/components/sync/model/model_type_store_service_impl.cc
@@ -12,7 +12,6 @@ #include "base/feature_list.h" #include "base/logging.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/sync/model/processor_entity_unittest.cc b/components/sync/model/processor_entity_unittest.cc index 388d5d4..78091ff 100644 --- a/components/sync/model/processor_entity_unittest.cc +++ b/components/sync/model/processor_entity_unittest.cc
@@ -8,6 +8,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "components/sync/base/client_tag_hash.h" #include "components/sync/base/features.h" #include "components/sync/base/model_type.h"
diff --git a/components/sync_device_info/device_info_util_unittest.cc b/components/sync_device_info/device_info_util_unittest.cc index 6ae6c7f..8f4c105 100644 --- a/components/sync_device_info/device_info_util_unittest.cc +++ b/components/sync_device_info/device_info_util_unittest.cc
@@ -4,6 +4,7 @@ #include "components/sync_device_info/device_info_util.h" +#include "base/time/time.h" #include "components/sync/protocol/device_info_specifics.pb.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/sync_device_info/local_device_info_util.cc b/components/sync_device_info/local_device_info_util.cc index 38eabb5..8da7db4a 100644 --- a/components/sync_device_info/local_device_info_util.cc +++ b/components/sync_device_info/local_device_info_util.cc
@@ -10,7 +10,6 @@ #include "base/location.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "build/build_config.h"
diff --git a/components/sync_sessions/sessions_global_id_mapper_unittest.cc b/components/sync_sessions/sessions_global_id_mapper_unittest.cc index 83eb5e4..9aabe95e 100644 --- a/components/sync_sessions/sessions_global_id_mapper_unittest.cc +++ b/components/sync_sessions/sessions_global_id_mapper_unittest.cc
@@ -5,6 +5,7 @@ #include "components/sync_sessions/sessions_global_id_mapper.h" #include "base/test/mock_callback.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/tracing/test/trace_event_perftest.cc b/components/tracing/test/trace_event_perftest.cc index 825c557..bfa409b 100644 --- a/components/tracing/test/trace_event_perftest.cc +++ b/components/tracing/test/trace_event_perftest.cc
@@ -12,6 +12,7 @@ #include "base/task/common/task_annotator.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/trace_event/task_execution_macros.h" #include "base/trace_event/trace_event.h" #include "base/trace_event/traced_value.h"
diff --git a/components/translate/content/browser/content_translate_driver.h b/components/translate/content/browser/content_translate_driver.h index c6dc08c..595a5b4 100644 --- a/components/translate/content/browser/content_translate_driver.h +++ b/components/translate/content/browser/content_translate_driver.h
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "components/translate/content/common/translate.mojom.h" #include "components/translate/core/browser/translate_driver.h" #include "components/translate/core/common/translate_errors.h"
diff --git a/components/translate/content/browser/per_frame_content_translate_driver.h b/components/translate/content/browser/per_frame_content_translate_driver.h index 992deac..993cbc2 100644 --- a/components/translate/content/browser/per_frame_content_translate_driver.h +++ b/components/translate/content/browser/per_frame_content_translate_driver.h
@@ -9,6 +9,7 @@ #include <string> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/services/language_detection/public/cpp/language_detection_service.h" #include "components/translate/content/browser/content_translate_driver.h" #include "components/translate/content/common/translate.mojom.h"
diff --git a/components/translate/core/browser/translate_metrics_logger_impl_unittest.cc b/components/translate/core/browser/translate_metrics_logger_impl_unittest.cc index 004b99e..04c1ca2 100644 --- a/components/translate/core/browser/translate_metrics_logger_impl_unittest.cc +++ b/components/translate/core/browser/translate_metrics_logger_impl_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/language/core/browser/language_prefs.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "components/ukm/test_ukm_recorder.h"
diff --git a/components/translate/core/browser/translate_model_service.cc b/components/translate/core/browser/translate_model_service.cc index b3c68fb..3cae9ca 100644 --- a/components/translate/core/browser/translate_model_service.cc +++ b/components/translate/core/browser/translate_model_service.cc
@@ -9,7 +9,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "components/optimization_guide/core/optimization_guide_model_provider.h" #include "components/optimization_guide/proto/models.pb.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/components/translate/core/browser/translate_prefs_unittest.cc b/components/translate/core/browser/translate_prefs_unittest.cc index 65edd900..b3386204 100644 --- a/components/translate/core/browser/translate_prefs_unittest.cc +++ b/components/translate/core/browser/translate_prefs_unittest.cc
@@ -15,6 +15,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/components/translate/core/browser/translate_ranker_impl_unittest.cc b/components/translate/core/browser/translate_ranker_impl_unittest.cc index 024ed4e..2c4f6f4 100644 --- a/components/translate/core/browser/translate_ranker_impl_unittest.cc +++ b/components/translate/core/browser/translate_ranker_impl_unittest.cc
@@ -11,7 +11,6 @@ #include "base/feature_list.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "components/assist_ranker/proto/ranker_model.pb.h"
diff --git a/components/translate/core/common/translate_metrics_unittest.cc b/components/translate/core/common/translate_metrics_unittest.cc index d5cb2d9..5ffaa5a0 100644 --- a/components/translate/core/common/translate_metrics_unittest.cc +++ b/components/translate/core/common/translate_metrics_unittest.cc
@@ -10,6 +10,7 @@ #include "base/metrics/histogram_samples.h" #include "base/metrics/metrics_hashes.h" #include "base/metrics/statistics_recorder.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h"
diff --git a/components/ui_devtools/agent_util.cc b/components/ui_devtools/agent_util.cc index fc4c83da..c48e7bf 100644 --- a/components/ui_devtools/agent_util.cc +++ b/components/ui_devtools/agent_util.cc
@@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/components/ukm/test_ukm_recorder.cc b/components/ukm/test_ukm_recorder.cc index 6d245988b..3442278 100644 --- a/components/ukm/test_ukm_recorder.cc +++ b/components/ukm/test_ukm_recorder.cc
@@ -9,7 +9,6 @@ #include "base/check_op.h" #include "base/metrics/metrics_hashes.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "services/metrics/public/cpp/delegating_ukm_recorder.h" #include "services/metrics/public/cpp/ukm_builders.h"
diff --git a/components/ukm/ukm_recorder_impl.cc b/components/ukm/ukm_recorder_impl.cc index 997d29c9..b27ac5d 100644 --- a/components/ukm/ukm_recorder_impl.cc +++ b/components/ukm/ukm_recorder_impl.cc
@@ -21,6 +21,7 @@ #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/time/time.h" #include "components/ukm/scheme_constants.h" #include "components/ukm/ukm_recorder_observer.h" #include "components/variations/variations_associated_data.h"
diff --git a/components/ukm/ukm_service.h b/components/ukm/ukm_service.h index 24a2b2f..313bfce 100644 --- a/components/ukm/ukm_service.h +++ b/components/ukm/ukm_service.h
@@ -13,6 +13,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/metrics/delegating_provider.h" #include "components/metrics/metrics_provider.h"
diff --git a/components/update_client/component.cc b/components/update_client/component.cc index 8e20783..80df1e48 100644 --- a/components/update_client/component.cc +++ b/components/update_client/component.cc
@@ -19,7 +19,6 @@ #include "base/logging.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/values.h"
diff --git a/components/update_client/component_patcher_operation.cc b/components/update_client/component_patcher_operation.cc index 29f5c9a..e1c3de0e 100644 --- a/components/update_client/component_patcher_operation.cc +++ b/components/update_client/component_patcher_operation.cc
@@ -14,7 +14,6 @@ #include "base/location.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/update_client/patcher.h" #include "components/update_client/update_client.h"
diff --git a/components/update_client/component_unpacker_unittest.cc b/components/update_client/component_unpacker_unittest.cc index d3dddaf0..be21ece1 100644 --- a/components/update_client/component_unpacker_unittest.cc +++ b/components/update_client/component_unpacker_unittest.cc
@@ -14,7 +14,6 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/update_client/test_installer.cc b/components/update_client/test_installer.cc index 4a2db7b..dbb213c 100644 --- a/components/update_client/test_installer.cc +++ b/components/update_client/test_installer.cc
@@ -12,7 +12,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/components/update_client/update_checker.cc b/components/update_client/update_checker.cc index f5c95b0..1bf10c8 100644 --- a/components/update_client/update_checker.cc +++ b/components/update_client/update_checker.cc
@@ -19,7 +19,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_checker.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/update_client/update_checker_unittest.cc b/components/update_client/update_checker_unittest.cc index de549312..a06b927 100644 --- a/components/update_client/update_checker_unittest.cc +++ b/components/update_client/update_checker_unittest.cc
@@ -18,7 +18,6 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/update_client/update_client_unittest.cc b/components/update_client/update_client_unittest.cc index ba8405c..edcd0e6 100644 --- a/components/update_client/update_client_unittest.cc +++ b/components/update_client/update_client_unittest.cc
@@ -14,7 +14,6 @@ #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/test/scoped_path_override.h"
diff --git a/components/upload_list/text_log_upload_list.cc b/components/upload_list/text_log_upload_list.cc index 823b956..becec6b 100644 --- a/components/upload_list/text_log_upload_list.cc +++ b/components/upload_list/text_log_upload_list.cc
@@ -13,6 +13,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace {
diff --git a/components/url_formatter/spoof_checks/idn_spoof_checker_unittest.cc b/components/url_formatter/spoof_checks/idn_spoof_checker_unittest.cc index 92cd3c6..ae6cd08 100644 --- a/components/url_formatter/spoof_checks/idn_spoof_checker_unittest.cc +++ b/components/url_formatter/spoof_checks/idn_spoof_checker_unittest.cc
@@ -1328,63 +1328,80 @@ TEST(IDNSpoofCheckerNoFixtureTest, MultipleSkeletons) { IDNSpoofChecker checker; // apple with U+04CF (ӏ) - const GURL url("http://appӏe.com"); - const url_formatter::IDNConversionResult result = - UnsafeIDNToUnicodeWithDetails(url.host()); - Skeletons skeletons = checker.GetSkeletons(result.result); - EXPECT_EQ(Skeletons({"apple.corn", "appie.corn"}), skeletons); + const GURL url1("http://appӏe.com"); + const url_formatter::IDNConversionResult result1 = + UnsafeIDNToUnicodeWithDetails(url1.host()); + Skeletons skeletons1 = checker.GetSkeletons(result1.result); + EXPECT_EQ(Skeletons({"apple.corn", "appie.corn"}), skeletons1); + + const GURL url2("http://œxamþle.com"); + const url_formatter::IDNConversionResult result2 = + UnsafeIDNToUnicodeWithDetails(url2.host()); + Skeletons skeletons2 = checker.GetSkeletons(result2.result); + // This skeleton set doesn't include strings with "œ" because it gets + // converted to "oe" by ICU during skeleton extraction. + EXPECT_EQ(Skeletons({"oexarnþle.corn", "oexarnple.corn", "oexarnble.corn", + "cexarnþle.corn", "cexarnple.corn", "cexarnble.corn"}), + skeletons2); } TEST(IDNSpoofCheckerNoFixtureTest, AlternativeSkeletons) { struct TestCase { - // Skeleton whose alternative skeletons will be generated - std::string skeleton; - // Maximum number of skeletons to generate. - size_t max_skeletons; - // Expected skeleton set. - Skeletons expected_skeletons; - } kTestCases[] = {{"", 0, {}}, - {"", 1, {}}, - {"", 2, {}}, - {"", 100, {}}, + // String whose alternative strings will be generated + std::u16string input; + // Maximum number of alternative strings to generate. + size_t max_alternatives; + // Expected string set. + base::flat_set<std::u16string> expected_strings; + } kTestCases[] = { + {u"", 0, {}}, + {u"", 1, {}}, + {u"", 2, {}}, + {u"", 100, {}}, - {"a", 0, {}}, - {"a", 1, {"a"}}, - {"a", 2, {"a"}}, - {"a", 100, {"a"}}, + {u"a", 0, {}}, + {u"a", 1, {u"a"}}, + {u"a", 2, {u"a"}}, + {u"a", 100, {u"a"}}, - {"ab", 0, {}}, - {"ab", 1, {"ab"}}, - {"ab", 2, {"ab"}}, - {"ab", 100, {"ab"}}, + {u"ab", 0, {}}, + {u"ab", 1, {u"ab"}}, + {u"ab", 2, {u"ab"}}, + {u"ab", 100, {u"ab"}}, - {"œ", 0, {}}, - {"œ", 1, {"œ"}}, - {"œ", 2, {"œ", "ce"}}, - {"œ", 100, {"œ", "ce", "oe"}}, + {u"œ", 0, {}}, + {u"œ", 1, {u"œ"}}, + {u"œ", 2, {u"œ", u"ce"}}, + {u"œ", 100, {u"œ", u"ce", u"oe"}}, - {"œxample", 0, {}}, - {"œxample", 1, {"œxample"}}, - {"œxample", 2, {"œxample", "cexample"}}, - {"œxample", 100, {"œxample", "cexample", "oexample"}}, + {u"œxample", 0, {}}, + {u"œxample", 1, {u"œxample"}}, + {u"œxample", 2, {u"œxample", u"cexample"}}, + {u"œxample", 100, {u"œxample", u"cexample", u"oexample"}}, - {"œxamþle", 0, {}}, - {"œxamþle", 1, {"œxamþle"}}, - {"œxamþle", 2, {"œxamþle", "œxamble"}}, - {"œxamþle", - 100, - {"œxamþle", "œxample", "œxamble", "oexamþle", "oexample", - "oexamble", "cexamþle", "cexample", "cexamble"}}}; - // IDNSpoofChecker checker; + {u"œxamþle", 0, {}}, + {u"œxamþle", 1, {u"œxamþle"}}, + {u"œxamþle", 2, {u"œxamþle", u"œxamble"}}, + {u"œxamþle", + 100, + {u"œxamþle", u"œxample", u"œxamble", u"oexamþle", u"oexample", + u"oexamble", u"cexamþle", u"cexample", u"cexamble"}}, + + // Strings with many multi-character skeletons shouldn't generate any + // supplemental hostnames. + {u"œœœœœœœœœœœœœœœœœœœœœœœœœœœœœœ", 0, {}}, + {u"œœœœœœœœœœœœœœœœœœœœœœœœœœœœœœ", 1, {}}, + {u"œœœœœœœœœœœœœœœœœœœœœœœœœœœœœœ", 2, {}}, + {u"œœœœœœœœœœœœœœœœœœœœœœœœœœœœœœ", 100, {}}}; SkeletonMap skeleton_map; skeleton_map[u'œ'] = {"ce", "oe"}; skeleton_map[u'þ'] = {"b", "p"}; for (const TestCase& test_case : kTestCases) { - Skeletons skeletons = SkeletonGenerator::GenerateSupplementalSkeletons( - test_case.skeleton, test_case.max_skeletons, skeleton_map); - EXPECT_LE(skeletons.size(), test_case.max_skeletons); - EXPECT_EQ(skeletons, test_case.expected_skeletons); + const auto strings = SkeletonGenerator::GenerateSupplementalHostnames( + test_case.input, test_case.max_alternatives, skeleton_map); + EXPECT_LE(strings.size(), test_case.max_alternatives); + EXPECT_EQ(strings, test_case.expected_strings); } }
diff --git a/components/url_formatter/spoof_checks/skeleton_generator.cc b/components/url_formatter/spoof_checks/skeleton_generator.cc index df026d6..2dfed8e 100644 --- a/components/url_formatter/spoof_checks/skeleton_generator.cc +++ b/components/url_formatter/spoof_checks/skeleton_generator.cc
@@ -7,6 +7,7 @@ #include <ostream> #include <queue> + #include "base/i18n/unicodestring.h" #include "base/memory/ptr_util.h" #include "base/strings/string_piece.h" @@ -20,7 +21,26 @@ using QueueItem = std::vector<std::u16string>; -} +// Maximum number of supplemental hostname to generate for a given input. +// If this number is too high, we may end up DOSing the browser process. +// If it's too low, we may not be able to cover some lookalike URLs. +const size_t kMaxSupplementalHostnames = 128; + +// Maximum number of characters with multiple skeletons in a hostname (i.e. +// interesting characters). The number of interesting characters directly affect +// how many supplemental hostnames are generated. Assuming an interesting +// character has 3 skeletons (1 original skeleton, 2 supplemental skeletons), +// this will generate pow(3, kMaxCharactersWithMultipleSkeletons) supplemental +// hostnames, so we cap it. +// If a hostname has too many interesting characters, it's unlikely to be a +// convincing spoof. +const size_t kMaxCharactersWithMultipleSkeletons = 5; + +// Limit the number of maximum supplemental skeletons for a given character to a +// reasonable number. This can be adjusted in the future as needed. +const size_t kMaxSupplementalSkeletonsPerCharacter = 3; + +} // namespace SkeletonGenerator::SkeletonGenerator(const USpoofChecker* checker) : checker_(checker) { @@ -61,7 +81,6 @@ // - {U+0138 (ĸ), U+03BA (κ), U+043A (к), U+049B (қ), U+049D (ҝ), // U+049F (ҟ), U+04A1(ҡ), U+04C4 (ӄ), U+051F (ԟ)} => k // - {U+014B (ŋ), U+043F (п), U+0525 (ԥ), U+0E01 (ก), U+05D7 (ח)} => n - // - U+0153 (œ) => "ce" // TODO(crbug/843352): Handle multiple skeletons for U+0525 and U+0153. // - {U+0167 (ŧ), U+0442 (т), U+04AD (ҭ), U+050F (ԏ), U+4E03 (七), // U+4E05 (丅), U+4E06 (丆), U+4E01 (丁)} => t @@ -101,7 +120,7 @@ UNICODE_STRING_SIMPLE("ExtraConf"), icu::UnicodeString::fromUTF8( "[æӕ] > ae; [ϼҏ] > p; [ħнћңҥӈӊԋԧԩ] > h;" - "[ĸκкқҝҟҡӄԟ] > k; [ŋпԥกח] > n; œ > ce;" + "[ĸκкқҝҟҡӄԟ] > k; [ŋпԥกח] > n;" "[ŧтҭԏ七丅丆丁] > t; [ƅьҍв] > b; [ωшщพฟພຟ] > w;" "[мӎ] > m; [єҽҿၔ] > e; ґ > r; [ғӻ] > f;" "[ҫင] > c; [ұ丫] > y; [χҳӽӿ乂] > x;" @@ -121,6 +140,10 @@ DCHECK(U_SUCCESS(status)) << "Skeleton generator initialization failed due to an error: " << u_errorName(status); + + // Characters that look like multiple characters. + character_map_[u'þ'] = {"b", "p"}; + character_map_[u'œ'] = {"ce", "oe"}; } SkeletonGenerator::~SkeletonGenerator() = default; @@ -141,25 +164,34 @@ return base::i18n::UnicodeStringToString16(host); } -Skeletons SkeletonGenerator::GetSkeletons(base::StringPiece16 hostname) { +Skeletons SkeletonGenerator::GetSkeletons(base::StringPiece16 input_hostname) { + std::u16string hostname_no_diacritics = MaybeRemoveDiacritics(input_hostname); + + // Generate alternative versions of the input hostname and extract skeletons. Skeletons skeletons; - size_t hostname_length = hostname.length() - (hostname.back() == '.' ? 1 : 0); - icu::UnicodeString host(false, hostname.data(), hostname_length); - MaybeRemoveDiacritics(host); - extra_confusable_mapper_->transliterate(host); + for (const std::u16string& hostname : GenerateSupplementalHostnames( + hostname_no_diacritics, kMaxSupplementalHostnames, character_map_)) { + size_t hostname_length = + hostname.length() - (hostname.back() == '.' ? 1 : 0); + icu::UnicodeString hostname_unicode(false, hostname.data(), + hostname_length); + extra_confusable_mapper_->transliterate(hostname_unicode); - UErrorCode status = U_ZERO_ERROR; - icu::UnicodeString ustr_skeleton; + UErrorCode status = U_ZERO_ERROR; + icu::UnicodeString ustr_skeleton; - // Map U+04CF (ӏ) to lowercase L in addition to what uspoof_getSkeleton does - // (mapping it to lowercase I). - AddSkeletonMapping(host, 0x4CF /* ӏ */, 0x6C /* lowercase L */, &skeletons); + // Map U+04CF (ӏ) to lowercase L in addition to what uspoof_getSkeleton does + // (mapping it to lowercase I). + AddSkeletonMapping(hostname_unicode, 0x4CF /* ӏ */, 0x6C /* lowercase L */, + &skeletons); - uspoof_getSkeletonUnicodeString(checker_, 0, host, ustr_skeleton, &status); - if (U_SUCCESS(status)) { - std::string skeleton; - ustr_skeleton.toUTF8String(skeleton); - skeletons.insert(skeleton); + uspoof_getSkeletonUnicodeString(checker_, 0, hostname_unicode, + ustr_skeleton, &status); + if (U_SUCCESS(status)) { + std::string skeleton; + ustr_skeleton.toUTF8String(skeleton); + skeletons.insert(skeleton); + } } return skeletons; } @@ -197,18 +229,35 @@ } // static -Skeletons SkeletonGenerator::GenerateSupplementalSkeletons( - base::StringPiece input, +base::flat_set<std::u16string> SkeletonGenerator::GenerateSupplementalHostnames( + base::StringPiece16 input, size_t max_alternatives, const SkeletonMap& mapping) { + base::flat_set<std::u16string> output; if (!input.size() || max_alternatives == 0) { - return Skeletons(); + return output; } - icu::UnicodeString input_unicode = icu::UnicodeString::fromUTF8(input); + icu::UnicodeString input_unicode = + icu::UnicodeString::fromUTF8(base::UTF16ToUTF8(input)); // Read only buffer, doesn't need to be released. const char16_t* input_buffer = input_unicode.getBuffer(); + const size_t input_length = static_cast<size_t>(input_unicode.length()); - Skeletons output; + // Count the characters that have multiple skeletons. If this number is high, + // bail out early to avoid running the skeleton generation for too long. + size_t characters_with_multiple_skeletons = 0; + for (size_t i = 0; i < input_length; i++) { + char16_t c = input_buffer[i]; + const auto it = mapping.find(c); + if (it != mapping.end()) { + characters_with_multiple_skeletons++; + } + } + if (characters_with_multiple_skeletons > + kMaxCharactersWithMultipleSkeletons) { + return output; + } + // This queue contains vectors of skeleton strings. For each character in // the input string, its skeleton string will be appended to the queue item. // Thus, the number of skeleton strings in the queue item will always @@ -220,10 +269,10 @@ QueueItem current = q.front(); q.pop(); - if (current.size() == static_cast<size_t>(input_unicode.length())) { + if (current.size() == input_length) { // Reached the end of the original string. We now generated a complete // alternative string. Add the result to output. - output.insert(base::UTF16ToUTF8(base::JoinString(current, u""))); + output.insert(base::JoinString(current, u"")); if (output.size() == max_alternatives) { break; } @@ -241,6 +290,7 @@ // to the string generated so far. const auto it = mapping.find(c); if (it != mapping.end()) { + DCHECK_LE(it->second.size(), kMaxSupplementalSkeletonsPerCharacter); for (auto alternative : it->second) { QueueItem new_item2 = current; new_item2.push_back(base::UTF8ToUTF16(alternative));
diff --git a/components/url_formatter/spoof_checks/skeleton_generator.h b/components/url_formatter/spoof_checks/skeleton_generator.h index 401c6ff3..114371a 100644 --- a/components/url_formatter/spoof_checks/skeleton_generator.h +++ b/components/url_formatter/spoof_checks/skeleton_generator.h
@@ -37,18 +37,26 @@ // 1. The hostname is "normalized" by removing its diacritics. This is done so // that more confusable hostnames can be detected than would be using the // plain ICU API. -// 2. Certain characters in the normalized hostname are mapped to their -// confusable equivalents using a manually curated table (extra confusable -// mapper). This table has a many-to-one relationship between characters and -// their skeletons. For example, the characters є, ҽ, ҿ, and ၔ are all +// 2. Supplemental hostname strings are generated from the normalized hostname +// using a manually curated "multiple skeleton" table. This table has a +// one-to-many relationship between characters and their skeletons. The +// number of skeletons generated by this step is capped to a maximum number. +// This step is done before ICU's skeleton generation (which is many-to-one) +// so that we can generate more supplemental hostnames. For example, ICU +// maps "œ" to "oe". Since the character "œ" won't appear in the ICU +// skeleton, we can't produce supplemental skeletons for it. Therefore, we +// must map it to "oe" and "ce" before skeleton generation. +// 3. For each supplemental hostname, the following steps are performed: +// 4. Certain characters in the hostname are mapped to their confusable +// equivalents using a manually curated table (extra confusible mapper). This +// table has a many-to-one relationship between characters and their +// skeletons. For example, the characters є, ҽ, ҿ, and ၔ are all // mapped to Latin lowercase e. -// 3. The hostname is passed to ICU to generate actual skeleton strings. -// 3. If the character U+04CF (ӏ) is present in the skeleton, another skeleton +// 5. The hostname is passed to ICU to generate actual skeleton strings. +// 6. If the character U+04CF (ӏ) is present in the skeleton, another skeleton // is generated by mapping it to lowercase L (U+6C). -// 4. Finally, alternative skeletons are generated from the skeleton set using -// a manually curated "multiple skeleton" table. This table has a one-to-many -// relationship between characters and their skeletons. The number of -// skeletons generated by this step is capped to a maximum number. +// 7. The final output is a Skeletons instance which contains one or more +// skeleton strings that represent the input hostname. class SkeletonGenerator { public: explicit SkeletonGenerator(const USpoofChecker* checker); @@ -68,11 +76,12 @@ std::u16string MaybeRemoveDiacritics(base::StringPiece16 hostname); // Returns the set of alternative strings using the one-to-many string - // mapping. Generates at most `max_alternatives` strings from the input - // string. - static Skeletons GenerateSupplementalSkeletons(base::StringPiece skeleton, - size_t max_alternatives, - const SkeletonMap& mapping); + // mapping provided in `mapping`. Generates at most `max_alternatives` strings + // from the input string. + static base::flat_set<std::u16string> GenerateSupplementalHostnames( + base::StringPiece16 input, + size_t max_alternatives, + const SkeletonMap& mapping); private: // Adds an additional mapping from |src_char| to |mapped_char| when generating @@ -90,6 +99,9 @@ std::unique_ptr<icu::Transliterator> diacritic_remover_; std::unique_ptr<icu::Transliterator> extra_confusable_mapper_; + // Map of characters to their skeletons. This map is manually curated. + std::map<char16_t, Skeletons> character_map_; + raw_ptr<const USpoofChecker> checker_; };
diff --git a/components/variations/study_filtering_unittest.cc b/components/variations/study_filtering_unittest.cc index 391c543..80cebd4 100644 --- a/components/variations/study_filtering_unittest.cc +++ b/components/variations/study_filtering_unittest.cc
@@ -16,6 +16,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/test/metrics/histogram_tester.h" +#include "base/time/time.h" #include "components/variations/client_filterable_state.h" #include "components/variations/processed_study.h" #include "components/variations/variations_layers.h"
diff --git a/components/variations/variations_request_scheduler_mobile.h b/components/variations/variations_request_scheduler_mobile.h index c7a02d5..c82b9ee 100644 --- a/components/variations/variations_request_scheduler_mobile.h +++ b/components/variations/variations_request_scheduler_mobile.h
@@ -9,6 +9,7 @@ #include "base/component_export.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/variations/variations_request_scheduler.h"
diff --git a/components/variations/variations_seed_processor_unittest.cc b/components/variations/variations_seed_processor_unittest.cc index 1ac2db4..ccde1f6 100644 --- a/components/variations/variations_seed_processor_unittest.cc +++ b/components/variations/variations_seed_processor_unittest.cc
@@ -24,6 +24,7 @@ #include "base/test/mock_entropy_provider.h" #include "base/test/scoped_feature_list.h" #include "base/test/scoped_field_trial_list_resetter.h" +#include "base/time/time.h" #include "components/variations/client_filterable_state.h" #include "components/variations/processed_study.h" #include "components/variations/proto/study.pb.h"
diff --git a/components/visitedlink/browser/visitedlink_event_listener.cc b/components/visitedlink/browser/visitedlink_event_listener.cc index 1a69f37..5143a13 100644 --- a/components/visitedlink/browser/visitedlink_event_listener.cc +++ b/components/visitedlink/browser/visitedlink_event_listener.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/bind.h" +#include "base/time/time.h" #include "components/visitedlink/browser/visitedlink_delegate.h" #include "components/visitedlink/common/visitedlink.mojom.h" #include "content/public/browser/notification_service.h"
diff --git a/components/visitedlink/browser/visitedlink_writer.h b/components/visitedlink/browser/visitedlink_writer.h index d118850..9a7536d9 100644 --- a/components/visitedlink/browser/visitedlink_writer.h +++ b/components/visitedlink/browser/visitedlink_writer.h
@@ -21,7 +21,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/shared_memory_mapping.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/components/viz/common/frame_sinks/begin_frame_source.h b/components/viz/common/frame_sinks/begin_frame_source.h index 3b3ca2b..fd4fa5b 100644 --- a/components/viz/common/frame_sinks/begin_frame_source.h +++ b/components/viz/common/frame_sinks/begin_frame_source.h
@@ -13,6 +13,7 @@ #include "base/check.h" #include "base/containers/flat_set.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/viz/common/frame_sinks/begin_frame_args.h" #include "components/viz/common/frame_sinks/delay_based_time_source.h"
diff --git a/components/viz/common/frame_sinks/delay_based_time_source.h b/components/viz/common/frame_sinks/delay_based_time_source.h index 82fc20a0..85be36e 100644 --- a/components/viz/common/frame_sinks/delay_based_time_source.h +++ b/components/viz/common/frame_sinks/delay_based_time_source.h
@@ -10,6 +10,7 @@ #include "base/cancelable_callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/viz/common/viz_common_export.h"
diff --git a/components/viz/common/frame_timing_details.h b/components/viz/common/frame_timing_details.h index 3b59b23..78c758f 100644 --- a/components/viz/common/frame_timing_details.h +++ b/components/viz/common/frame_timing_details.h
@@ -5,6 +5,7 @@ #ifndef COMPONENTS_VIZ_COMMON_FRAME_TIMING_DETAILS_H_ #define COMPONENTS_VIZ_COMMON_FRAME_TIMING_DETAILS_H_ +#include "base/time/time.h" #include "ui/gfx/presentation_feedback.h" #include "ui/gfx/swap_result.h"
diff --git a/components/viz/demo/client/demo_client.h b/components/viz/demo/client/demo_client.h index a5fe406..f86f05b5 100644 --- a/components/viz/demo/client/demo_client.h +++ b/components/viz/demo/client/demo_client.h
@@ -10,6 +10,7 @@ #include "base/synchronization/lock.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "components/viz/common/frame_timing_details_map.h" #include "components/viz/common/quads/compositor_frame_metadata.h" #include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
diff --git a/components/viz/demo/demo_main.cc b/components/viz/demo/demo_main.cc index db021f9..f8f77209 100644 --- a/components/viz/demo/demo_main.cc +++ b/components/viz/demo/demo_main.cc
@@ -13,6 +13,7 @@ #include "base/task/single_thread_task_executor.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/viz/demo/host/demo_host.h" #include "components/viz/demo/service/demo_service.h"
diff --git a/components/viz/service/display/direct_renderer.h b/components/viz/service/display/direct_renderer.h index 608137a..c82455fd 100644 --- a/components/viz/service/display/direct_renderer.h +++ b/components/viz/service/display/direct_renderer.h
@@ -13,6 +13,7 @@ #include "base/containers/circular_deque.h" #include "base/containers/flat_map.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/viz/common/quads/aggregated_render_pass.h" #include "components/viz/common/quads/tile_draw_quad.h"
diff --git a/components/viz/service/display/display_scheduler.h b/components/viz/service/display/display_scheduler.h index 857ab72..fcecbb08 100644 --- a/components/viz/service/display/display_scheduler.h +++ b/components/viz/service/display/display_scheduler.h
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/viz/common/display/renderer_settings.h" #include "components/viz/common/frame_sinks/begin_frame_source.h"
diff --git a/components/viz/service/display/display_scheduler_unittest.cc b/components/viz/service/display/display_scheduler_unittest.cc index 7f1ef0ab..717d258 100644 --- a/components/viz/service/display/display_scheduler_unittest.cc +++ b/components/viz/service/display/display_scheduler_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/null_task_runner.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "cc/test/scheduler_test_common.h" #include "components/viz/common/features.h"
diff --git a/components/viz/service/display/display_unittest.cc b/components/viz/service/display/display_unittest.cc index cad70e8..68e6e40e 100644 --- a/components/viz/service/display/display_unittest.cc +++ b/components/viz/service/display/display_unittest.cc
@@ -22,6 +22,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/null_task_runner.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "cc/base/math_util.h" #include "cc/test/scheduler_test_common.h" #include "components/viz/common/features.h"
diff --git a/components/viz/service/display/frame_rate_decider_unittest.cc b/components/viz/service/display/frame_rate_decider_unittest.cc index 8a68c6b..e9f55fa 100644 --- a/components/viz/service/display/frame_rate_decider_unittest.cc +++ b/components/viz/service/display/frame_rate_decider_unittest.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/callback_helpers.h" +#include "base/time/time.h" #include "components/viz/common/frame_sinks/begin_frame_source.h" #include "components/viz/common/surfaces/surface_info.h" #include "components/viz/service/surfaces/surface.h"
diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc index 23eed677..46c58b3 100644 --- a/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc
@@ -25,6 +25,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "cc/base/math_util.h"
diff --git a/components/viz/service/display/overlay_processor_delegated.cc b/components/viz/service/display/overlay_processor_delegated.cc index 72a52f4..ca130dab4 100644 --- a/components/viz/service/display/overlay_processor_delegated.cc +++ b/components/viz/service/display/overlay_processor_delegated.cc
@@ -15,6 +15,7 @@ #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/components/viz/service/display/overlay_processor_using_strategy.h b/components/viz/service/display/overlay_processor_using_strategy.h index cfba1170..629e155a 100644 --- a/components/viz/service/display/overlay_processor_using_strategy.h +++ b/components/viz/service/display/overlay_processor_using_strategy.h
@@ -12,6 +12,7 @@ #include "base/hash/hash.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/viz/common/quads/aggregated_render_pass.h" #include "components/viz/service/display/display_resource_provider.h"
diff --git a/components/viz/service/display/renderer_pixeltest.cc b/components/viz/service/display/renderer_pixeltest.cc index bc54e153..b5eb0ab 100644 --- a/components/viz/service/display/renderer_pixeltest.cc +++ b/components/viz/service/display/renderer_pixeltest.cc
@@ -16,6 +16,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/shared_memory_mapping.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/base/math_util.h" #include "cc/paint/paint_flags.h"
diff --git a/components/viz/service/display/surface_aggregator.h b/components/viz/service/display/surface_aggregator.h index 4ca7c473..338dc87 100644 --- a/components/viz/service/display/surface_aggregator.h +++ b/components/viz/service/display/surface_aggregator.h
@@ -15,6 +15,7 @@ #include "base/containers/flat_set.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "components/viz/common/quads/compositor_render_pass.h" #include "components/viz/common/quads/draw_quad.h" #include "components/viz/common/resources/transferable_resource.h"
diff --git a/components/viz/service/display_embedder/skia_output_device.h b/components/viz/service/display_embedder/skia_output_device.h index 64241413..b643cfe 100644 --- a/components/viz/service/display_embedder/skia_output_device.h +++ b/components/viz/service/display_embedder/skia_output_device.h
@@ -12,6 +12,7 @@ #include "base/containers/queue.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/viz/service/display/output_surface.h" #include "components/viz/service/display/output_surface_frame.h"
diff --git a/components/viz/service/display_embedder/skia_output_device_dawn.cc b/components/viz/service/display_embedder/skia_output_device_dawn.cc index 7ff3606..a4a9743 100644 --- a/components/viz/service/display_embedder/skia_output_device_dawn.cc +++ b/components/viz/service/display_embedder/skia_output_device_dawn.cc
@@ -8,6 +8,7 @@ #include "base/check_op.h" #include "base/notreached.h" +#include "base/time/time.h" #include "components/viz/common/gpu/dawn_context_provider.h" #include "third_party/dawn/include/dawn/native/D3D12Backend.h" #include "ui/gfx/presentation_feedback.h"
diff --git a/components/viz/service/display_embedder/software_output_surface.h b/components/viz/service/display_embedder/software_output_surface.h index 12178dd..4425e9f 100644 --- a/components/viz/service/display_embedder/software_output_surface.h +++ b/components/viz/service/display_embedder/software_output_surface.h
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "components/viz/common/display/update_vsync_parameters_callback.h"
diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h index a6e4ebbf..b0b76ac 100644 --- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h +++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
@@ -10,6 +10,7 @@ #include "base/callback_helpers.h" #include "base/memory/read_only_shared_memory_region.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "components/viz/common/surfaces/frame_sink_id.h"
diff --git a/components/viz/service/gl/gpu_service_impl.cc b/components/viz/service/gl/gpu_service_impl.cc index d40ae37..fbd44f3 100644 --- a/components/viz/service/gl/gpu_service_impl.cc +++ b/components/viz/service/gl/gpu_service_impl.cc
@@ -15,7 +15,6 @@ #include "base/no_destructor.h" #include "base/observer_list.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/viz/service/gl/gpu_service_impl.h b/components/viz/service/gl/gpu_service_impl.h index 4c38adb..450ebc77 100644 --- a/components/viz/service/gl/gpu_service_impl.h +++ b/components/viz/service/gl/gpu_service_impl.h
@@ -20,6 +20,7 @@ #include "base/task/cancelable_task_tracker.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "components/viz/service/display_embedder/compositor_gpu_thread.h"
diff --git a/components/viz/service/gl/gpu_service_impl_unittest.cc b/components/viz/service/gl/gpu_service_impl_unittest.cc index c0b5cff..00b1846 100644 --- a/components/viz/service/gl/gpu_service_impl_unittest.cc +++ b/components/viz/service/gl/gpu_service_impl_unittest.cc
@@ -14,6 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "gpu/config/gpu_info.h" #include "gpu/ipc/service/display_context.h" #include "gpu/ipc/service/gpu_watchdog_thread.h"
diff --git a/components/viz/service/gl/info_collection_gpu_service_impl.cc b/components/viz/service/gl/info_collection_gpu_service_impl.cc index c8b69e1..be07198 100644 --- a/components/viz/service/gl/info_collection_gpu_service_impl.cc +++ b/components/viz/service/gl/info_collection_gpu_service_impl.cc
@@ -5,7 +5,6 @@ #include "components/viz/service/gl/info_collection_gpu_service_impl.h" #include <utility> -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "gpu/config/dx_diag_node.h"
diff --git a/components/viz/service/main/viz_compositor_thread_runner_impl.cc b/components/viz/service/main/viz_compositor_thread_runner_impl.cc index 798434c..d39e1fba 100644 --- a/components/viz/service/main/viz_compositor_thread_runner_impl.cc +++ b/components/viz/service/main/viz_compositor_thread_runner_impl.cc
@@ -14,6 +14,7 @@ #include "base/task/bind_post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h"
diff --git a/components/viz/service/main/viz_main_impl.h b/components/viz/service/main/viz_main_impl.h index b2965ba..2dcfc9cb 100644 --- a/components/viz/service/main/viz_main_impl.h +++ b/components/viz/service/main/viz_main_impl.h
@@ -11,6 +11,7 @@ #include "base/process/process_handle.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/discardable_memory/client/client_discardable_shared_memory_manager.h" #include "components/viz/common/buildflags.h"
diff --git a/components/viz/service/performance_hint/hint_session.cc b/components/viz/service/performance_hint/hint_session.cc index 2da3522..ecb5a5f 100644 --- a/components/viz/service/performance_hint/hint_session.cc +++ b/components/viz/service/performance_hint/hint_session.cc
@@ -7,6 +7,7 @@ #include <utility> #include <vector> +#include "base/time/time.h" #include "build/build_config.h" #if BUILDFLAG(IS_ANDROID)
diff --git a/components/viz/test/test_gpu_service_holder.h b/components/viz/test/test_gpu_service_holder.h index cef5cfb4..730c17fe 100644 --- a/components/viz/test/test_gpu_service_holder.h +++ b/components/viz/test/test_gpu_service_holder.h
@@ -11,6 +11,7 @@ #include "base/feature_list.h" #include "base/memory/scoped_refptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "gpu/ipc/gpu_in_process_thread_service.h" #include "gpu/vulkan/buildflags.h"
diff --git a/components/web_cache/browser/web_cache_manager_unittest.cc b/components/web_cache/browser/web_cache_manager_unittest.cc index 3cf08f75..8cd6b52e 100644 --- a/components/web_cache/browser/web_cache_manager_unittest.cc +++ b/components/web_cache/browser/web_cache_manager_unittest.cc
@@ -6,6 +6,7 @@ #include <string> +#include "base/time/time.h" #include "components/web_cache/browser/web_cache_manager.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/webapps/browser/android/add_to_homescreen_data_fetcher.cc b/components/webapps/browser/android/add_to_homescreen_data_fetcher.cc index 19f9d0c..64b51ed 100644 --- a/components/webapps/browser/android/add_to_homescreen_data_fetcher.cc +++ b/components/webapps/browser/android/add_to_homescreen_data_fetcher.cc
@@ -15,7 +15,6 @@ #include "base/metrics/user_metrics.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h"
diff --git a/components/webapps/browser/android/webapk/webapk_proto_builder.cc b/components/webapps/browser/android/webapk/webapk_proto_builder.cc index 551e07d..94a8898a 100644 --- a/components/webapps/browser/android/webapk/webapk_proto_builder.cc +++ b/components/webapps/browser/android/webapk/webapk_proto_builder.cc
@@ -10,7 +10,6 @@ #include "base/files/file_util.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/components/webapps/browser/banners/app_banner_manager.cc b/components/webapps/browser/banners/app_banner_manager.cc index bdf41e4..2677ab1 100644 --- a/components/webapps/browser/banners/app_banner_manager.cc +++ b/components/webapps/browser/banners/app_banner_manager.cc
@@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/feature_list.h" #include "base/memory/raw_ptr.h" @@ -395,11 +396,14 @@ if (data.has_worker && data.valid_manifest) TrackDisplayEvent(DISPLAY_EVENT_WEB_APP_BANNER_REQUESTED); + bool no_matching_service_worker = + base::Contains(data.errors, NO_MATCHING_SERVICE_WORKER); + if (no_matching_service_worker) { + TrackDisplayEvent(DISPLAY_EVENT_LACKS_SERVICE_WORKER); + } + auto error = data.NoBlockingErrors() ? NO_ERROR_DETECTED : data.errors[0]; if (error != NO_ERROR_DETECTED) { - if (error == NO_MATCHING_SERVICE_WORKER) - TrackDisplayEvent(DISPLAY_EVENT_LACKS_SERVICE_WORKER); - SetInstallableWebAppCheckResult(InstallableWebAppCheckResult::kNo); Stop(error); return; @@ -420,6 +424,13 @@ return; } + if (no_matching_service_worker) { + SetInstallableWebAppCheckResult( + InstallableWebAppCheckResult::kYes_ByUserRequest); + Stop(NO_MATCHING_SERVICE_WORKER); + return; + } + SetInstallableWebAppCheckResult( InstallableWebAppCheckResult::kYes_Promotable);
diff --git a/components/webapps/browser/banners/app_banner_settings_helper_unittest.cc b/components/webapps/browser/banners/app_banner_settings_helper_unittest.cc index a7a213a9..85283b2 100644 --- a/components/webapps/browser/banners/app_banner_settings_helper_unittest.cc +++ b/components/webapps/browser/banners/app_banner_settings_helper_unittest.cc
@@ -4,6 +4,7 @@ #include "components/webapps/browser/banners/app_banner_settings_helper.h" +#include "base/time/time.h" #include "components/permissions/test/test_permissions_client.h" #include "components/prefs/testing_pref_service.h" #include "components/site_engagement/content/site_engagement_service.h"
diff --git a/components/webapps/browser/installable/installable_data.cc b/components/webapps/browser/installable/installable_data.cc index f29affba..3004676 100644 --- a/components/webapps/browser/installable/installable_data.cc +++ b/components/webapps/browser/installable/installable_data.cc
@@ -6,6 +6,8 @@ #include <utility> +#include "base/containers/flat_set.h" + namespace webapps { InstallableData::InstallableData(std::vector<InstallableStatusCode> errors, @@ -36,8 +38,18 @@ InstallableData::~InstallableData() = default; bool InstallableData::NoBlockingErrors() const { - return errors.empty() || - (errors.size() == 1 && errors[0] == WARN_NOT_OFFLINE_CAPABLE); + base::flat_set<InstallableStatusCode> error_set(errors); + base::flat_set<InstallableStatusCode> non_blocking_errors = { +#if !BUILDFLAG(IS_ANDROID) + // TODO(crbug.com/1216457): The service worker requirement for desktop is + // being dropped in installability requirements on desktop. Android may + // follow suit, but that's a decision for another day. + NO_MATCHING_SERVICE_WORKER, +#endif + WARN_NOT_OFFLINE_CAPABLE, + }; + return std::includes(non_blocking_errors.begin(), non_blocking_errors.end(), + error_set.begin(), error_set.end()); } } // namespace webapps
diff --git a/components/webcrypto/webcrypto_impl.cc b/components/webcrypto/webcrypto_impl.cc index 0383e31..2bec34e 100644 --- a/components/webcrypto/webcrypto_impl.cc +++ b/components/webcrypto/webcrypto_impl.cc
@@ -18,6 +18,7 @@ #include "base/task/task_runner.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "components/webcrypto/algorithm_dispatch.h" #include "components/webcrypto/crypto_data.h"
diff --git a/components/webdata/common/web_data_request_manager.cc b/components/webdata/common/web_data_request_manager.cc index 6fcca77..7a68ac6 100644 --- a/components/webdata/common/web_data_request_manager.cc +++ b/components/webdata/common/web_data_request_manager.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/components/webdata_services/web_data_service_wrapper.cc b/components/webdata_services/web_data_service_wrapper.cc index f828aa4..13570cfb 100644 --- a/components/webdata_services/web_data_service_wrapper.cc +++ b/components/webdata_services/web_data_service_wrapper.cc
@@ -10,7 +10,6 @@ #include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_path.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/components/webrtc_logging/browser/text_log_list.cc b/components/webrtc_logging/browser/text_log_list.cc index a63f7594..976067b 100644 --- a/components/webrtc_logging/browser/text_log_list.cc +++ b/components/webrtc_logging/browser/text_log_list.cc
@@ -6,7 +6,6 @@ #include "base/files/file.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "components/upload_list/text_log_upload_list.h" #include "content/public/browser/browser_context.h"
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc index ce5f290..7b684be2 100644 --- a/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc
@@ -39,7 +39,6 @@ #include "base/process/process_handle.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/hang_watcher.h"
diff --git a/content/app/mojo_ipc_support.h b/content/app/mojo_ipc_support.h index fcd5953..bcb99c2 100644 --- a/content/app/mojo_ipc_support.h +++ b/content/app/mojo_ipc_support.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/threading/thread.h" +#include "base/time/time.h" #include "content/common/content_export.h" namespace mojo {
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index 7de8d6a..c2ffe0a9 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn
@@ -2091,8 +2091,6 @@ "webauth/client_data_json.h", "webauth/webauth_request_security_checker.cc", "webauth/webauth_request_security_checker.h", - "webid/fake_identity_request_dialog_controller.cc", - "webid/fake_identity_request_dialog_controller.h", "webid/fedcm_metrics.cc", "webid/fedcm_metrics.h", "webid/federated_auth_request_impl.cc",
diff --git a/content/browser/accessibility/browser_accessibility_state_impl.h b/content/browser/accessibility/browser_accessibility_state_impl.h index ce8a9e83..98243bb 100644 --- a/content/browser/accessibility/browser_accessibility_state_impl.h +++ b/content/browser/accessibility/browser_accessibility_state_impl.h
@@ -7,6 +7,7 @@ #include <vector> +#include "base/time/time.h" #include "build/build_config.h" #include "components/metrics/metrics_provider.h" #include "content/common/content_export.h"
diff --git a/content/browser/accessibility/touch_passthrough_manager_unittest.cc b/content/browser/accessibility/touch_passthrough_manager_unittest.cc index 3f4e5a6..18e4e03b 100644 --- a/content/browser/accessibility/touch_passthrough_manager_unittest.cc +++ b/content/browser/accessibility/touch_passthrough_manager_unittest.cc
@@ -8,6 +8,7 @@ #include <vector> #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "content/browser/accessibility/browser_accessibility.h" #include "content/browser/accessibility/browser_accessibility_manager.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/content/browser/android/background_sync_network_observer_android.cc b/content/browser/android/background_sync_network_observer_android.cc index 8758743..7276839 100644 --- a/content/browser/android/background_sync_network_observer_android.cc +++ b/content/browser/android/background_sync_network_observer_android.cc
@@ -5,7 +5,6 @@ #include "content/browser/android/background_sync_network_observer_android.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/trace_event/trace_event.h" #include "content/public/android/content_jni_headers/BackgroundSyncNetworkObserver_jni.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/android/battery_metrics.cc b/content/browser/android/battery_metrics.cc index be532dd9..2409a00 100644 --- a/content/browser/android/battery_metrics.cc +++ b/content/browser/android/battery_metrics.cc
@@ -14,6 +14,7 @@ #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" #include "base/power_monitor/power_monitor.h" +#include "base/time/time.h" #include "base/trace_event/application_state_proto_android.h" #include "base/trace_event/trace_event.h" #include "base/trace_event/typed_macros.h"
diff --git a/content/browser/back_forward_cache_browsertest.cc b/content/browser/back_forward_cache_browsertest.cc index 9343ed5..20cd5c6 100644 --- a/content/browser/back_forward_cache_browsertest.cc +++ b/content/browser/back_forward_cache_browsertest.cc
@@ -15,7 +15,6 @@ #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" #include "base/task/common/task_annotator.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/test_timeouts.h" #include "base/threading/thread_restrictions.h"
diff --git a/content/browser/background_fetch/background_fetch_registration_service_impl.cc b/content/browser/background_fetch/background_fetch_registration_service_impl.cc index 2eb1222..66df236 100644 --- a/content/browser/background_fetch/background_fetch_registration_service_impl.cc +++ b/content/browser/background_fetch/background_fetch_registration_service_impl.cc
@@ -10,7 +10,6 @@ #include "base/callback_helpers.h" #include "base/guid.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "content/browser/background_fetch/background_fetch_context.h" #include "content/browser/background_fetch/background_fetch_metrics.h" #include "content/browser/background_fetch/background_fetch_registration_id.h"
diff --git a/content/browser/background_fetch/background_fetch_scheduler_unittest.cc b/content/browser/background_fetch/background_fetch_scheduler_unittest.cc index 4288fa9..e344673 100644 --- a/content/browser/background_fetch/background_fetch_scheduler_unittest.cc +++ b/content/browser/background_fetch/background_fetch_scheduler_unittest.cc
@@ -12,7 +12,6 @@ #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "content/browser/background_fetch/background_fetch_job_controller.h" #include "content/browser/background_fetch/background_fetch_request_info.h" #include "content/browser/background_fetch/background_fetch_test_base.h"
diff --git a/content/browser/background_fetch/background_fetch_service_impl.cc b/content/browser/background_fetch/background_fetch_service_impl.cc index 33037ed..4a1a26b 100644 --- a/content/browser/background_fetch/background_fetch_service_impl.cc +++ b/content/browser/background_fetch/background_fetch_service_impl.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/guid.h" -#include "base/task/post_task.h" #include "content/browser/background_fetch/background_fetch_context.h" #include "content/browser/background_fetch/background_fetch_metrics.h" #include "content/browser/background_fetch/background_fetch_registration_id.h"
diff --git a/content/browser/background_fetch/storage/get_initialization_data_task.cc b/content/browser/background_fetch/storage/get_initialization_data_task.cc index 30386a85..2298d25 100644 --- a/content/browser/background_fetch/storage/get_initialization_data_task.cc +++ b/content/browser/background_fetch/storage/get_initialization_data_task.cc
@@ -9,7 +9,6 @@ #include "base/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "content/browser/background_fetch/background_fetch.pb.h" #include "content/browser/background_fetch/background_fetch_data_manager.h"
diff --git a/content/browser/background_fetch/storage/image_helpers.cc b/content/browser/background_fetch/storage/image_helpers.cc index da49784..01e558b6 100644 --- a/content/browser/background_fetch/storage/image_helpers.cc +++ b/content/browser/background_fetch/storage/image_helpers.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/memory/ref_counted_memory.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/content/browser/background_sync/background_sync_base_browsertest.cc b/content/browser/background_sync/background_sync_base_browsertest.cc index 59e7be9..835a31b 100644 --- a/content/browser/background_sync/background_sync_base_browsertest.cc +++ b/content/browser/background_sync/background_sync_base_browsertest.cc
@@ -9,7 +9,6 @@ #include <vector> #include "base/metrics/field_trial_param_associator.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "content/browser/background_sync/background_sync_manager.h" #include "content/browser/storage_partition_impl.h" #include "content/public/browser/browser_context.h"
diff --git a/content/browser/background_sync/background_sync_proxy.cc b/content/browser/background_sync/background_sync_proxy.cc index 20a7b65..4a038251 100644 --- a/content/browser/background_sync/background_sync_proxy.cc +++ b/content/browser/background_sync/background_sync_proxy.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "content/browser/background_sync/background_sync_scheduler.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/background_sync/one_shot_background_sync_browsertest.cc b/content/browser/background_sync/one_shot_background_sync_browsertest.cc index 5811b79..29fc9d2 100644 --- a/content/browser/background_sync/one_shot_background_sync_browsertest.cc +++ b/content/browser/background_sync/one_shot_background_sync_browsertest.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/threading/thread_task_runner_handle.h" #include "content/browser/background_sync/background_sync_manager.h"
diff --git a/content/browser/browser_associated_interface_unittest.cc b/content/browser/browser_associated_interface_unittest.cc index d5bff49..da3cd9e 100644 --- a/content/browser/browser_associated_interface_unittest.cc +++ b/content/browser/browser_associated_interface_unittest.cc
@@ -14,6 +14,7 @@ #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "content/public/browser/browser_associated_interface.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/browser_thread_unittest.cc b/content/browser/browser_thread_unittest.cc index 210cc8a..b119aa3 100644 --- a/content/browser/browser_thread_unittest.cc +++ b/content/browser/browser_thread_unittest.cc
@@ -21,6 +21,7 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/browser/browser_process_io_thread.h" #include "content/browser/browser_thread_impl.h"
diff --git a/content/browser/browsing_data/browsing_data_browsertest_utils.cc b/content/browser/browsing_data/browsing_data_browsertest_utils.cc index e3ee2ff..1a567225 100644 --- a/content/browser/browsing_data/browsing_data_browsertest_utils.cc +++ b/content/browser/browsing_data/browsing_data_browsertest_utils.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "components/network_session_configurator/common/network_switches.h" #include "content/browser/browsing_data/browsing_data_test_utils.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc b/content/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc index c5d9f741..bb4562d7 100644 --- a/content/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc +++ b/content/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
@@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "build/build_config.h"
diff --git a/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc b/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc index 7ce549f..544553d 100644 --- a/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc +++ b/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner_helpers.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/content/browser/byte_stream.cc b/content/browser/byte_stream.cc index cf50666..7a6e3ff 100644 --- a/content/browser/byte_stream.cc +++ b/content/browser/byte_stream.cc
@@ -14,6 +14,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" namespace content { namespace {
diff --git a/content/browser/byte_stream.h b/content/browser/byte_stream.h index 504646c..a63e3a5 100644 --- a/content/browser/byte_stream.h +++ b/content/browser/byte_stream.h
@@ -11,7 +11,6 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "content/common/content_export.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/cache_storage/cache_storage_cache_unittest.cc b/content/browser/cache_storage/cache_storage_cache_unittest.cc index f5bfcab..77d02a4 100644 --- a/content/browser/cache_storage/cache_storage_cache_unittest.cc +++ b/content/browser/cache_storage/cache_storage_cache_unittest.cc
@@ -25,6 +25,7 @@ #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/services/storage/public/mojom/cache_storage_control.mojom.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h"
diff --git a/content/browser/cache_storage/cache_storage_manager_unittest.cc b/content/browser/cache_storage/cache_storage_manager_unittest.cc index aba199f5..3776cdb4 100644 --- a/content/browser/cache_storage/cache_storage_manager_unittest.cc +++ b/content/browser/cache_storage/cache_storage_manager_unittest.cc
@@ -26,6 +26,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/test_future.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/services/storage/public/cpp/buckets/bucket_info.h" #include "components/services/storage/public/cpp/buckets/bucket_locator.h"
diff --git a/content/browser/cache_storage/legacy/legacy_cache_storage_cache.cc b/content/browser/cache_storage/legacy/legacy_cache_storage_cache.cc index 5f95e12..a84dbef 100644 --- a/content/browser/cache_storage/legacy/legacy_cache_storage_cache.cc +++ b/content/browser/cache_storage/legacy/legacy_cache_storage_cache.cc
@@ -26,6 +26,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "base/trace_event/traced_value.h" #include "content/browser/cache_storage/cache_storage.pb.h"
diff --git a/content/browser/cache_storage/legacy/legacy_cache_storage_manager.cc b/content/browser/cache_storage/legacy/legacy_cache_storage_manager.cc index 42a23695..5bfad25d6 100644 --- a/content/browser/cache_storage/legacy/legacy_cache_storage_manager.cc +++ b/content/browser/cache_storage/legacy/legacy_cache_storage_manager.cc
@@ -22,7 +22,6 @@ #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h"
diff --git a/content/browser/child_process_launcher_helper.cc b/content/browser/child_process_launcher_helper.cc index 5fed6514..bf0ff19 100644 --- a/content/browser/child_process_launcher_helper.cc +++ b/content/browser/child_process_launcher_helper.cc
@@ -11,7 +11,6 @@ #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" #include "base/task/lazy_thread_pool_task_runner.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/single_thread_task_runner_thread_mode.h" #include "base/task/task_traits.h"
diff --git a/content/browser/child_process_launcher_helper.h b/content/browser/child_process_launcher_helper.h index d882f4b..8934a7b 100644 --- a/content/browser/child_process_launcher_helper.h +++ b/content/browser/child_process_launcher_helper.h
@@ -13,6 +13,7 @@ #include "base/process/kill.h" #include "base/process/process.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/public/common/result_codes.h" #include "content/public/common/zygote/zygote_buildflags.h"
diff --git a/content/browser/child_process_launcher_helper_android.cc b/content/browser/child_process_launcher_helper_android.cc index 385cfbdb..8fe864a 100644 --- a/content/browser/child_process_launcher_helper_android.cc +++ b/content/browser/child_process_launcher_helper_android.cc
@@ -12,7 +12,6 @@ #include "base/i18n/icu_util.h" #include "base/logging.h" #include "base/metrics/field_trial.h" -#include "base/task/post_task.h" #include "content/browser/child_process_launcher.h" #include "content/browser/child_process_launcher_helper.h" #include "content/browser/child_process_launcher_helper_posix.h"
diff --git a/content/browser/child_process_task_port_provider_mac_unittest.cc b/content/browser/child_process_task_port_provider_mac_unittest.cc index 991da902..d0c3efd 100644 --- a/content/browser/child_process_task_port_provider_mac_unittest.cc +++ b/content/browser/child_process_task_port_provider_mac_unittest.cc
@@ -11,7 +11,6 @@ #include "base/clang_profiling_buildflags.h" #include "base/mac/scoped_mach_port.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h"
diff --git a/content/browser/code_cache/generated_code_cache.cc b/content/browser/code_cache/generated_code_cache.cc index 0cb91f9b..a8f45fb3 100644 --- a/content/browser/code_cache/generated_code_cache.cc +++ b/content/browser/code_cache/generated_code_cache.cc
@@ -12,6 +12,7 @@ #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" +#include "base/time/time.h" #include "components/services/storage/public/cpp/big_io_buffer.h" #include "content/public/common/url_constants.h" #include "crypto/sha2.h"
diff --git a/content/browser/code_cache/generated_code_cache_context.cc b/content/browser/code_cache/generated_code_cache_context.cc index 96d9439c..8675a74c 100644 --- a/content/browser/code_cache/generated_code_cache_context.cc +++ b/content/browser/code_cache/generated_code_cache_context.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/files/file_path.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "content/browser/code_cache/generated_code_cache.h"
diff --git a/content/browser/code_cache/generated_code_cache_unittest.cc b/content/browser/code_cache/generated_code_cache_unittest.cc index e950331..501e2bd 100644 --- a/content/browser/code_cache/generated_code_cache_unittest.cc +++ b/content/browser/code_cache/generated_code_cache_unittest.cc
@@ -12,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "content/public/test/browser_task_environment.h" #include "content/public/test/test_utils.h" #include "net/base/network_isolation_key.h"
diff --git a/content/browser/compute_pressure/compute_pressure_sampler.cc b/content/browser/compute_pressure/compute_pressure_sampler.cc index edc9d29..29caa352 100644 --- a/content/browser/compute_pressure/compute_pressure_sampler.cc +++ b/content/browser/compute_pressure/compute_pressure_sampler.cc
@@ -11,7 +11,6 @@ #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/content/browser/content_index/content_index_context_impl.cc b/content/browser/content_index/content_index_context_impl.cc index d6f2e2f..a5817d1 100644 --- a/content/browser/content_index/content_index_context_impl.cc +++ b/content/browser/content_index/content_index_context_impl.cc
@@ -5,7 +5,6 @@ #include "content/browser/content_index/content_index_context_impl.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/content_index/content_index_service_impl.cc b/content/browser/content_index/content_index_service_impl.cc index 14958e3..9df1efe3 100644 --- a/content/browser/content_index/content_index_service_impl.cc +++ b/content/browser/content_index/content_index_service_impl.cc
@@ -7,7 +7,6 @@ #include <memory> #include "base/bind.h" -#include "base/task/post_task.h" #include "content/browser/bad_message.h" #include "content/browser/content_index/content_index_database.h" #include "content/browser/storage_partition_impl.h"
diff --git a/content/browser/data_decoder_browsertest.cc b/content/browser/data_decoder_browsertest.cc index b7efbec0..c4767ecb 100644 --- a/content/browser/data_decoder_browsertest.cc +++ b/content/browser/data_decoder_browsertest.cc
@@ -11,6 +11,7 @@ #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "content/public/browser/service_process_host.h" #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h"
diff --git a/content/browser/devtools/devtools_background_services_context_impl.h b/content/browser/devtools/devtools_background_services_context_impl.h index ce6dee5..4ca6641 100644 --- a/content/browser/devtools/devtools_background_services_context_impl.h +++ b/content/browser/devtools/devtools_background_services_context_impl.h
@@ -18,6 +18,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/observer_list_types.h" +#include "base/time/time.h" #include "content/browser/devtools/devtools_background_services.pb.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/common/content_export.h"
diff --git a/content/browser/devtools/devtools_background_services_context_impl_unittest.cc b/content/browser/devtools/devtools_background_services_context_impl_unittest.cc index 4a2b3572..f57fe45b 100644 --- a/content/browser/devtools/devtools_background_services_context_impl_unittest.cc +++ b/content/browser/devtools/devtools_background_services_context_impl_unittest.cc
@@ -10,6 +10,7 @@ #include "base/containers/flat_map.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "content/browser/devtools/devtools_background_services.pb.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" #include "content/public/browser/content_browser_client.h"
diff --git a/content/browser/devtools/devtools_http_handler.h b/content/browser/devtools/devtools_http_handler.h index e12f1b5..48699a1 100644 --- a/content/browser/devtools/devtools_http_handler.h +++ b/content/browser/devtools/devtools_http_handler.h
@@ -11,6 +11,7 @@ #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "content/public/browser/devtools_agent_host.h" #include "net/http/http_status_code.h"
diff --git a/content/browser/devtools/devtools_instrumentation.cc b/content/browser/devtools/devtools_instrumentation.cc index fda6c85..0a7b44e 100644 --- a/content/browser/devtools/devtools_instrumentation.cc +++ b/content/browser/devtools/devtools_instrumentation.cc
@@ -301,6 +301,12 @@ nav_request, result, tree_result); } +void DidActivatePrerender(const NavigationRequest& nav_request) { + FrameTreeNode* ftn = nav_request.frame_tree_node(); + DispatchToAgents(ftn, &protocol::PageHandler::DidActivatePrerender, + nav_request); +} + namespace { protocol::String BuildBlockedByResponseReason(
diff --git a/content/browser/devtools/devtools_instrumentation.h b/content/browser/devtools/devtools_instrumentation.h index e9ba449..cc5b74f 100644 --- a/content/browser/devtools/devtools_instrumentation.h +++ b/content/browser/devtools/devtools_instrumentation.h
@@ -160,6 +160,8 @@ const BackForwardCacheCanStoreDocumentResult* result, const BackForwardCacheCanStoreTreeResult* tree_result); +void DidActivatePrerender(const NavigationRequest& nav_request); + void OnSignedExchangeReceived( FrameTreeNode* frame_tree_node, absl::optional<const base::UnguessableToken> devtools_navigation_token,
diff --git a/content/browser/devtools/devtools_pipe_handler.cc b/content/browser/devtools/devtools_pipe_handler.cc index 84c50d8..cdd401a 100644 --- a/content/browser/devtools/devtools_pipe_handler.cc +++ b/content/browser/devtools/devtools_pipe_handler.cc
@@ -4,6 +4,7 @@ #include "content/browser/devtools/devtools_pipe_handler.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "build/build_config.h" #if BUILDFLAG(IS_WIN)
diff --git a/content/browser/devtools/devtools_video_consumer_unittest.cc b/content/browser/devtools/devtools_video_consumer_unittest.cc index f3f965e..1e3b833 100644 --- a/content/browser/devtools/devtools_video_consumer_unittest.cc +++ b/content/browser/devtools/devtools_video_consumer_unittest.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/viz/common/surfaces/region_capture_bounds.h" #include "content/browser/devtools/devtools_video_consumer.h" #include "content/public/test/test_utils.h"
diff --git a/content/browser/devtools/frame_auto_attacher.cc b/content/browser/devtools/frame_auto_attacher.cc index 8d6da44..8b643a8 100644 --- a/content/browser/devtools/frame_auto_attacher.cc +++ b/content/browser/devtools/frame_auto_attacher.cc
@@ -4,6 +4,7 @@ #include "content/browser/devtools/frame_auto_attacher.h" +#include "base/time/time.h" #include "content/browser/devtools/auction_worklet_devtools_agent_host.h" #include "content/browser/devtools/devtools_renderer_channel.h" #include "content/browser/devtools/render_frame_devtools_agent_host.h"
diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc index 1b964a8..e797b403 100644 --- a/content/browser/devtools/protocol/network_handler.cc +++ b/content/browser/devtools/protocol/network_handler.cc
@@ -19,7 +19,6 @@ #include "base/process/process_handle.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "content/browser/background_sync/background_sync_manager.h" #include "content/browser/devtools/devtools_agent_host_impl.h"
diff --git a/content/browser/devtools/protocol/page_handler.cc b/content/browser/devtools/protocol/page_handler.cc index 08c4691..b843d9a3 100644 --- a/content/browser/devtools/protocol/page_handler.cc +++ b/content/browser/devtools/protocol/page_handler.cc
@@ -18,7 +18,6 @@ #include "base/process/process_handle.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" @@ -1868,6 +1867,17 @@ std::move(explanation_tree)); } +void PageHandler::DidActivatePrerender(const NavigationRequest& nav_request) { + if (!enabled_) + return; + FrameTreeNode* ftn = nav_request.frame_tree_node(); + std::string initiating_frame_id = ftn->devtools_frame_token().ToString(); + const GURL& prerendering_url = nav_request.common_params().url; + frontend_->PrerenderAttemptCompleted( + initiating_frame_id, prerendering_url.spec(), + Page::PrerenderFinalStatusEnum::Activated); +} + bool PageHandler::ShouldBypassCSP() { return enabled_ && bypass_csp_; }
diff --git a/content/browser/devtools/protocol/page_handler.h b/content/browser/devtools/protocol/page_handler.h index 7a2186a..d027329 100644 --- a/content/browser/devtools/protocol/page_handler.h +++ b/content/browser/devtools/protocol/page_handler.h
@@ -108,6 +108,8 @@ const BackForwardCacheCanStoreDocumentResult* result, const BackForwardCacheCanStoreTreeResult* tree_result); + void DidActivatePrerender(const NavigationRequest& nav_request); + Response Enable() override; Response Disable() override;
diff --git a/content/browser/devtools/protocol/service_worker_handler.cc b/content/browser/devtools/protocol/service_worker_handler.cc index e4e5785..183cb3c 100644 --- a/content/browser/devtools/protocol/service_worker_handler.cc +++ b/content/browser/devtools/protocol/service_worker_handler.cc
@@ -11,7 +11,6 @@ #include "base/containers/flat_set.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "content/browser/background_sync/background_sync_context_impl.h" #include "content/browser/background_sync/background_sync_manager.h" #include "content/browser/devtools/service_worker_devtools_agent_host.h"
diff --git a/content/browser/devtools/protocol_config.json b/content/browser/devtools/protocol_config.json index 0a4a390..c2d36723 100644 --- a/content/browser/devtools/protocol_config.json +++ b/content/browser/devtools/protocol_config.json
@@ -71,7 +71,7 @@ "include": ["enable", "disable", "reload", "navigate", "stopLoading", "getNavigationHistory", "navigateToHistoryEntry", "resetNavigationHistory", "captureScreenshot", "startScreencast", "stopScreencast", "screencastFrameAck", "handleJavaScriptDialog", "setColorPickerEnabled", "bringToFront", "setDownloadBehavior", "getAppManifest", "crash", "close", "setWebLifecycleState", "captureSnapshot", "getInstallabilityErrors", "getManifestIcons", "setBypassCSP", "getAppId", "addCompilationCache"], - "include_events": ["colorPicked", "interstitialShown", "interstitialHidden", "javascriptDialogOpening", "javascriptDialogClosed", "downloadWillBegin", "downloadProgress", "screencastVisibilityChanged", "screencastFrame", "backForwardCacheNotUsed"], + "include_events": ["colorPicked", "interstitialShown", "interstitialHidden", "javascriptDialogOpening", "javascriptDialogClosed", "downloadWillBegin", "downloadProgress", "screencastVisibilityChanged", "screencastFrame", "backForwardCacheNotUsed", "prerenderAttemptCompleted"], "async": ["captureScreenshot", "navigate", "getAppManifest", "reload", "captureSnapshot", "getInstallabilityErrors", "getManifestIcons", "getAppId"] }, {
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index d07b9bc..21699da 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc
@@ -22,7 +22,6 @@ #include "base/strings/sys_string_conversions.h" #include "base/supports_user_data.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h"
diff --git a/content/browser/fenced_frame/fenced_frame_browsertest.cc b/content/browser/fenced_frame/fenced_frame_browsertest.cc index fd5d5c05..e8f74b07 100644 --- a/content/browser/fenced_frame/fenced_frame_browsertest.cc +++ b/content/browser/fenced_frame/fenced_frame_browsertest.cc
@@ -7,6 +7,7 @@ #include "base/strings/stringprintf.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "content/browser/fenced_frame/fenced_frame.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/renderer_host/render_frame_proxy_host.h"
diff --git a/content/browser/file_system/browser_file_system_helper.cc b/content/browser/file_system/browser_file_system_helper.cc index 4fd7e56f..7650602 100644 --- a/content/browser/file_system/browser_file_system_helper.cc +++ b/content/browser/file_system/browser_file_system_helper.cc
@@ -15,7 +15,6 @@ #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" #include "base/task/lazy_thread_pool_task_runner.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "build/chromeos_buildflags.h"
diff --git a/content/browser/file_system/file_system_operation_runner_unittest.cc b/content/browser/file_system/file_system_operation_runner_unittest.cc index ff6fe632..f048508 100644 --- a/content/browser/file_system/file_system_operation_runner_unittest.cc +++ b/content/browser/file_system/file_system_operation_runner_unittest.cc
@@ -9,7 +9,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/content/browser/file_system_access/file_system_access_handle_base.cc b/content/browser/file_system_access/file_system_access_handle_base.cc index 683019e..a6da0dbe 100644 --- a/content/browser/file_system_access/file_system_access_handle_base.cc +++ b/content/browser/file_system_access/file_system_access_handle_base.cc
@@ -11,7 +11,6 @@ #include "base/files/file_path.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "content/browser/file_system_access/file_system_access_directory_handle_impl.h" #include "content/browser/file_system_access/file_system_access_error.h"
diff --git a/content/browser/file_system_access/file_system_chooser.cc b/content/browser/file_system_access/file_system_chooser.cc index 6f0accc..8f289974 100644 --- a/content/browser/file_system_access/file_system_chooser.cc +++ b/content/browser/file_system_access/file_system_chooser.cc
@@ -12,7 +12,6 @@ #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "content/browser/file_system_access/file_system_access_directory_handle_impl.h" #include "content/browser/file_system_access/file_system_access_error.h"
diff --git a/content/browser/find_request_manager.h b/content/browser/find_request_manager.h index 6b247d83..2e897702f 100644 --- a/content/browser/find_request_manager.h +++ b/content/browser/find_request_manager.h
@@ -13,6 +13,7 @@ #include "base/cancelable_callback.h" #include "base/containers/queue.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/stop_find_action.h"
diff --git a/content/browser/first_party_sets/first_party_sets_handler_impl.cc b/content/browser/first_party_sets/first_party_sets_handler_impl.cc index 37f2ac9..c8de2f4 100644 --- a/content/browser/first_party_sets/first_party_sets_handler_impl.cc +++ b/content/browser/first_party_sets/first_party_sets_handler_impl.cc
@@ -17,7 +17,6 @@ #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/timer/elapsed_timer.h"
diff --git a/content/browser/font_access/font_access_manager.cc b/content/browser/font_access/font_access_manager.cc index d9c50d8..35c6246 100644 --- a/content/browser/font_access/font_access_manager.cc +++ b/content/browser/font_access/font_access_manager.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/types/pass_key.h" #include "content/browser/font_access/font_enumeration_cache.h"
diff --git a/content/browser/font_service.cc b/content/browser/font_service.cc index c903502..fd4e2b26a 100644 --- a/content/browser/font_service.cc +++ b/content/browser/font_service.cc
@@ -5,7 +5,6 @@ #include "content/browser/font_service.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/services/font/font_service_app.h"
diff --git a/content/browser/font_unique_name_lookup/font_unique_name_lookup.cc b/content/browser/font_unique_name_lookup/font_unique_name_lookup.cc index 078ab88..b58b174 100644 --- a/content/browser/font_unique_name_lookup/font_unique_name_lookup.cc +++ b/content/browser/font_unique_name_lookup/font_unique_name_lookup.cc
@@ -13,7 +13,6 @@ #include "base/no_destructor.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h"
diff --git a/content/browser/font_unique_name_lookup/font_unique_name_lookup_service.cc b/content/browser/font_unique_name_lookup/font_unique_name_lookup_service.cc index 20b04ac..fe7aebd 100644 --- a/content/browser/font_unique_name_lookup/font_unique_name_lookup_service.cc +++ b/content/browser/font_unique_name_lookup/font_unique_name_lookup_service.cc
@@ -8,7 +8,6 @@ #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "content/browser/font_unique_name_lookup/font_unique_name_lookup.h" #include "content/public/common/content_features.h"
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h index 05c8403d..ac0afe68 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.h +++ b/content/browser/gpu/gpu_data_manager_impl_private.h
@@ -19,6 +19,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/observer_list_threadsafe.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/content/browser/gpu/peak_gpu_memory_tracker_impl.cc b/content/browser/gpu/peak_gpu_memory_tracker_impl.cc index adcadc7..74647127 100644 --- a/content/browser/gpu/peak_gpu_memory_tracker_impl.cc +++ b/content/browser/gpu/peak_gpu_memory_tracker_impl.cc
@@ -11,7 +11,6 @@ #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/public/browser/gpu_data_manager.h"
diff --git a/content/browser/host_zoom_map_impl.h b/content/browser/host_zoom_map_impl.h index 85ad0b75..543ab3a53 100644 --- a/content/browser/host_zoom_map_impl.h +++ b/content/browser/host_zoom_map_impl.h
@@ -12,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner_helpers.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "content/public/browser/host_zoom_map.h"
diff --git a/content/browser/hyphenation/hyphenation_impl.cc b/content/browser/hyphenation/hyphenation_impl.cc index 2fbef70..aa57293 100644 --- a/content/browser/hyphenation/hyphenation_impl.cc +++ b/content/browser/hyphenation/hyphenation_impl.cc
@@ -15,7 +15,6 @@ #include "base/no_destructor.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/timer/elapsed_timer.h" #include "build/build_config.h"
diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc index cac643c..5b860fc 100644 --- a/content/browser/indexed_db/indexed_db_backing_store.cc +++ b/content/browser/indexed_db/indexed_db_backing_store.cc
@@ -24,7 +24,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/thread_annotations.h" #include "base/trace_event/base_tracing.h" #include "base/trace_event/memory_dump_manager.h"
diff --git a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc index f1c18af0..c63a3f37 100644 --- a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc +++ b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc
@@ -25,7 +25,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/synchronization/waitable_event_watcher.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc index 6bfbe10..0a66ec2 100644 --- a/content/browser/indexed_db/indexed_db_browsertest.cc +++ b/content/browser/indexed_db/indexed_db_browsertest.cc
@@ -24,6 +24,7 @@ #include "base/test/bind.h" #include "base/test/thread_test_helper.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_database.h" #include "components/services/storage/public/mojom/indexed_db_control.mojom-test-utils.h"
diff --git a/content/browser/indexed_db/indexed_db_callbacks.cc b/content/browser/indexed_db/indexed_db_callbacks.cc index cfcad25a..b02c4b7ac 100644 --- a/content/browser/indexed_db/indexed_db_callbacks.cc +++ b/content/browser/indexed_db/indexed_db_callbacks.cc
@@ -11,7 +11,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h"
diff --git a/content/browser/indexed_db/indexed_db_context_impl.cc b/content/browser/indexed_db/indexed_db_context_impl.cc index 9472e76..c31960b 100644 --- a/content/browser/indexed_db/indexed_db_context_impl.cc +++ b/content/browser/indexed_db/indexed_db_context_impl.cc
@@ -18,7 +18,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h"
diff --git a/content/browser/indexed_db/indexed_db_control_wrapper.cc b/content/browser/indexed_db/indexed_db_control_wrapper.cc index 3f1cf4c1..73c94a1 100644 --- a/content/browser/indexed_db/indexed_db_control_wrapper.cc +++ b/content/browser/indexed_db/indexed_db_control_wrapper.cc
@@ -4,7 +4,6 @@ #include "content/browser/indexed_db/indexed_db_control_wrapper.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "third_party/blink/public/common/storage_key/storage_key.h"
diff --git a/content/browser/indexed_db/indexed_db_cursor.cc b/content/browser/indexed_db/indexed_db_cursor.cc index 9ea934947..aa395181 100644 --- a/content/browser/indexed_db/indexed_db_cursor.cc +++ b/content/browser/indexed_db/indexed_db_cursor.cc
@@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/check_op.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "base/trace_event/base_tracing.h" #include "content/browser/indexed_db/indexed_db_callback_helpers.h" #include "content/browser/indexed_db/indexed_db_callbacks.h"
diff --git a/content/browser/indexed_db/indexed_db_database_callbacks.cc b/content/browser/indexed_db/indexed_db_database_callbacks.cc index 2b163fe..79df6b3 100644 --- a/content/browser/indexed_db/indexed_db_database_callbacks.cc +++ b/content/browser/indexed_db/indexed_db_database_callbacks.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "content/browser/indexed_db/indexed_db_context_impl.h" #include "content/browser/indexed_db/indexed_db_database_error.h"
diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host.cc b/content/browser/indexed_db/indexed_db_dispatcher_host.cc index 9d6cda0..9cfc6be4 100644 --- a/content/browser/indexed_db/indexed_db_dispatcher_host.cc +++ b/content/browser/indexed_db/indexed_db_dispatcher_host.cc
@@ -13,10 +13,10 @@ #include "base/memory/scoped_refptr.h" #include "base/process/process.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "base/trace_event/base_tracing.h" #include "build/build_config.h" #include "components/services/storage/filesystem_proxy_factory.h"
diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc b/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc index f92e500..ca70c41 100644 --- a/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc +++ b/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc
@@ -13,7 +13,6 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/test/bind.h"
diff --git a/content/browser/indexed_db/indexed_db_internals_ui.cc b/content/browser/indexed_db/indexed_db_internals_ui.cc index 0bc51e0e..28c48c2 100644 --- a/content/browser/indexed_db/indexed_db_internals_ui.cc +++ b/content/browser/indexed_db/indexed_db_internals_ui.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/platform_thread.h" #include "base/values.h"
diff --git a/content/browser/indexed_db/indexed_db_storage_key_state.h b/content/browser/indexed_db/indexed_db_storage_key_state.h index 28cdfa0..325a869 100644 --- a/content/browser/indexed_db/indexed_db_storage_key_state.h +++ b/content/browser/indexed_db/indexed_db_storage_key_state.h
@@ -16,6 +16,7 @@ #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/services/storage/indexed_db/scopes/disjoint_range_lock_manager.h" #include "content/browser/indexed_db/indexed_db_storage_key_state_handle.h"
diff --git a/content/browser/indexed_db/transaction_impl.cc b/content/browser/indexed_db/transaction_impl.cc index 5e08575..8b81575 100644 --- a/content/browser/indexed_db/transaction_impl.cc +++ b/content/browser/indexed_db/transaction_impl.cc
@@ -9,7 +9,6 @@ #include <vector> #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "content/browser/indexed_db/indexed_db_callback_helpers.h" #include "content/browser/indexed_db/indexed_db_connection.h" #include "content/browser/indexed_db/indexed_db_context_impl.h"
diff --git a/content/browser/loader/file_url_loader_factory.cc b/content/browser/loader/file_url_loader_factory.cc index 05a02f0..f59e417 100644 --- a/content/browser/loader/file_url_loader_factory.cc +++ b/content/browser/loader/file_url_loader_factory.cc
@@ -20,7 +20,6 @@ #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/content/browser/loader/file_url_loader_factory_browsertest.cc b/content/browser/loader/file_url_loader_factory_browsertest.cc index 5e57a9d..a91714e 100644 --- a/content/browser/loader/file_url_loader_factory_browsertest.cc +++ b/content/browser/loader/file_url_loader_factory_browsertest.cc
@@ -7,6 +7,7 @@ // This must be before Windows headers #include "base/callback_helpers.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/public/test/browser_test.h"
diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc index ce15866..80b7b60 100644 --- a/content/browser/loader/navigation_url_loader_impl.cc +++ b/content/browser/loader/navigation_url_loader_impl.cc
@@ -79,6 +79,8 @@ #include "net/traffic_annotation/network_traffic_annotation.h" #include "net/url_request/redirect_util.h" #include "ppapi/buildflags/buildflags.h" +#include "services/metrics/public/cpp/ukm_builders.h" +#include "services/metrics/public/cpp/ukm_recorder.h" #include "services/metrics/public/cpp/ukm_source_id.h" #include "services/network/public/cpp/constants.h" #include "services/network/public/cpp/features.h" @@ -867,6 +869,13 @@ network::mojom::URLResponseHeadPtr head, network::mojom::URLLoaderClientEndpointsPtr url_loader_client_endpoints, bool is_download) { + // Record navigation loader response metrics. We don't want to record the + // metrics for requests that had redirects to avoid adding noise to the + // latency measurements. + if (resource_request_->is_main_frame && url_chain_.size() == 1) { + RecordReceivedResponseUkmForMainFrame(); + } + network::mojom::URLResponseHead* head_ptr = head.get(); auto on_receive_response = base::BindOnce( &NavigationURLLoaderImpl::NotifyResponseStarted, @@ -967,6 +976,7 @@ const url::Origin& origin, const std::vector<network::mojom::WebClientHintsType>& accept_ch_frame, OnAcceptCHFrameReceivedCallback callback) { + received_accept_ch_frame_ = true; if (!base::FeatureList::IsEnabled(network::features::kAcceptCHFrame)) { std::move(callback).Run(net::OK); return; @@ -1229,7 +1239,10 @@ navigation_ui_data_(std::move(navigation_ui_data)), interceptors_(std::move(initial_interceptors)), download_policy_(request_info_->common_params->download_policy), - loader_creation_time_(base::TimeTicks::Now()) { + loader_creation_time_(base::TimeTicks::Now()), + ukm_source_id_(FrameTreeNode::GloballyFindByID(frame_tree_node_id_) + ->navigation_request() + ->GetNextPageUkmSourceId()) { DCHECK_CURRENTLY_ON(BrowserThread::UI); TRACE_EVENT_NESTABLE_ASYNC_BEGIN_WITH_TIMESTAMP1( @@ -1257,6 +1270,8 @@ // Check if a web UI scheme wants to handle this request. FrameTreeNode* frame_tree_node = FrameTreeNode::GloballyFindByID(frame_tree_node_id_); + const ukm::SourceIdObj ukm_id = ukm::SourceIdObj::FromInt64(ukm_source_id_); + const auto& schemes = URLDataManagerBackend::GetWebUISchemes(); std::string scheme = resource_request_->url.scheme(); mojo::PendingRemote<network::mojom::URLLoaderFactory> factory_for_webui; @@ -1268,9 +1283,7 @@ browser_context_, frame_tree_node->current_frame_host(), frame_tree_node->current_frame_host()->GetProcess()->GetID(), ContentBrowserClient::URLLoaderFactoryType::kNavigation, url::Origin(), - frame_tree_node->navigation_request()->GetNavigationId(), - ukm::SourceIdObj::FromInt64( - frame_tree_node->navigation_request()->GetNextPageUkmSourceId()), + frame_tree_node->navigation_request()->GetNavigationId(), ukm_id, &factory_receiver, /*header_client=*/nullptr, /*bypass_redirect_checks=*/nullptr, /*disable_secure_dns=*/nullptr, /*factory_override=*/nullptr); @@ -1289,10 +1302,7 @@ // Initialize proxied factory remote/receiver if necessary. // This also populates `bypass_redirect_checks_`. GetContentClient()->browser()->RegisterNonNetworkNavigationURLLoaderFactories( - frame_tree_node_id_, - ukm::SourceIdObj::FromInt64( - frame_tree_node->navigation_request()->GetNextPageUkmSourceId()), - &non_network_url_loader_factories_); + frame_tree_node_id_, ukm_id, &non_network_url_loader_factories_); // The embedder may want to proxy all network-bound URLLoaderFactory // receivers that it can. If it elects to do so, those proxies will be @@ -1305,9 +1315,7 @@ browser_context_, frame_tree_node->current_frame_host(), frame_tree_node->current_frame_host()->GetProcess()->GetID(), ContentBrowserClient::URLLoaderFactoryType::kNavigation, url::Origin(), - frame_tree_node->navigation_request()->GetNavigationId(), - ukm::SourceIdObj::FromInt64( - frame_tree_node->navigation_request()->GetNextPageUkmSourceId()), + frame_tree_node->navigation_request()->GetNavigationId(), ukm_id, &factory_receiver, &header_client, &bypass_redirect_checks_, /*disable_secure_dns=*/nullptr, /*factory_override=*/nullptr); if (devtools_instrumentation::WillCreateURLLoaderFactory( @@ -1575,9 +1583,8 @@ frame->GetProcess()->GetID(), ContentBrowserClient::URLLoaderFactoryType::kNavigation, url::Origin(), frame_tree_node->navigation_request()->GetNavigationId(), - ukm::SourceIdObj::FromInt64( - frame_tree_node->navigation_request()->GetNextPageUkmSourceId()), - &factory_receiver, /*header_client=*/nullptr, + ukm::SourceIdObj::FromInt64(ukm_source_id_), &factory_receiver, + /*header_client=*/nullptr, /*bypass_redirect_checks=*/nullptr, /*disable_secure_dns=*/nullptr, /*factory_override=*/nullptr); @@ -1596,4 +1603,20 @@ BindNonNetworkURLLoaderFactoryReceiver(url, std::move(factory_receiver)); } +void NavigationURLLoaderImpl::RecordReceivedResponseUkmForMainFrame() { + FrameTreeNode* frame_tree_node = + FrameTreeNode::GloballyFindByID(frame_tree_node_id_); + DCHECK(frame_tree_node); + + auto* ukm_recorder = ukm::UkmRecorder::Get(); + ukm::builders::Navigation_ReceivedResponse builder(ukm_source_id_); + base::TimeDelta latency = base::TimeTicks::Now() - loader_creation_time_; + builder.SetHasAcceptCHFrame(received_accept_ch_frame_) + .SetNavigationFirstResponseLatency(latency.InMilliseconds()); + builder.Record(ukm_recorder->Get()); + + // Reset whether the ACCEPT_CH frame was received for the navigation. + received_accept_ch_frame_ = false; +} + } // namespace content
diff --git a/content/browser/loader/navigation_url_loader_impl.h b/content/browser/loader/navigation_url_loader_impl.h index 95dae0a..eeafb3d 100644 --- a/content/browser/loader/navigation_url_loader_impl.h +++ b/content/browser/loader/navigation_url_loader_impl.h
@@ -19,6 +19,7 @@ #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "net/url_request/url_request.h" +#include "services/metrics/public/cpp/ukm_source_id.h" #include "services/network/public/mojom/accept_ch_frame_observer.mojom.h" #include "services/network/public/mojom/url_loader.mojom.h" #include "services/network/public/mojom/url_loader_factory.mojom.h" @@ -215,6 +216,9 @@ const net::HttpRequestHeaders& modified_cors_exempt_headers) override; bool SetNavigationTimeout(base::TimeDelta timeout) override; + // Records UKM for the navigation load. + void RecordReceivedResponseUkmForMainFrame(); + raw_ptr<NavigationURLLoaderDelegate> delegate_; raw_ptr<BrowserContext> browser_context_; raw_ptr<StoragePartitionImpl> storage_partition_; @@ -334,6 +338,12 @@ // The time this loader was created. base::TimeTicks loader_creation_time_; + // Whether the navigation processed an ACCEPT_CH frame in the TLS handshake. + bool received_accept_ch_frame_ = false; + + // UKM source id used for recording events associated with navigation loading. + const ukm::SourceId ukm_source_id_; + base::WeakPtrFactory<NavigationURLLoaderImpl> weak_factory_{this}; };
diff --git a/content/browser/loader/navigation_url_loader_impl_unittest.cc b/content/browser/loader/navigation_url_loader_impl_unittest.cc index 73d6138..22328220 100644 --- a/content/browser/loader/navigation_url_loader_impl_unittest.cc +++ b/content/browser/loader/navigation_url_loader_impl_unittest.cc
@@ -14,7 +14,6 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/unguessable_token.h" #include "content/browser/loader/navigation_loader_interceptor.h" #include "content/browser/loader/navigation_url_loader.h"
diff --git a/content/browser/loader/prefetch_browsertest_base.cc b/content/browser/loader/prefetch_browsertest_base.cc index f6cd502..7f7c0e3 100644 --- a/content/browser/loader/prefetch_browsertest_base.cc +++ b/content/browser/loader/prefetch_browsertest_base.cc
@@ -8,7 +8,6 @@ #include "base/callback.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "content/browser/loader/prefetch_url_loader_service.h" #include "content/browser/storage_partition_impl.h" #include "content/browser/web_package/signed_exchange_handler.h"
diff --git a/content/browser/loader/shared_cors_origin_access_list_impl.cc b/content/browser/loader/shared_cors_origin_access_list_impl.cc index f5b7c7d..b6a6ba5 100644 --- a/content/browser/loader/shared_cors_origin_access_list_impl.cc +++ b/content/browser/loader/shared_cors_origin_access_list_impl.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/feature_list.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/media/android/media_player_renderer.h b/content/browser/media/android/media_player_renderer.h index 35907d8..47c2dae 100644 --- a/content/browser/media/android/media_player_renderer.h +++ b/content/browser/media/android/media_player_renderer.h
@@ -8,6 +8,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "content/common/content_export.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/browser/media/audible_metrics.h b/content/browser/media/audible_metrics.h index 2a582a03..e5ade92 100644 --- a/content/browser/media/audible_metrics.h +++ b/content/browser/media/audible_metrics.h
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/browser/media/audio_loopback_stream_broker.cc b/content/browser/media/audio_loopback_stream_broker.cc index 464a7df..d2c85ed8 100644 --- a/content/browser/media/audio_loopback_stream_broker.cc +++ b/content/browser/media/audio_loopback_stream_broker.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/check_op.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/unguessable_token.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/media/audio_output_stream_broker.h b/content/browser/media/audio_output_stream_broker.h index 60a3dfe..f59e8d5 100644 --- a/content/browser/media/audio_output_stream_broker.h +++ b/content/browser/media/audio_output_stream_broker.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "content/browser/media/audio_stream_broker.h" #include "content/browser/renderer_host/media/audio_output_stream_observer_impl.h"
diff --git a/content/browser/media/audio_stream_monitor_unittest.cc b/content/browser/media/audio_stream_monitor_unittest.cc index 7bced04..ab2f4f1 100644 --- a/content/browser/media/audio_stream_monitor_unittest.cc +++ b/content/browser/media/audio_stream_monitor_unittest.cc
@@ -12,6 +12,7 @@ #include "base/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "build/chromeos_buildflags.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/invalidate_type.h"
diff --git a/content/browser/media/capture/desktop_capture_device.h b/content/browser/media/capture/desktop_capture_device.h index 98fafae..6ee64c1 100644 --- a/content/browser/media/capture/desktop_capture_device.h +++ b/content/browser/media/capture/desktop_capture_device.h
@@ -9,6 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "content/public/browser/desktop_media_id.h" #include "media/capture/video/video_capture_device.h"
diff --git a/content/browser/media/capture/io_surface_capture_device_base_mac.h b/content/browser/media/capture/io_surface_capture_device_base_mac.h index 0b4b7a9..27f78f7 100644 --- a/content/browser/media/capture/io_surface_capture_device_base_mac.h +++ b/content/browser/media/capture/io_surface_capture_device_base_mac.h
@@ -6,6 +6,7 @@ #define CONTENT_BROWSER_MEDIA_CAPTURE_IO_SURFACE_CAPTURE_DEVICE_BASE_MAC_H_ #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "content/common/content_export.h" #include "media/capture/video/video_capture_device.h"
diff --git a/content/browser/media/capture/mouse_cursor_overlay_controller.cc b/content/browser/media/capture/mouse_cursor_overlay_controller.cc index 71981f2..62e1211 100644 --- a/content/browser/media/capture/mouse_cursor_overlay_controller.cc +++ b/content/browser/media/capture/mouse_cursor_overlay_controller.cc
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/time/time.h" namespace content {
diff --git a/content/browser/media/midi_host.h b/content/browser/media/midi_host.h index 2b8f9d4..fce2e9f 100644 --- a/content/browser/media/midi_host.h +++ b/content/browser/media/midi_host.h
@@ -15,7 +15,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/thread_annotations.h" #include "base/tuple.h" #include "content/common/content_export.h"
diff --git a/content/browser/media/midi_host_unittest.cc b/content/browser/media/midi_host_unittest.cc index 2a3bcec..14678f4c 100644 --- a/content/browser/media/midi_host_unittest.cc +++ b/content/browser/media/midi_host_unittest.cc
@@ -10,6 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "content/public/test/browser_task_environment.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_context.h"
diff --git a/content/browser/media/session/media_session_controller_unittest.cc b/content/browser/media/session/media_session_controller_unittest.cc index 12e6f95..7056d4b 100644 --- a/content/browser/media/session/media_session_controller_unittest.cc +++ b/content/browser/media/session/media_session_controller_unittest.cc
@@ -6,6 +6,7 @@ #include <tuple> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "content/browser/media/media_web_contents_observer.h" #include "content/browser/media/session/audio_focus_delegate.h" #include "content/browser/media/session/media_session_controller.h"
diff --git a/content/browser/media/session/media_session_impl.cc b/content/browser/media/session/media_session_impl.cc index ea2d02c5..1605cd40 100644 --- a/content/browser/media/session/media_session_impl.cc +++ b/content/browser/media/session/media_session_impl.cc
@@ -13,6 +13,7 @@ #include "base/cxx17_backports.h" #include "base/ranges/algorithm.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "build/build_config.h" #include "components/url_formatter/url_formatter.h"
diff --git a/content/browser/media/session/media_session_impl_browsertest.cc b/content/browser/media/session/media_session_impl_browsertest.cc index 89c7f23..8944652 100644 --- a/content/browser/media/session/media_session_impl_browsertest.cc +++ b/content/browser/media/session/media_session_impl_browsertest.cc
@@ -19,6 +19,7 @@ #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "content/browser/media/session/audio_focus_delegate.h"
diff --git a/content/browser/media/session/media_session_uma_helper.h b/content/browser/media/session/media_session_uma_helper.h index 9d4384f..22c41bc 100644 --- a/content/browser/media/session/media_session_uma_helper.h +++ b/content/browser/media/session/media_session_uma_helper.h
@@ -7,6 +7,7 @@ #include "base/memory/raw_ptr.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "content/common/content_export.h" namespace base {
diff --git a/content/browser/media/webaudio/audio_context_manager_impl.h b/content/browser/media/webaudio/audio_context_manager_impl.h index d8fe5dfb..69c1350 100644 --- a/content/browser/media/webaudio/audio_context_manager_impl.h +++ b/content/browser/media/webaudio/audio_context_manager_impl.h
@@ -6,6 +6,7 @@ #define CONTENT_BROWSER_MEDIA_WEBAUDIO_AUDIO_CONTEXT_MANAGER_IMPL_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "content/public/browser/document_service.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/content/browser/native_io/native_io_host.cc b/content/browser/native_io/native_io_host.cc index 16b4981..d374bc0 100644 --- a/content/browser/native_io/native_io_host.cc +++ b/content/browser/native_io/native_io_host.cc
@@ -16,7 +16,6 @@ #include "base/files/file_util.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner.h" #include "base/task/task_traits.h"
diff --git a/content/browser/navigation_browsertest.cc b/content/browser/navigation_browsertest.cc index d24e7a2..a52e54c7 100644 --- a/content/browser/navigation_browsertest.cc +++ b/content/browser/navigation_browsertest.cc
@@ -23,6 +23,7 @@ #include "base/test/test_timeouts.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" +#include "components/ukm/test_ukm_recorder.h" #include "content/browser/browser_url_handler_impl.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/renderer_host/navigation_request.h" @@ -278,6 +279,15 @@ public: NavigationBaseBrowserTest() {} + void PreRunTestOnMainThread() override { + ContentBrowserTest::PreRunTestOnMainThread(); + test_ukm_recorder_ = std::make_unique<ukm::TestAutoSetUkmRecorder>(); + } + + const ukm::TestAutoSetUkmRecorder& test_ukm_recorder() const { + return *test_ukm_recorder_; + } + protected: void SetUpOnMainThread() override { host_resolver()->AddRule("*", "127.0.0.1"); @@ -294,6 +304,9 @@ RenderFrameHostImpl* current_frame_host() { return main_frame()->current_frame_host(); } + + private: + std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_ukm_recorder_; }; class NavigationBrowserTest : public NavigationBaseBrowserTest { @@ -406,6 +419,11 @@ // The RenderFrameHost should have changed. EXPECT_NE(second_rfh, current_frame_host()); + + // Check the UKM for navigation responses received. + EXPECT_EQ(3u, test_ukm_recorder() + .GetEntriesByName("Navigation.ReceivedResponse") + .size()); } // Ensure that renderer initiated same-site navigations work. @@ -525,6 +543,10 @@ EXPECT_TRUE(NavigateToURL(shell(), url)); EXPECT_EQ(url, observer.last_navigation_url()); EXPECT_TRUE(observer.last_navigation_succeeded()); + // Check the UKM for navigation responses received. + EXPECT_EQ(1u, test_ukm_recorder() + .GetEntriesByName("Navigation.ReceivedResponse") + .size()); } // Now navigate to an unreachable url. @@ -538,6 +560,11 @@ NavigationEntry* entry = web_contents()->GetController().GetLastCommittedEntry(); EXPECT_EQ(PAGE_TYPE_ERROR, entry->GetPageType()); + // No response on an unreachable URL, so the ReceivedResponse event should + // not have increased. + EXPECT_EQ(1u, test_ukm_recorder() + .GetEntriesByName("Navigation.ReceivedResponse") + .size()); } } @@ -1763,6 +1790,11 @@ response_2.WaitForRequest(); EXPECT_EQ("header_value", response_2.http_request()->headers.at("header_name")); + + // Redirect should not record a ReceivedResponse event. + EXPECT_EQ(0u, test_ukm_recorder() + .GetEntriesByName("Navigation.ReceivedResponse") + .size()); } // Add header on request start, modify it on redirect. @@ -3388,6 +3420,11 @@ EXPECT_FALSE(navigation_2.was_same_document()); EXPECT_EQ(wc->GetMainFrame()->GetLastCommittedURL(), url2); + + // Redirect should not record a ReceivedResponse event. + EXPECT_EQ(1u, test_ukm_recorder() + .GetEntriesByName("Navigation.ReceivedResponse") + .size()); } // 1. The browser navigates to a.html.
diff --git a/content/browser/network_context_client_base_impl.cc b/content/browser/network_context_client_base_impl.cc index 8673a45..bbb23a5 100644 --- a/content/browser/network_context_client_base_impl.cc +++ b/content/browser/network_context_client_base_impl.cc
@@ -5,7 +5,6 @@ #include "content/browser/network_context_client_base_impl.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/content/browser/network_service_client.cc b/content/browser/network_service_client.cc index 0d131b7..fa91d524 100644 --- a/content/browser/network_service_client.cc +++ b/content/browser/network_service_client.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/feature_list.h" -#include "base/task/post_task.h" #include "base/threading/sequence_bound.h" #include "base/unguessable_token.h" #include "build/build_config.h"
diff --git a/content/browser/network_service_instance_impl.cc b/content/browser/network_service_instance_impl.cc index b577151f..ce419ec 100644 --- a/content/browser/network_service_instance_impl.cc +++ b/content/browser/network_service_instance_impl.cc
@@ -27,6 +27,7 @@ #include "base/threading/sequence_local_storage_slot.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc index fd2c2d7..54f1f29 100644 --- a/content/browser/notifications/blink_notification_service_impl.cc +++ b/content/browser/notifications/blink_notification_service_impl.cc
@@ -11,7 +11,6 @@ #include "base/callback_helpers.h" #include "base/check_op.h" #include "base/feature_list.h" -#include "base/task/post_task.h" #include "content/browser/notifications/notification_event_dispatcher_impl.h" #include "content/browser/notifications/platform_notification_context_impl.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/payments/payment_app_context_impl.cc b/content/browser/payments/payment_app_context_impl.cc index 4542b26..3e51a65 100644 --- a/content/browser/payments/payment_app_context_impl.cc +++ b/content/browser/payments/payment_app_context_impl.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/containers/contains.h" -#include "base/task/post_task.h" #include "content/browser/payments/payment_manager.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/payments/payment_app_installer.cc b/content/browser/payments/payment_app_installer.cc index 7c91d64..e0cf181 100644 --- a/content/browser/payments/payment_app_installer.cc +++ b/content/browser/payments/payment_app_installer.cc
@@ -10,7 +10,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "content/browser/payments/payment_app_context_impl.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/browser/storage_partition_impl.h"
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index 2824157..edb9122 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc
@@ -19,7 +19,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h"
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index d757637..db8d8f5e 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc
@@ -283,8 +283,7 @@ // having a plugin launcher means we need to use another process instead of // just forking the zygote. process_->Launch( - std::make_unique<PpapiPluginSandboxedProcessLauncherDelegate>( - permissions_), + std::make_unique<PpapiPluginSandboxedProcessLauncherDelegate>(), std::move(cmd_line), true); return true; }
diff --git a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc index a0d6f03..28e6c85 100644 --- a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc +++ b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.cc
@@ -18,16 +18,6 @@ #endif namespace content { - -PpapiPluginSandboxedProcessLauncherDelegate:: - PpapiPluginSandboxedProcessLauncherDelegate( - const ppapi::PpapiPermissions& permissions) -#if BUILDFLAG(IS_WIN) - : permissions_(permissions) -#endif -{ -} - #if BUILDFLAG(IS_WIN) bool PpapiPluginSandboxedProcessLauncherDelegate::PreSpawnTarget( sandbox::TargetPolicy* policy) {
diff --git a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.h b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.h index 3b71e27..7cbf14c 100644 --- a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.h +++ b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate.h
@@ -9,7 +9,6 @@ #include "content/public/common/sandboxed_process_launcher_delegate.h" #include "content/public/common/zygote/zygote_buildflags.h" -#include "ppapi/shared_impl/ppapi_permissions.h" #if BUILDFLAG(USE_ZYGOTE_HANDLE) #include "content/public/common/zygote/zygote_handle.h" // nogncheck @@ -20,8 +19,7 @@ class CONTENT_EXPORT PpapiPluginSandboxedProcessLauncherDelegate : public content::SandboxedProcessLauncherDelegate { public: - explicit PpapiPluginSandboxedProcessLauncherDelegate( - const ppapi::PpapiPermissions& permissions); + PpapiPluginSandboxedProcessLauncherDelegate() = default; PpapiPluginSandboxedProcessLauncherDelegate( const PpapiPluginSandboxedProcessLauncherDelegate&) = delete; @@ -44,11 +42,6 @@ bool DisclaimResponsibility() override; bool EnableCpuSecurityMitigations() override; #endif - - private: -#if BUILDFLAG(IS_WIN) - const ppapi::PpapiPermissions permissions_; -#endif }; } // namespace content
diff --git a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate_unittest.cc b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate_unittest.cc index 131fee5..7467faf 100644 --- a/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate_unittest.cc +++ b/content/browser/ppapi_plugin_sandboxed_process_launcher_delegate_unittest.cc
@@ -55,8 +55,7 @@ ::sandbox::SandboxFactory::GetBrokerServices(); auto policy = broker->CreatePolicy(); - ppapi::PpapiPermissions permissions(ppapi::Permission::PERMISSION_NONE); - PpapiPluginSandboxedProcessLauncherDelegate test_ppapi_delegate(permissions); + PpapiPluginSandboxedProcessLauncherDelegate test_ppapi_delegate; // PreSpawn ::sandbox::ResultCode result =
diff --git a/content/browser/prerender/prerender_commit_deferring_condition.h b/content/browser/prerender/prerender_commit_deferring_condition.h index 647907f..ad780f7 100644 --- a/content/browser/prerender/prerender_commit_deferring_condition.h +++ b/content/browser/prerender/prerender_commit_deferring_condition.h
@@ -7,6 +7,7 @@ #include <memory> +#include "base/time/time.h" #include "content/public/browser/commit_deferring_condition.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/content/browser/prerender/prerender_host.cc b/content/browser/prerender/prerender_host.cc index 26c465b..46f078e 100644 --- a/content/browser/prerender/prerender_host.cc +++ b/content/browser/prerender/prerender_host.cc
@@ -10,6 +10,7 @@ #include "base/trace_event/common/trace_event_common.h" #include "base/trace_event/trace_conversion_helper.h" #include "base/trace_event/typed_macros.h" +#include "content/browser/devtools/devtools_instrumentation.h" #include "content/browser/prerender/prerender_host_registry.h" #include "content/browser/prerender/prerender_metrics.h" #include "content/browser/renderer_host/frame_tree.h" @@ -476,6 +477,7 @@ // source ID. RecordFinalStatus(FinalStatus::kActivated, attributes_.initiator_ukm_id, navigation_request.GetNextPageUkmSourceId()); + devtools_instrumentation::DidActivatePrerender(navigation_request); return page; }
diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/browser/push_messaging/push_messaging_manager.cc index e4fda8f..c890be0 100644 --- a/content/browser/push_messaging/push_messaging_manager.cc +++ b/content/browser/push_messaging/push_messaging_manager.cc
@@ -15,7 +15,6 @@ #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "content/browser/bad_message.h" #include "content/browser/child_process_security_policy_impl.h"
diff --git a/content/browser/quota/quota_change_dispatcher.cc b/content/browser/quota/quota_change_dispatcher.cc index 66b4153..0633deb 100644 --- a/content/browser/quota/quota_change_dispatcher.cc +++ b/content/browser/quota/quota_change_dispatcher.cc
@@ -12,7 +12,6 @@ #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "content/browser/quota/quota_manager_host.h" #include "content/public/common/content_switches.h"
diff --git a/content/browser/quota/quota_change_dispatcher_unittest.cc b/content/browser/quota/quota_change_dispatcher_unittest.cc index 66f18d3..2f2509f 100644 --- a/content/browser/quota/quota_change_dispatcher_unittest.cc +++ b/content/browser/quota/quota_change_dispatcher_unittest.cc
@@ -11,7 +11,6 @@ #include "base/containers/contains.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/content/browser/quota/quota_manager_host.cc b/content/browser/quota/quota_manager_host.cc index 727f137..3f43fe8 100644 --- a/content/browser/quota/quota_manager_host.cc +++ b/content/browser/quota/quota_manager_host.cc
@@ -13,7 +13,6 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/numerics/safe_conversions.h" -#include "base/task/post_task.h" #include "content/browser/quota/quota_change_dispatcher.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/back_forward_cache_metrics_browsertest.cc b/content/browser/renderer_host/back_forward_cache_metrics_browsertest.cc index 39997c42..81d14ed 100644 --- a/content/browser/renderer_host/back_forward_cache_metrics_browsertest.cc +++ b/content/browser/renderer_host/back_forward_cache_metrics_browsertest.cc
@@ -4,7 +4,6 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/renderer_host/code_cache_host_impl.cc b/content/browser/renderer_host/code_cache_host_impl.cc index fae7cab..364a513 100644 --- a/content/browser/renderer_host/code_cache_host_impl.cc +++ b/content/browser/renderer_host/code_cache_host_impl.cc
@@ -10,7 +10,6 @@ #include "base/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/thread.h" #include "build/build_config.h" #include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
diff --git a/content/browser/renderer_host/cookie_browsertest.cc b/content/browser/renderer_host/cookie_browsertest.cc index 53770aa..fb62165 100644 --- a/content/browser/renderer_host/cookie_browsertest.cc +++ b/content/browser/renderer_host/cookie_browsertest.cc
@@ -8,7 +8,6 @@ #include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "content/browser/bad_message.h"
diff --git a/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc b/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc index 0e2ecf26..9c7eae8 100644 --- a/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc +++ b/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc
@@ -22,7 +22,6 @@ #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/content/browser/renderer_host/dwrite_font_proxy_impl_win.cc b/content/browser/renderer_host/dwrite_font_proxy_impl_win.cc index ab5b215..733ca0b4 100644 --- a/content/browser/renderer_host/dwrite_font_proxy_impl_win.cc +++ b/content/browser/renderer_host/dwrite_font_proxy_impl_win.cc
@@ -22,7 +22,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h"
diff --git a/content/browser/renderer_host/frame_tree_browsertest.cc b/content/browser/renderer_host/frame_tree_browsertest.cc index 8294b79e..f2ce4c2 100644 --- a/content/browser/renderer_host/frame_tree_browsertest.cc +++ b/content/browser/renderer_host/frame_tree_browsertest.cc
@@ -7,6 +7,7 @@ #include "base/synchronization/lock.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" +#include "components/network_session_configurator/common/network_switches.h" #include "content/browser/fenced_frame/fenced_frame.h" #include "content/browser/fenced_frame/fenced_frame_url_mapping.h" #include "content/browser/renderer_host/frame_tree.h" @@ -27,6 +28,7 @@ #include "content/public/test/content_browser_test.h" #include "content/public/test/content_browser_test_utils.h" #include "content/public/test/fenced_frame_test_util.h" +#include "content/public/test/test_browser_context.h" #include "content/public/test/test_frame_navigation_observer.h" #include "content/public/test/test_navigation_observer.h" #include "content/public/test/test_utils.h" @@ -35,6 +37,7 @@ #include "content/test/content_browser_test_utils_internal.h" #include "content/test/fenced_frame_test_utils.h" #include "content/test/resource_load_observer.h" +#include "content/test/test_content_browser_client.h" #include "net/base/features.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" @@ -1820,6 +1823,135 @@ } namespace { +class ScopedInsecureContentTestContentBrowserClient + : public TestContentBrowserClient { + public: + ScopedInsecureContentTestContentBrowserClient() + : old_client(SetBrowserClientForTesting(this)) {} + ~ScopedInsecureContentTestContentBrowserClient() override { + SetBrowserClientForTesting(old_client); + } + + void OverrideWebkitPrefs(WebContents* web_contents, + blink::web_pref::WebPreferences* prefs) override { + // Browser will both run and display insecure content. + prefs->allow_running_insecure_content = true; + } + + private: + raw_ptr<ContentBrowserClient> old_client; +}; +} // namespace + +class FencedFrameIgnoreCertErrors : public FencedFrameTreeBrowserTest { + public: + FencedFrameIgnoreCertErrors() + : https_server_mismatched_(net::EmbeddedTestServer::TYPE_HTTPS) {} + + protected: + void SetUpOnMainThread() override { + https_server_mismatched_.ServeFilesFromSourceDirectory( + GetTestDataFilePath()); + https_server_mismatched_.SetSSLConfig( + net::EmbeddedTestServer::CERT_MISMATCHED_NAME); + ASSERT_TRUE(https_server_mismatched_.Start()); + + // We need to have a dedicated browser context for the tests. + // Or, SSLManager::UpdateEntry() doesn't update the entry if + // |ssl_host_state_delegate_| is nullptr. + browser_context_ = std::make_unique<TestBrowserContext>(); + + FencedFrameTreeBrowserTest::SetUpOnMainThread(); + } + + // Tests should call CreateWebContents() to use web_contents() in the test. + void CreateWebContents() { + ASSERT_FALSE(web_contents_.get()); + web_contents_ = + WebContents::Create(WebContents::CreateParams(browser_context_.get())); + } + + void SetUpCommandLine(base::CommandLine* command_line) override { + FencedFrameTreeBrowserTest::SetUpCommandLine(command_line); + // Browser will ignore certificate errors. + command_line->AppendSwitch(switches::kIgnoreCertificateErrors); + } + + void TearDownOnMainThread() override { + web_contents_.reset(); + FencedFrameTreeBrowserTest::TearDownOnMainThread(); + } + + void TearDown() override { + GetUIThreadTaskRunner({})->DeleteSoon(FROM_HERE, + browser_context_.release()); + FencedFrameTreeBrowserTest::TearDown(); + } + + net::EmbeddedTestServer* https_server_mismatched() { + return &https_server_mismatched_; + } + + WebContents* web_contents() { + // web_contents_ should be initialized before calling this method. + EXPECT_TRUE(web_contents_.get()); + return web_contents_.get(); + } + + private: + net::EmbeddedTestServer https_server_mismatched_; + std::unique_ptr<BrowserContext> browser_context_; + std::unique_ptr<WebContents> web_contents_; +}; + +IN_PROC_BROWSER_TEST_P(FencedFrameIgnoreCertErrors, FencedframeHasCertError) { + CreateWebContents(); + // Allow insecure content. + ScopedInsecureContentTestContentBrowserClient scoped_content_browser_client; + + GURL main_frame_url = + https_server_mismatched()->GetURL("a.test", "/hello.html"); + EXPECT_TRUE(NavigateToURL(web_contents(), main_frame_url)); + EXPECT_FALSE(web_contents() + ->GetController() + .GetLastCommittedEntry() + ->GetSSL() + .content_status & + SSLStatus::RAN_CONTENT_WITH_CERT_ERRORS); + + // It is safe to obtain the root frame tree node here, as it doesn't change. + FrameTreeNode* root = static_cast<WebContentsImpl*>(web_contents()) + ->GetPrimaryFrameTree() + .root(); + + // Create a fenced frame element. + EXPECT_TRUE(ExecJs(root, + "var f = document.createElement('fencedframe');" + "document.body.appendChild(f);")); + ASSERT_EQ(1U, root->child_count()); + FrameTreeNode* fenced_frame_root_node = + GetFencedFrameRootNode(root->child_at(0)); + EXPECT_TRUE(fenced_frame_root_node->IsInFencedFrameTree()); + + // Navigate the fenced frame. + GURL fenced_frame_url(https_server_mismatched()->GetURL( + "b.test", "/fenced_frames/title1.html")); + TestFrameNavigationObserver observer(fenced_frame_root_node); + EXPECT_TRUE(ExecJs(root, JsReplace("f.src = $1;", fenced_frame_url.spec()))); + observer.WaitForCommit(); + EXPECT_EQ( + fenced_frame_url, + fenced_frame_root_node->current_frame_host()->GetLastCommittedURL()); + + EXPECT_TRUE(web_contents() + ->GetController() + .GetLastCommittedEntry() + ->GetSSL() + .content_status & + SSLStatus::RAN_CONTENT_WITH_CERT_ERRORS); +} + +namespace { class TestJavaScriptDialogManager : public JavaScriptDialogManager, public WebContentsDelegate { public: @@ -2485,6 +2617,14 @@ blink::features::FencedFramesImplementationType::kMPArch), &FencedFrameTreeBrowserTest::DescribeParams); +INSTANTIATE_TEST_SUITE_P( + All, + FencedFrameIgnoreCertErrors, + ::testing::Values( + blink::features::FencedFramesImplementationType::kShadowDOM, + blink::features::FencedFramesImplementationType::kMPArch), + &FencedFrameTreeBrowserTest::DescribeParams); + // Parameterized on whether the feature is enabled or not. class UUIDFrameTreeBrowserTest : public FrameTreeBrowserTest, public ::testing::WithParamInterface<bool> {
diff --git a/content/browser/renderer_host/frame_tree_node.h b/content/browser/renderer_host/frame_tree_node.h index 115895a..56fc2bb9 100644 --- a/content/browser/renderer_host/frame_tree_node.h +++ b/content/browser/renderer_host/frame_tree_node.h
@@ -32,6 +32,7 @@ #include "third_party/blink/public/mojom/frame/user_activation_update_types.mojom.h" #include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom-forward.h" +#include "base/time/time.h" #include "url/gurl.h" #include "url/origin.h"
diff --git a/content/browser/renderer_host/input/fling_controller.h b/content/browser/renderer_host/input/fling_controller.h index f62a773..f88bca0 100644 --- a/content/browser/renderer_host/input/fling_controller.h +++ b/content/browser/renderer_host/input/fling_controller.h
@@ -6,6 +6,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_INPUT_FLING_CONTROLLER_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h" #include "content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h" #include "content/common/content_export.h"
diff --git a/content/browser/renderer_host/input/gesture_event_queue.h b/content/browser/renderer_host/input/gesture_event_queue.h index 2ac3b09..4285b8c 100644 --- a/content/browser/renderer_host/input/gesture_event_queue.h +++ b/content/browser/renderer_host/input/gesture_event_queue.h
@@ -9,6 +9,7 @@ #include "base/containers/circular_deque.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "content/browser/renderer_host/event_with_latency_info.h" #include "content/browser/renderer_host/input/fling_controller.h"
diff --git a/content/browser/renderer_host/input/mouse_wheel_phase_handler.h b/content/browser/renderer_host/input/mouse_wheel_phase_handler.h index 5206955..3d8e22b 100644 --- a/content/browser/renderer_host/input/mouse_wheel_phase_handler.h +++ b/content/browser/renderer_host/input/mouse_wheel_phase_handler.h
@@ -6,6 +6,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOUSE_WHEEL_PHASE_HANDLER_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "content/browser/renderer_host/render_widget_host_delegate.h" #include "third_party/blink/public/common/input/web_mouse_wheel_event.h"
diff --git a/content/browser/renderer_host/input/render_widget_host_latency_tracker.cc b/content/browser/renderer_host/input/render_widget_host_latency_tracker.cc index 4db609c..a46650a6 100644 --- a/content/browser/renderer_host/input/render_widget_host_latency_tracker.cc +++ b/content/browser/renderer_host/input/render_widget_host_latency_tracker.cc
@@ -11,6 +11,7 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/browser/renderer_host/render_widget_host_delegate.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/input/synthetic_mouse_driver.cc b/content/browser/renderer_host/input/synthetic_mouse_driver.cc index 40f5c879..7fd14cd 100644 --- a/content/browser/renderer_host/input/synthetic_mouse_driver.cc +++ b/content/browser/renderer_host/input/synthetic_mouse_driver.cc
@@ -4,6 +4,7 @@ #include "content/browser/renderer_host/input/synthetic_mouse_driver.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/browser/renderer_host/input/synthetic_gesture_target.h" #include "third_party/blink/public/common/input/synthetic_web_input_event_builders.h"
diff --git a/content/browser/renderer_host/input/synthetic_tap_gesture.h b/content/browser/renderer_host/input/synthetic_tap_gesture.h index a348df87..0f003a02 100644 --- a/content/browser/renderer_host/input/synthetic_tap_gesture.h +++ b/content/browser/renderer_host/input/synthetic_tap_gesture.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_TAP_GESTURE_H_ #define CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_TAP_GESTURE_H_ +#include "base/time/time.h" #include "content/browser/renderer_host/input/synthetic_gesture.h" #include "content/browser/renderer_host/input/synthetic_gesture_target.h" #include "content/browser/renderer_host/input/synthetic_pointer_driver.h"
diff --git a/content/browser/renderer_host/input/tap_suppression_controller_unittest.cc b/content/browser/renderer_host/input/tap_suppression_controller_unittest.cc index 357e32c..fad1fa30 100644 --- a/content/browser/renderer_host/input/tap_suppression_controller_unittest.cc +++ b/content/browser/renderer_host/input/tap_suppression_controller_unittest.cc
@@ -6,6 +6,7 @@ #include <memory> +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace content {
diff --git a/content/browser/renderer_host/input/touch_emulator.h b/content/browser/renderer_host/input/touch_emulator.h index 178ed73..faa64b1a 100644 --- a/content/browser/renderer_host/input/touch_emulator.h +++ b/content/browser/renderer_host/input/touch_emulator.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/containers/queue.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "content/browser/renderer_host/input/touch_emulator_client.h" #include "content/common/content_export.h" #include "content/common/cursors/webcursor.h"
diff --git a/content/browser/renderer_host/media/aec_dump_manager_impl.cc b/content/browser/renderer_host/media/aec_dump_manager_impl.cc index b1df9bbb..cc7b7ec 100644 --- a/content/browser/renderer_host/media/aec_dump_manager_impl.cc +++ b/content/browser/renderer_host/media/aec_dump_manager_impl.cc
@@ -6,7 +6,6 @@ #include "base/files/file.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "content/browser/webrtc/webrtc_internals.h" #include "mojo/public/cpp/base/file_mojom_traits.h"
diff --git a/content/browser/renderer_host/media/media_devices_dispatcher_host.cc b/content/browser/renderer_host/media/media_devices_dispatcher_host.cc index da7c0dd..a1410cfd 100644 --- a/content/browser/renderer_host/media/media_devices_dispatcher_host.cc +++ b/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
@@ -14,7 +14,6 @@ #include "base/command_line.h" #include "base/run_loop.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "build/build_config.h" #include "content/browser/media/media_devices_permission_checker.h"
diff --git a/content/browser/renderer_host/media/media_devices_manager.cc b/content/browser/renderer_host/media/media_devices_manager.cc index edd1eda..5af979b 100644 --- a/content/browser/renderer_host/media/media_devices_manager.cc +++ b/content/browser/renderer_host/media/media_devices_manager.cc
@@ -19,7 +19,6 @@ #include "base/location.h" #include "base/sequence_checker.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/threading/thread_checker.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc index 9285c94c..497e97f 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -11,7 +11,6 @@ #include "base/check_op.h" #include "base/command_line.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "build/build_config.h" #include "content/browser/renderer_host/media/media_stream_manager.h"
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h index d4f467d..62dbb1b 100644 --- a/content/browser/renderer_host/media/media_stream_manager.h +++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -41,6 +41,7 @@ #include "base/task/current_thread.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/browser/bad_message.h" #include "content/browser/media/capture_handle_manager.h"
diff --git a/content/browser/renderer_host/media/peer_connection_tracker_host.cc b/content/browser/renderer_host/media/peer_connection_tracker_host.cc index 3f629ffa..8b140b0 100644 --- a/content/browser/renderer_host/media/peer_connection_tracker_host.cc +++ b/content/browser/renderer_host/media/peer_connection_tracker_host.cc
@@ -12,7 +12,6 @@ #include "base/observer_list.h" #include "base/power_monitor/power_monitor.h" #include "base/ranges/algorithm.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/global_routing_id.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/browser/renderer_host/media/service_video_capture_provider.h b/content/browser/renderer_host/media/service_video_capture_provider.h index 731028a..6af6cbf 100644 --- a/content/browser/renderer_host/media/service_video_capture_provider.h +++ b/content/browser/renderer_host/media/service_video_capture_provider.h
@@ -7,6 +7,7 @@ #include "base/threading/sequence_bound.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "content/browser/renderer_host/media/ref_counted_video_source_provider.h"
diff --git a/content/browser/renderer_host/media/video_capture_browsertest.cc b/content/browser/renderer_host/media/video_capture_browsertest.cc index 2c929c8..d819ff9 100644 --- a/content/browser/renderer_host/media/video_capture_browsertest.cc +++ b/content/browser/renderer_host/media/video_capture_browsertest.cc
@@ -8,6 +8,7 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "content/browser/browser_main_loop.h"
diff --git a/content/browser/renderer_host/media/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h index 31708f9b..ad9ce8e0 100644 --- a/content/browser/renderer_host/media/video_capture_controller.h +++ b/content/browser/renderer_host/media/video_capture_controller.h
@@ -13,6 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/process/process.h" +#include "base/time/time.h" #include "base/token.h" #include "base/unguessable_token.h" #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
diff --git a/content/browser/renderer_host/mixed_content_navigation_throttle.cc b/content/browser/renderer_host/mixed_content_navigation_throttle.cc index 153619e..c553863 100644 --- a/content/browser/renderer_host/mixed_content_navigation_throttle.cc +++ b/content/browser/renderer_host/mixed_content_navigation_throttle.cc
@@ -361,8 +361,9 @@ } void MixedContentNavigationThrottle::MaybeHandleCertificateError() { - // Main frame certificate errors are handled separately in SSLManager. - if (navigation_handle()->IsInMainFrame()) { + // The outermost main frame certificate errors are handled separately in + // SSLManager. + if (!navigation_handle()->GetParentFrameOrOuterDocument()) { return; }
diff --git a/content/browser/renderer_host/navigation_throttle_runner.h b/content/browser/renderer_host/navigation_throttle_runner.h index 6d107a2..5c1ea30 100644 --- a/content/browser/renderer_host/navigation_throttle_runner.h +++ b/content/browser/renderer_host/navigation_throttle_runner.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "content/public/browser/navigation_throttle.h"
diff --git a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc index 2e7b09c..a1cd33e 100644 --- a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc +++ b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/pepper/pepper_file_io_host.cc b/content/browser/renderer_host/pepper/pepper_file_io_host.cc index c5cab7ae..dd5be1d 100644 --- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/callback.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc index c2ee718..8a8e231 100644 --- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc +++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h" #include "content/browser/renderer_host/pepper/pepper_file_io_host.h"
diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_host.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_host.cc index 427c45055..46cafa3 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_host.cc +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_host.cc
@@ -5,7 +5,6 @@ #include "content/browser/renderer_host/pepper/pepper_truetype_font_host.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "content/browser/renderer_host/pepper/pepper_truetype_font.h"
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc index 3bc8c8a1..eecb6fc5 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -7599,10 +7599,9 @@ media::MediaMetricsProvider::RecordAggregateWatchTimeCallback RenderFrameHostImpl::GetRecordAggregateWatchTimeCallback() { - // TODO(crbug.com/1240924): Consider if it needs a URL from the outermost - // frame, either. + // The URL used for UKM must always be the top level frame. return delegate_->GetRecordAggregateWatchTimeCallback( - GetMainFrame()->GetLastCommittedURL()); + GetOutermostMainFrame()->GetLastCommittedURL()); } void RenderFrameHostImpl::ResetWaitingState() { @@ -13343,6 +13342,14 @@ DisallowActivationReasonId::kCertificateErrors)) { return; } + // To update mixed content status in a fenced frame, we should call + // an outer frame's OnDidRunContentWithCertificateErrors. + // Otherwise, no update can be processed from fenced frames since they have + // their own NavigationController" + if (IsNestedWithinFencedFrame()) { + GetParentOrOuterDocument()->OnDidRunContentWithCertificateErrors(); + return; + } frame_tree_->controller().ssl_manager()->DidRunContentWithCertErrors( GetMainFrame()->GetLastCommittedOrigin().GetURL()); }
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 264e5e4..155d708 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc
@@ -17,7 +17,6 @@ #include "base/numerics/safe_math.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 8ee0213..c1e7240 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -27,7 +27,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/supports_user_data.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "base/trace_event/typed_macros.h"
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index a8fd313..a6f6bc7 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -34,7 +34,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm index 38d4fb3..f894420 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
@@ -15,7 +15,6 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/content/browser/renderer_host/text_input_client_mac_unittest.mm b/content/browser/renderer_host/text_input_client_mac_unittest.mm index 144a8ef1..84473c7d 100644 --- a/content/browser/renderer_host/text_input_client_mac_unittest.mm +++ b/content/browser/renderer_host/text_input_client_mac_unittest.mm
@@ -11,6 +11,7 @@ #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/browser/sandbox_support_mac_impl.mm b/content/browser/sandbox_support_mac_impl.mm index 034edcf1..aaec2cf 100644 --- a/content/browser/sandbox_support_mac_impl.mm +++ b/content/browser/sandbox_support_mac_impl.mm
@@ -5,7 +5,6 @@ #import "content/browser/sandbox_support_mac_impl.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #import "content/browser/theme_helper_mac.h" #include "content/common/mac/font_loader.h"
diff --git a/content/browser/scheduler/browser_io_thread_delegate.h b/content/browser/scheduler/browser_io_thread_delegate.h index c6aa200..b21cee3 100644 --- a/content/browser/scheduler/browser_io_thread_delegate.h +++ b/content/browser/scheduler/browser_io_thread_delegate.h
@@ -10,6 +10,7 @@ #include "base/memory/scoped_refptr.h" #include "base/task/sequence_manager/task_queue.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "content/browser/scheduler/browser_task_queues.h" #include "content/common/content_export.h"
diff --git a/content/browser/scheduler/browser_io_thread_delegate_unittest.cc b/content/browser/scheduler/browser_io_thread_delegate_unittest.cc index 8f07de58..323dd20 100644 --- a/content/browser/scheduler/browser_io_thread_delegate_unittest.cc +++ b/content/browser/scheduler/browser_io_thread_delegate_unittest.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "content/browser/scheduler/browser_task_executor.h" #include "content/browser/scheduler/browser_task_queues.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/content/browser/scheduler/browser_task_executor.cc b/content/browser/scheduler/browser_task_executor.cc index 6d71cb2..38d037f3 100644 --- a/content/browser/scheduler/browser_task_executor.cc +++ b/content/browser/scheduler/browser_task_executor.cc
@@ -10,9 +10,9 @@ #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/task/deferred_sequenced_task_runner.h" -#include "base/task/post_task.h" #include "base/task/task_traits_extension.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "content/browser/browser_process_io_thread.h"
diff --git a/content/browser/scheduler/browser_ui_thread_scheduler.h b/content/browser/scheduler/browser_ui_thread_scheduler.h index a56f9a6..b4e0642 100644 --- a/content/browser/scheduler/browser_ui_thread_scheduler.h +++ b/content/browser/scheduler/browser_ui_thread_scheduler.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/task/sequence_manager/task_queue.h" +#include "base/time/time.h" #include "content/browser/scheduler/browser_task_queues.h" #include "content/common/content_export.h"
diff --git a/content/browser/scheduler/browser_ui_thread_scheduler_unittest.cc b/content/browser/scheduler/browser_ui_thread_scheduler_unittest.cc index 42b28995..16d3fbd 100644 --- a/content/browser/scheduler/browser_ui_thread_scheduler_unittest.cc +++ b/content/browser/scheduler/browser_ui_thread_scheduler_unittest.cc
@@ -10,7 +10,6 @@ #include "base/callback_helpers.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/mock_callback.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/content/browser/scheduler/responsiveness/calculator_unittest.cc b/content/browser/scheduler/responsiveness/calculator_unittest.cc index f19a849..da0fee3 100644 --- a/content/browser/scheduler/responsiveness/calculator_unittest.cc +++ b/content/browser/scheduler/responsiveness/calculator_unittest.cc
@@ -5,6 +5,7 @@ #include "content/browser/scheduler/responsiveness/calculator.h" #include "base/test/metrics/histogram_tester.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/public/test/browser_task_environment.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/content/browser/scheduler/responsiveness/jank_monitor_impl.h b/content/browser/scheduler/responsiveness/jank_monitor_impl.h index 1ed4ab0..1a06431 100644 --- a/content/browser/scheduler/responsiveness/jank_monitor_impl.h +++ b/content/browser/scheduler/responsiveness/jank_monitor_impl.h
@@ -11,7 +11,6 @@ #include "base/observer_list.h" #include "base/sequence_checker.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/threading/thread.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/content/browser/scheduler/responsiveness/watcher.cc b/content/browser/scheduler/responsiveness/watcher.cc index 5cf4d34..5249651 100644 --- a/content/browser/scheduler/responsiveness/watcher.cc +++ b/content/browser/scheduler/responsiveness/watcher.cc
@@ -8,7 +8,6 @@ #include "base/callback_helpers.h" #include "base/pending_task.h" #include "base/power_monitor/power_monitor.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "content/browser/scheduler/responsiveness/calculator.h" #include "content/browser/scheduler/responsiveness/message_loop_observer.h"
diff --git a/content/browser/scheduler/responsiveness/watcher_unittest.cc b/content/browser/scheduler/responsiveness/watcher_unittest.cc index 7425624..1fe02678 100644 --- a/content/browser/scheduler/responsiveness/watcher_unittest.cc +++ b/content/browser/scheduler/responsiveness/watcher_unittest.cc
@@ -12,6 +12,7 @@ #include "base/pending_task.h" #include "base/run_loop.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "content/browser/scheduler/responsiveness/calculator.h" #include "content/browser/scheduler/responsiveness/native_event_observer.h"
diff --git a/content/browser/screenlock_monitor/screenlock_monitor_device_source_win.cc b/content/browser/screenlock_monitor/screenlock_monitor_device_source_win.cc index d4b77515..b874b78 100644 --- a/content/browser/screenlock_monitor/screenlock_monitor_device_source_win.cc +++ b/content/browser/screenlock_monitor/screenlock_monitor_device_source_win.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/win/message_window.h"
diff --git a/content/browser/service_worker/embedded_worker_instance.cc b/content/browser/service_worker/embedded_worker_instance.cc index f0c4a9f9..e3da3ba 100644 --- a/content/browser/service_worker/embedded_worker_instance.cc +++ b/content/browser/service_worker/embedded_worker_instance.cc
@@ -13,6 +13,7 @@ #include "base/feature_list.h" #include "base/metrics/histogram_macros.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "content/browser/bad_message.h" #include "content/browser/data_url_loader_factory.h"
diff --git a/content/browser/service_worker/fake_service_worker.h b/content/browser/service_worker/fake_service_worker.h index 849c3dd..1850e7a 100644 --- a/content/browser/service_worker/fake_service_worker.h +++ b/content/browser/service_worker/fake_service_worker.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/associated_remote.h" #include "mojo/public/cpp/bindings/pending_associated_remote.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc index 23ac4bd..a00257a33 100644 --- a/content/browser/service_worker/service_worker_browsertest.cc +++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -28,7 +28,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/service_worker/service_worker_client_utils.cc b/content/browser/service_worker/service_worker_client_utils.cc index 8e7f721..0d75e8a 100644 --- a/content/browser/service_worker/service_worker_client_utils.cc +++ b/content/browser/service_worker/service_worker_client_utils.cc
@@ -14,6 +14,7 @@ #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/renderer_host/navigation_request.h" #include "content/browser/renderer_host/navigator.h"
diff --git a/content/browser/service_worker/service_worker_clients_api_browsertest.cc b/content/browser/service_worker/service_worker_clients_api_browsertest.cc index 0395aed..412f3d08 100644 --- a/content/browser/service_worker/service_worker_clients_api_browsertest.cc +++ b/content/browser/service_worker/service_worker_clients_api_browsertest.cc
@@ -9,7 +9,6 @@ #include "base/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher_browsertest.cc b/content/browser/service_worker/service_worker_fetch_dispatcher_browsertest.cc index 611c2fc..e4659357 100644 --- a/content/browser/service_worker/service_worker_fetch_dispatcher_browsertest.cc +++ b/content/browser/service_worker/service_worker_fetch_dispatcher_browsertest.cc
@@ -7,7 +7,6 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/scoped_observation.h" -#include "base/task/post_task.h" #include "base/test/scoped_feature_list.h" #include "base/test/scoped_run_loop_timeout.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/service_worker/service_worker_host.cc b/content/browser/service_worker/service_worker_host.cc index dc4fc81b..d201626 100644 --- a/content/browser/service_worker/service_worker_host.cc +++ b/content/browser/service_worker/service_worker_host.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "content/browser/broadcast_channel/broadcast_channel_provider.h" #include "content/browser/broadcast_channel/broadcast_channel_service.h" #include "content/browser/code_cache/generated_code_cache_context.h"
diff --git a/content/browser/service_worker/service_worker_installed_script_loader.h b/content/browser/service_worker/service_worker_installed_script_loader.h index f99752b..4093329 100644 --- a/content/browser/service_worker/service_worker_installed_script_loader.h +++ b/content/browser/service_worker/service_worker_installed_script_loader.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_INSTALLED_SCRIPT_LOADER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_INSTALLED_SCRIPT_LOADER_H_ +#include "base/time/time.h" #include "content/browser/service_worker/service_worker_installed_script_reader.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/content/browser/service_worker/service_worker_installed_scripts_sender_unittest.cc b/content/browser/service_worker/service_worker_installed_scripts_sender_unittest.cc index 17b6281..d78198d 100644 --- a/content/browser/service_worker/service_worker_installed_scripts_sender_unittest.cc +++ b/content/browser/service_worker/service_worker_installed_scripts_sender_unittest.cc
@@ -8,7 +8,6 @@ #include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" #include "content/browser/service_worker/service_worker_context_core.h"
diff --git a/content/browser/service_worker/service_worker_main_resource_handle.cc b/content/browser/service_worker/service_worker_main_resource_handle.cc index c86cb6b9..ff7c624 100644 --- a/content/browser/service_worker/service_worker_main_resource_handle.cc +++ b/content/browser/service_worker/service_worker_main_resource_handle.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "content/browser/service_worker/service_worker_container_host.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/service_worker/service_worker_main_resource_loader.h b/content/browser/service_worker/service_worker_main_resource_loader.h index 2eca5fd..8d63fbca 100644 --- a/content/browser/service_worker/service_worker_main_resource_loader.h +++ b/content/browser/service_worker/service_worker_main_resource_loader.h
@@ -11,6 +11,7 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "content/browser/loader/navigation_loader_interceptor.h" #include "content/browser/service_worker/embedded_worker_status.h" #include "content/browser/service_worker/service_worker_fetch_dispatcher.h"
diff --git a/content/browser/service_worker/service_worker_metrics.cc b/content/browser/service_worker/service_worker_metrics.cc index 2a999ed..cc0b76f5 100644 --- a/content/browser/service_worker/service_worker_metrics.cc +++ b/content/browser/service_worker/service_worker_metrics.cc
@@ -12,7 +12,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "content/browser/service_worker/embedded_worker_status.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc b/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc index 827972d..1292aaf 100644 --- a/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc +++ b/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc
@@ -7,7 +7,6 @@ #include "base/callback_helpers.h" #include "base/guid.h" #include "base/memory/scoped_refptr.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/test/bind.h" #include "build/build_config.h"
diff --git a/content/browser/service_worker/service_worker_single_script_update_checker.h b/content/browser/service_worker/service_worker_single_script_update_checker.h index 2f25b2a..6252b54 100644 --- a/content/browser/service_worker/service_worker_single_script_update_checker.h +++ b/content/browser/service_worker/service_worker_single_script_update_checker.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_SINGLE_SCRIPT_UPDATE_CHECKER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_SINGLE_SCRIPT_UPDATE_CHECKER_H_ +#include "base/time/time.h" #include "content/browser/service_worker/service_worker_updated_script_loader.h" #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/content/browser/service_worker/service_worker_update_checker.cc b/content/browser/service_worker/service_worker_update_checker.cc index 0cae4e6..8ed5ad6 100644 --- a/content/browser/service_worker/service_worker_update_checker.cc +++ b/content/browser/service_worker/service_worker_update_checker.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/trace_event/trace_event.h" #include "content/browser/loader/browser_initiated_resource_request.h" #include "content/browser/service_worker/service_worker_consts.h"
diff --git a/content/browser/service_worker/service_worker_update_checker.h b/content/browser/service_worker/service_worker_update_checker.h index c5c26da..6a76493f 100644 --- a/content/browser/service_worker/service_worker_update_checker.h +++ b/content/browser/service_worker/service_worker_update_checker.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "content/browser/service_worker/service_worker_single_script_update_checker.h" #include "content/browser/service_worker/service_worker_updated_script_loader.h" #include "content/common/content_export.h"
diff --git a/content/browser/service_worker/service_worker_updated_script_loader.cc b/content/browser/service_worker/service_worker_updated_script_loader.cc index 9f08c6d..f855629 100644 --- a/content/browser/service_worker/service_worker_updated_script_loader.cc +++ b/content/browser/service_worker/service_worker_updated_script_loader.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/numerics/safe_conversions.h" -#include "base/task/post_task.h" #include "content/browser/service_worker/service_worker_cache_writer.h" #include "content/browser/service_worker/service_worker_consts.h" #include "content/browser/service_worker/service_worker_context_core.h"
diff --git a/content/browser/service_worker/service_worker_updated_script_loader.h b/content/browser/service_worker/service_worker_updated_script_loader.h index e9705fc9..804bd00 100644 --- a/content/browser/service_worker/service_worker_updated_script_loader.h +++ b/content/browser/service_worker/service_worker_updated_script_loader.h
@@ -5,6 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_UPDATED_SCRIPT_LOADER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_UPDATED_SCRIPT_LOADER_H_ +#include "base/time/time.h" #include "content/browser/service_worker/service_worker_cache_writer.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc index d184a22..495b079 100644 --- a/content/browser/service_worker/service_worker_version.cc +++ b/content/browser/service_worker/service_worker_version.cc
@@ -23,7 +23,6 @@ #include "base/metrics/histogram_macros.h" #include "base/observer_list.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_clock.h"
diff --git a/content/browser/site_per_process_hit_test_browsertest.cc b/content/browser/site_per_process_hit_test_browsertest.cc index 0ae5c45..03c0c9b 100644 --- a/content/browser/site_per_process_hit_test_browsertest.cc +++ b/content/browser/site_per_process_hit_test_browsertest.cc
@@ -14,7 +14,6 @@ #include "base/memory/scoped_refptr.h" #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_timeouts.h"
diff --git a/content/browser/sms/webotp_service_unittest.cc b/content/browser/sms/webotp_service_unittest.cc index 5264bc02..6a97111c 100644 --- a/content/browser/sms/webotp_service_unittest.cc +++ b/content/browser/sms/webotp_service_unittest.cc
@@ -15,7 +15,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc index d529c1db..3a663cf2 100644 --- a/content/browser/ssl/ssl_manager.cc +++ b/content/browser/ssl/ssl_manager.cc
@@ -12,7 +12,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "base/supports_user_data.h" -#include "base/task/post_task.h" #include "base/trace_event/optional_trace_event.h" #include "content/browser/devtools/devtools_instrumentation.h" #include "content/browser/renderer_host/navigation_entry_impl.h"
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc index 9a71402d..d65d5e2b 100644 --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc
@@ -40,6 +40,7 @@ #include "components/services/storage/public/mojom/filesystem/directory.mojom.h" #include "components/services/storage/public/mojom/indexed_db_control.mojom.h" #include "components/services/storage/public/mojom/storage_service.mojom.h" +#include "components/services/storage/shared_storage/shared_storage_manager.h" #include "components/services/storage/storage_service_impl.h" #include "components/variations/net/variations_http_headers.h" #include "content/browser/aggregation_service/aggregation_service_features.h" @@ -968,6 +969,7 @@ InterestGroupManagerImpl* interest_group_manager, AttributionManagerImpl* attribution_manager, AggregationServiceImpl* aggregation_service, + storage::SharedStorageManager* shared_storage_manager, bool perform_storage_cleanup, const base::Time begin, const base::Time end); @@ -997,10 +999,12 @@ kPluginPrivate = 7, kConversions = 8, kAggregationService = 9, - kMaxValue = kAggregationService, + kSharedStorage = 10, + kMaxValue = kSharedStorage, }; base::OnceClosure CreateTaskCompletionClosure(TracingDataType data_type); + void OnTaskComplete(TracingDataType data_type, int tracing_id); // Callable on any thread. void RecordUnfinishedSubTasks(); @@ -1369,6 +1373,14 @@ filesystem_context_, is_in_memory(), browser_context_->GetSpecialStoragePolicy(), quota_manager_proxy); #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) + + if (base::FeatureList::IsEnabled(blink::features::kSharedStorageAPI)) { + base::FilePath shared_storage_path = + is_in_memory() ? base::FilePath() + : path.Append(storage::kSharedStoragePath); + shared_storage_manager_ = std::make_unique<storage::SharedStorageManager>( + shared_storage_path, special_storage_policy_); + } } void StoragePartitionImpl::OnStorageServiceDisconnected() { @@ -1712,6 +1724,10 @@ return proto_database_provider_.get(); } +storage::SharedStorageManager* StoragePartitionImpl::GetSharedStorageManager() { + return shared_storage_manager_.get(); +} + void StoragePartitionImpl::OpenLocalStorage( const blink::StorageKey& storage_key, const blink::LocalFrameToken& local_frame_token, @@ -2191,7 +2207,8 @@ quota_manager_.get(), special_storage_policy_.get(), filesystem_context_.get(), GetCookieManagerForBrowserProcess(), interest_group_manager_.get(), attribution_manager_.get(), - aggregation_service_.get(), perform_storage_cleanup, begin, end); + aggregation_service_.get(), shared_storage_manager_.get(), + perform_storage_cleanup, begin, end); } void StoragePartitionImpl::DeletionHelperDone(base::OnceClosure callback) { @@ -2393,6 +2410,7 @@ InterestGroupManagerImpl* interest_group_manager, AttributionManagerImpl* attribution_manager, AggregationServiceImpl* aggregation_service, + storage::SharedStorageManager* shared_storage_manager, bool perform_storage_cleanup, const base::Time begin, const base::Time end) { @@ -2529,6 +2547,25 @@ CreateTaskCompletionClosure(TracingDataType::kPluginPrivate))); } #endif // BUILDFLAG(ENABLE_PLUGINS) + + if (base::FeatureList::IsEnabled(blink::features::kSharedStorageAPI) && + shared_storage_manager && + (remove_mask_ & REMOVE_DATA_MASK_SHARED_STORAGE)) { + auto shared_storage_purge_callback = base::BindOnce( + [](base::WeakPtr<storage::SharedStorageManager> manager, + base::OnceClosure callback, + storage::SharedStorageDatabase::OperationResult result) { + if (manager) + manager->OnOperationResult(result); + std::move(callback).Run(); + }, + shared_storage_manager->GetWeakPtr(), + CreateTaskCompletionClosure(TracingDataType::kSharedStorage)); + + shared_storage_manager->PurgeMatchingOrigins( + origin_matcher, begin, end, std::move(shared_storage_purge_callback), + perform_storage_cleanup); + } } void StoragePartitionImpl::ClearDataForOrigin(
diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h index 8b123a2..21d8dd5 100644 --- a/content/browser/storage_partition_impl.h +++ b/content/browser/storage_partition_impl.h
@@ -56,6 +56,10 @@ class IsolationInfo; } // namespace net +namespace storage { +class SharedStorageManager; +} + namespace content { class AggregationServiceImpl; @@ -252,6 +256,10 @@ MediaLicenseManager* GetMediaLicenseManager(); #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) + // Gets the SharedStorageManager for the StoragePartition, or nullptr if it + // doesn't exist because the feature is disabled. + storage::SharedStorageManager* GetSharedStorageManager(); + // blink::mojom::DomStorage interface. void OpenLocalStorage( const blink::StorageKey& storage_key, @@ -644,6 +652,9 @@ std::unique_ptr<MediaLicenseManager> media_license_manager_; #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) + // Owning pointer to the SharedStorageManager for this partition. + std::unique_ptr<storage::SharedStorageManager> shared_storage_manager_; + // TODO(crbug.com/1205695): ComputePressureManager should live elsewher. The // Compute Pressure API does not store data. std::unique_ptr<ComputePressureManager> compute_pressure_manager_;
diff --git a/content/browser/storage_partition_impl_unittest.cc b/content/browser/storage_partition_impl_unittest.cc index 2d629e7..860a0f1 100644 --- a/content/browser/storage_partition_impl_unittest.cc +++ b/content/browser/storage_partition_impl_unittest.cc
@@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -26,9 +26,11 @@ #include "base/scoped_observation.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h" +#include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/scoped_command_line.h" #include "base/test/scoped_feature_list.h" +#include "base/test/test_future.h" #include "base/threading/sequence_local_storage_slot.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" @@ -41,6 +43,10 @@ #include "components/services/storage/public/mojom/local_storage_control.mojom.h" #include "components/services/storage/public/mojom/partition.mojom.h" #include "components/services/storage/public/mojom/storage_service.mojom.h" +#include "components/services/storage/public/mojom/storage_usage_info.mojom.h" +#include "components/services/storage/shared_storage/async_shared_storage_database_impl.h" +#include "components/services/storage/shared_storage/shared_storage_manager.h" +#include "components/services/storage/shared_storage/shared_storage_options.h" #include "components/services/storage/storage_service_impl.h" #include "content/browser/aggregation_service/aggregation_service_impl.h" #include "content/browser/attribution_reporting/attribution_manager_impl.h" @@ -921,7 +927,8 @@ // Configures the Conversion API to run in memory to speed up its // initialization and avoid timeouts. See https://crbug.com/1080764. AttributionManagerImpl::RunInMemoryForTesting(); - feature_list_.InitWithFeatures({blink::features::kInterestGroupStorage}, + feature_list_.InitWithFeatures({blink::features::kInterestGroupStorage, + blink::features::kSharedStorageAPI}, {}); } @@ -2428,4 +2435,207 @@ } } +class StoragePartitionImplSharedStorageTest : public StoragePartitionImplTest { + public: + StoragePartitionImplSharedStorageTest() + : storage_partition_(browser_context()->GetDefaultStoragePartition()), + shared_storage_manager_( + static_cast<StoragePartitionImpl*>(storage_partition_) + ->GetSharedStorageManager()) { + feature_list_.InitWithFeatures({blink::features::kInterestGroupStorage, + blink::features::kSharedStorageAPI}, + {}); + } + + StoragePartitionImplSharedStorageTest( + const StoragePartitionImplSharedStorageTest&) = delete; + StoragePartitionImplSharedStorageTest& operator=( + const StoragePartitionImplSharedStorageTest&) = delete; + + ~StoragePartitionImplSharedStorageTest() override { + task_environment()->RunUntilIdle(); + } + + scoped_refptr<storage::SpecialStoragePolicy> GetSpecialStoragePolicy() { + return base::WrapRefCounted<storage::SpecialStoragePolicy>( + static_cast<content::StoragePartitionImpl*>(storage_partition_) + ->browser_context() + ->GetSpecialStoragePolicy()); + } + + // Returns true, if the given origin URL exists. + bool SharedStorageExistsForOrigin(const url::Origin& origin) { + for (const auto& info : GetSharedStorageUsage()) { + if (origin == info->origin) + return true; + } + return false; + } + + void AddSharedStorageTestData(const url::Origin& origin1, + const url::Origin& origin2, + const url::Origin& origin3) { + base::FilePath path = + storage_partition_->GetPath().Append(storage::kSharedStoragePath); + std::unique_ptr<storage::AsyncSharedStorageDatabase> database = + storage::AsyncSharedStorageDatabaseImpl::Create( + path, + base::ThreadPool::CreateSequencedTaskRunner( + {base::MayBlock(), base::WithBaseSyncPrimitives(), + base::TaskShutdownBehavior::BLOCK_SHUTDOWN}), + GetSpecialStoragePolicy(), + storage::SharedStorageOptions::Create()->GetDatabaseOptions()); + + base::test::TestFuture<bool> future; + + DCHECK(database); + DCHECK(static_cast<storage::AsyncSharedStorageDatabaseImpl*>(database.get()) + ->GetSequenceBoundDatabaseForTesting()); + static_cast<storage::AsyncSharedStorageDatabaseImpl*>(database.get()) + ->GetSequenceBoundDatabaseForTesting() + ->AsyncCall(&storage::SharedStorageDatabase::PopulateDatabaseForTesting) + .WithArgs(origin1, origin2, origin3) + .Then(future.GetCallback()); + + EXPECT_TRUE(future.Get()); + + // Ensure that this database is fully closed before checking for existence. + database.reset(); + task_environment()->RunUntilIdle(); + + EXPECT_TRUE(SharedStorageExistsForOrigin(origin1)); + EXPECT_TRUE(SharedStorageExistsForOrigin(origin2)); + EXPECT_TRUE(SharedStorageExistsForOrigin(origin3)); + + task_environment()->RunUntilIdle(); + } + + private: + std::vector<storage::mojom::StorageUsageInfoPtr> GetSharedStorageUsage() { + DCHECK(shared_storage_manager_); + + base::test::TestFuture<std::vector<storage::mojom::StorageUsageInfoPtr>> + future; + shared_storage_manager_->FetchOrigins(future.GetCallback()); + return future.Take(); + } + + base::test::ScopedFeatureList feature_list_; + + // We don't own these pointers. + StoragePartition* const storage_partition_; + storage::SharedStorageManager* shared_storage_manager_; +}; + +TEST_F(StoragePartitionImplSharedStorageTest, + RemoveUnprotectedSharedStorageForever) { + const url::Origin kOrigin1 = url::Origin::Create(GURL("http://host1:1/")); + const url::Origin kOrigin2 = url::Origin::Create(GURL("http://host2:1/")); + const url::Origin kOrigin3 = url::Origin::Create(GURL("http://host3:1/")); + + // Protect kOrigin1. + auto mock_policy = base::MakeRefCounted<storage::MockSpecialStoragePolicy>(); + mock_policy->AddProtected(kOrigin1.GetURL()); + + AddSharedStorageTestData(kOrigin1, kOrigin2, kOrigin3); + + StoragePartitionImpl* partition = static_cast<StoragePartitionImpl*>( + browser_context()->GetDefaultStoragePartition()); + partition->GetSharedStorageManager()->OverrideSpecialStoragePolicyForTesting( + mock_policy.get()); + + base::RunLoop clear_run_loop; + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, + base::BindOnce(&ClearStuff, + StoragePartitionImpl::REMOVE_DATA_MASK_SHARED_STORAGE, + partition, base::Time(), base::Time::Max(), + base::BindRepeating(&DoesOriginMatchForUnprotectedWeb), + &clear_run_loop)); + clear_run_loop.Run(); + + // ClearData only guarantees that tasks to delete data are scheduled when its + // callback is invoked. It doesn't guarantee data has actually been cleared. + // So run all scheduled tasks to make sure data is cleared. + base::RunLoop().RunUntilIdle(); + + EXPECT_TRUE(SharedStorageExistsForOrigin(kOrigin1)); + EXPECT_FALSE(SharedStorageExistsForOrigin(kOrigin2)); + EXPECT_FALSE(SharedStorageExistsForOrigin(kOrigin3)); +} + +TEST_F(StoragePartitionImplSharedStorageTest, + RemoveProtectedSharedStorageForever) { + const url::Origin kOrigin1 = url::Origin::Create(GURL("http://host1:1/")); + const url::Origin kOrigin2 = url::Origin::Create(GURL("http://host2:1/")); + const url::Origin kOrigin3 = url::Origin::Create(GURL("http://host3:1/")); + + // Protect kOrigin1. + auto mock_policy = base::MakeRefCounted<storage::MockSpecialStoragePolicy>(); + mock_policy->AddProtected(kOrigin1.GetURL()); + + AddSharedStorageTestData(kOrigin1, kOrigin2, kOrigin3); + + StoragePartitionImpl* partition = static_cast<StoragePartitionImpl*>( + browser_context()->GetDefaultStoragePartition()); + partition->GetSharedStorageManager()->OverrideSpecialStoragePolicyForTesting( + mock_policy.get()); + + base::RunLoop clear_run_loop; + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, + base::BindOnce(&ClearStuff, + StoragePartitionImpl::REMOVE_DATA_MASK_SHARED_STORAGE, + partition, base::Time(), base::Time::Max(), + base::BindRepeating( + &DoesOriginMatchForBothProtectedAndUnprotectedWeb), + &clear_run_loop)); + clear_run_loop.Run(); + + // ClearData only guarantees that tasks to delete data are scheduled when its + // callback is invoked. It doesn't guarantee data has actually been cleared. + // So run all scheduled tasks to make sure data is cleared. + base::RunLoop().RunUntilIdle(); + + // Even if kOrigin1 is protected, it will be deleted since we specify + // ClearData to delete protected data. + EXPECT_FALSE(SharedStorageExistsForOrigin(kOrigin1)); + EXPECT_FALSE(SharedStorageExistsForOrigin(kOrigin2)); + EXPECT_FALSE(SharedStorageExistsForOrigin(kOrigin3)); +} + +TEST_F(StoragePartitionImplSharedStorageTest, RemoveSharedStorageForLastWeek) { + const url::Origin kOrigin1 = url::Origin::Create(GURL("http://host1:1/")); + const url::Origin kOrigin2 = url::Origin::Create(GURL("http://host2:1/")); + const url::Origin kOrigin3 = url::Origin::Create(GURL("http://host3:1/")); + + AddSharedStorageTestData(kOrigin1, kOrigin2, kOrigin3); + + StoragePartitionImpl* partition = static_cast<StoragePartitionImpl*>( + browser_context()->GetDefaultStoragePartition()); + DCHECK(partition); + base::Time a_week_ago = base::Time::Now() - base::Days(7); + + base::RunLoop clear_run_loop; + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, + base::BindOnce(&ClearStuff, + StoragePartitionImpl::REMOVE_DATA_MASK_SHARED_STORAGE, + partition, a_week_ago, base::Time::Max(), + base::BindRepeating( + &DoesOriginMatchForBothProtectedAndUnprotectedWeb), + &clear_run_loop)); + clear_run_loop.Run(); + + // ClearData only guarantees that tasks to delete data are scheduled when its + // callback is invoked. It doesn't guarantee data has actually been cleared. + // So run all scheduled tasks to make sure data is cleared. + base::RunLoop().RunUntilIdle(); + + // kOrigin1 and kOrigin2 do not have age more than a week. + EXPECT_FALSE(SharedStorageExistsForOrigin(kOrigin1)); + EXPECT_FALSE(SharedStorageExistsForOrigin(kOrigin2)); + EXPECT_TRUE(SharedStorageExistsForOrigin(kOrigin3)); +} + } // namespace content
diff --git a/content/browser/tracing/background_tracing_rule.cc b/content/browser/tracing/background_tracing_rule.cc index 6085d60..48907fd 100644 --- a/content/browser/tracing/background_tracing_rule.cc +++ b/content/browser/tracing/background_tracing_rule.cc
@@ -15,6 +15,7 @@ #include "base/rand_util.h" #include "base/strings/safe_sprintf.h" #include "base/strings/strcat.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/trace_event/trace_event.h" #include "base/trace_event/trace_id_helper.h"
diff --git a/content/browser/tracing/cast_tracing_agent.cc b/content/browser/tracing/cast_tracing_agent.cc index 580d40f64..ab450b3 100644 --- a/content/browser/tracing/cast_tracing_agent.cc +++ b/content/browser/tracing/cast_tracing_agent.cc
@@ -13,7 +13,6 @@ #include "base/no_destructor.h" #include "base/sequence_checker.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_config.h" #include "chromecast/tracing/system_tracer.h"
diff --git a/content/browser/utility_process_host.h b/content/browser/utility_process_host.h index b5784b7..41589ce9 100644 --- a/content/browser/utility_process_host.h +++ b/content/browser/utility_process_host.h
@@ -13,6 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/process/launch.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromecast_buildflags.h" #include "content/common/child_process.mojom.h"
diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc index 3b45363..2b5bdee 100644 --- a/content/browser/web_contents/web_contents_android.cc +++ b/content/browser/web_contents/web_contents_android.cc
@@ -20,7 +20,6 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "base/metrics/user_metrics.h" -#include "base/task/post_task.h" #include "base/threading/scoped_blocking_call.h" #include "content/browser/android/java/gin_java_bridge_dispatcher_host.h" #include "content/browser/media/media_web_contents_observer.h"
diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc index 34215e8..b8667baf 100644 --- a/content/browser/web_contents/web_contents_impl_browsertest.cc +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc
@@ -5523,8 +5523,8 @@ base::WeakPtrFactory<MediaWatchTimeChangedDelegate> weak_factory_{this}; }; -// Tests that a media in a fenced frame reports the watch time based on its -// own main frame. +// Tests that a media in a fenced frame reports the watch time with the url from +// the top level frame. IN_PROC_BROWSER_TEST_F(WebContentsFencedFrameBrowserTest, MediaWatchTimeCallback) { MediaWatchTimeChangedDelegate delegate(web_contents()); @@ -5554,8 +5554,8 @@ ->GetRecordAggregateWatchTimeCallback(); std::move(record_playback_cb) .Run(base::TimeDelta(), base::TimeDelta(), true, true); - // Check if the URL is from the fenced frame url. - DCHECK_EQ(fenced_frame_url, delegate.watch_time().url); + // Check if the URL is from the top level frame. + DCHECK_EQ(top_url, delegate.watch_time().url); } #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && defined(PA_ALLOW_PCSCAN)
diff --git a/content/browser/web_package/signed_exchange_devtools_proxy.cc b/content/browser/web_package/signed_exchange_devtools_proxy.cc index b73ac44..f6a5f98 100644 --- a/content/browser/web_package/signed_exchange_devtools_proxy.cc +++ b/content/browser/web_package/signed_exchange_devtools_proxy.cc
@@ -5,7 +5,6 @@ #include "content/browser/web_package/signed_exchange_devtools_proxy.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/trace_event/trace_event.h" #include "content/browser/devtools/devtools_instrumentation.h" #include "content/browser/loader/navigation_url_loader_impl.h"
diff --git a/content/browser/web_package/signed_exchange_reporter.h b/content/browser/web_package/signed_exchange_reporter.h index b2d76bf0..d3c7e8e7 100644 --- a/content/browser/web_package/signed_exchange_reporter.h +++ b/content/browser/web_package/signed_exchange_reporter.h
@@ -8,6 +8,7 @@ #include <memory> #include <string> +#include "base/time/time.h" #include "content/browser/web_package/signed_exchange_error.h" #include "content/common/content_export.h" #include "net/base/ip_address.h"
diff --git a/content/browser/web_package/signed_exchange_request_handler_browsertest.cc b/content/browser/web_package/signed_exchange_request_handler_browsertest.cc index 228456e..fe6c0004 100644 --- a/content/browser/web_package/signed_exchange_request_handler_browsertest.cc +++ b/content/browser/web_package/signed_exchange_request_handler_browsertest.cc
@@ -12,7 +12,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/web_package/web_bundle_blob_data_source_unittest.cc b/content/browser/web_package/web_bundle_blob_data_source_unittest.cc index 74f56fc..b7f023b 100644 --- a/content/browser/web_package/web_bundle_blob_data_source_unittest.cc +++ b/content/browser/web_package/web_bundle_blob_data_source_unittest.cc
@@ -5,7 +5,6 @@ #include "content/browser/web_package/web_bundle_blob_data_source.h" #include "base/files/scoped_temp_dir.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/test_future.h" #include "content/public/test/browser_task_environment.h"
diff --git a/content/browser/web_package/web_bundle_url_loader_factory.cc b/content/browser/web_package/web_bundle_url_loader_factory.cc index 7dca07de..d2d2394 100644 --- a/content/browser/web_package/web_bundle_url_loader_factory.cc +++ b/content/browser/web_package/web_bundle_url_loader_factory.cc
@@ -9,7 +9,6 @@ #include <vector> #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "components/web_package/web_bundle_utils.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/renderer_host/navigation_request.h"
diff --git a/content/browser/webid/fake_identity_request_dialog_controller.cc b/content/browser/webid/fake_identity_request_dialog_controller.cc deleted file mode 100644 index 0fa61a3..0000000 --- a/content/browser/webid/fake_identity_request_dialog_controller.cc +++ /dev/null
@@ -1,32 +0,0 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "content/browser/webid/fake_identity_request_dialog_controller.h" - -namespace content { - -FakeIdentityRequestDialogController::FakeIdentityRequestDialogController( - absl::optional<std::string> selected_account) - : selected_account_(selected_account) {} - -FakeIdentityRequestDialogController::~FakeIdentityRequestDialogController() = - default; - -void FakeIdentityRequestDialogController::ShowAccountsDialog( - content::WebContents* rp_web_contents, - const GURL& idp_signin_url, - base::span<const IdentityRequestAccount> accounts, - const IdentityProviderMetadata& idp_metadata, - const ClientIdData& client_id_data, - IdentityRequestAccount::SignInMode sign_in_mode, - AccountSelectionCallback on_selected) { - DCHECK_GT(accounts.size(), 0ul); - // Use the provided account, if any. Otherwise use the first one. - if (selected_account_) - std::move(on_selected).Run(*selected_account_, /* is_sign_in= */ true); - else - std::move(on_selected).Run(accounts[0].id, /* is_sign_in= */ true); -} - -} // namespace content
diff --git a/content/browser/webid/fake_identity_request_dialog_controller.h b/content/browser/webid/fake_identity_request_dialog_controller.h deleted file mode 100644 index 3dc205b8..0000000 --- a/content/browser/webid/fake_identity_request_dialog_controller.h +++ /dev/null
@@ -1,39 +0,0 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CONTENT_BROWSER_WEBID_FAKE_IDENTITY_REQUEST_DIALOG_CONTROLLER_H_ -#define CONTENT_BROWSER_WEBID_FAKE_IDENTITY_REQUEST_DIALOG_CONTROLLER_H_ - -#include <string> - -#include "content/public/browser/identity_request_dialog_controller.h" -#include "third_party/abseil-cpp/absl/types/optional.h" - -namespace content { - -// This fakes the request dialogs to always provide user consent. -// Used by tests and if the --use-fake-ui-for-fedcm command-line -// flag is provided. -class CONTENT_EXPORT FakeIdentityRequestDialogController - : public IdentityRequestDialogController { - public: - explicit FakeIdentityRequestDialogController( - absl::optional<std::string> selected_account = absl::nullopt); - ~FakeIdentityRequestDialogController() override; - - void ShowAccountsDialog(content::WebContents* rp_web_contents, - const GURL& idp_signin_url, - base::span<const IdentityRequestAccount> accounts, - const IdentityProviderMetadata& idp_metadata, - const ClientIdData& client_id_data, - IdentityRequestAccount::SignInMode sign_in_mode, - AccountSelectionCallback on_selected) override; - - private: - absl::optional<std::string> selected_account_; -}; - -} // namespace content - -#endif // CONTENT_BROWSER_WEBID_FAKE_IDENTITY_REQUEST_DIALOG_CONTROLLER_H_
diff --git a/content/browser/webid/federated_auth_request_impl.cc b/content/browser/webid/federated_auth_request_impl.cc index 1ccc2f2..5a3fa17 100644 --- a/content/browser/webid/federated_auth_request_impl.cc +++ b/content/browser/webid/federated_auth_request_impl.cc
@@ -5,14 +5,12 @@ #include "content/browser/webid/federated_auth_request_impl.h" #include "base/callback.h" -#include "base/command_line.h" #include "base/ranges/algorithm.h" #include "base/strings/string_piece.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/time.h" #include "content/browser/bad_message.h" #include "content/browser/renderer_host/render_frame_host_impl.h" -#include "content/browser/webid/fake_identity_request_dialog_controller.h" #include "content/browser/webid/fedcm_metrics.h" #include "content/browser/webid/flags.h" #include "content/browser/webid/webid_utils.h" @@ -25,7 +23,6 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_client.h" -#include "content/public/common/content_switches.h" #include "third_party/blink/public/mojom/devtools/console_message.mojom.h" #include "third_party/blink/public/mojom/devtools/inspector_issue.mojom.h" #include "ui/accessibility/ax_mode.h" @@ -1111,17 +1108,6 @@ if (mock_dialog_controller_) return std::move(mock_dialog_controller_); - if (base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kUseFakeUIForFedCM)) { - std::string selected_account = - base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( - switches::kUseFakeUIForFedCM); - return std::make_unique<FakeIdentityRequestDialogController>( - selected_account.empty() - ? absl::nullopt - : absl::optional<std::string>(selected_account)); - } - return GetContentClient()->browser()->CreateIdentityRequestDialogController(); }
diff --git a/content/browser/webid/federated_auth_request_impl.h b/content/browser/webid/federated_auth_request_impl.h index 4b36210..85fedea 100644 --- a/content/browser/webid/federated_auth_request_impl.h +++ b/content/browser/webid/federated_auth_request_impl.h
@@ -12,6 +12,7 @@ #include "base/callback_forward.h" #include "base/containers/queue.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "content/browser/webid/idp_network_request_manager.h" #include "content/common/content_export.h"
diff --git a/content/browser/webid/federated_auth_request_impl_unittest.cc b/content/browser/webid/federated_auth_request_impl_unittest.cc index df9d3bd..15a97b0 100644 --- a/content/browser/webid/federated_auth_request_impl_unittest.cc +++ b/content/browser/webid/federated_auth_request_impl_unittest.cc
@@ -64,7 +64,6 @@ namespace { -constexpr char kRpTestOrigin[] = "https://rp.example"; constexpr char kIdpTestOrigin[] = "https://idp.example"; constexpr char kProviderUrl[] = "https://idp.example"; constexpr char kAccountsEndpoint[] = "https://idp.example/accounts"; @@ -98,11 +97,26 @@ bool prefer_auto_sign_in; } RequestParameters; +enum FetchedEndpoint { + MANIFEST = 1, + CLIENT_METADATA = 1 << 1, + ACCOUNTS = 1 << 2, + TOKEN = 1 << 3, + REVOCATION = 1 << 4, +}; + +// All endpoints which are fetched in a successful +// FederatedAuthRequestImpl::RequestIdToken() request. +int FETCH_ENDPOINT_ALL_REQUEST_ID_TOKEN = + FetchedEndpoint::MANIFEST | FetchedEndpoint::CLIENT_METADATA | + FetchedEndpoint::ACCOUNTS | FetchedEndpoint::TOKEN; + // Expected return values from a call to RequestIdToken. typedef struct { RequestIdTokenStatus return_status; FederatedAuthRequestResult devtools_issue_status; - const char* token; + // Any combination of FetchedEndpoint flags. + int fetched_endpoints; } RequestExpectations; // Mock configuration values for test. @@ -117,28 +131,17 @@ const char* accounts_endpoint; const char* token_endpoint; const char* client_metadata_endpoint; + const char* revocation_endpoint; } MockManifest; -enum FetchedEndpoint { - MANIFEST = 1, - CLIENT_METADATA = 1 << 1, - ACCOUNTS = 1 << 2, - TOKEN = 1 << 3 -}; - -int FETCH_ENDPOINT_ALL = FetchedEndpoint::MANIFEST | - FetchedEndpoint::CLIENT_METADATA | - FetchedEndpoint::ACCOUNTS | FetchedEndpoint::TOKEN; - typedef struct { - // Any combination of FetchedEndpoint flags. - int expected_fetched_endpoints; const char* token; MockManifest manifest; MockClientIdConfiguration client_metadata; FetchStatus accounts_response; AccountList accounts; FetchStatus token_response; + RevokeResponse revoke_response; bool customized_dialog; } MockConfiguration; @@ -149,23 +152,24 @@ kIdpTestOrigin, kClientId, kNonce, /*prefer_auto_sign_in=*/false}; static const MockConfiguration kConfigurationValid{ - FETCH_ENDPOINT_ALL, kToken, { FetchStatus::kSuccess, kAccountsEndpoint, kTokenEndpoint, kClientMetadataEndpoint, + kRevocationEndpoint, }, kDefaultClientMetadata, FetchStatus::kSuccess, kAccounts, FetchStatus::kSuccess, + RevokeResponse::kSuccess, false /* customized_dialog */}; static const RequestExpectations kExpectationSuccess{ RequestIdTokenStatus::kSuccess, FederatedAuthRequestResult::kSuccess, - kToken}; + FETCH_ENDPOINT_ALL_REQUEST_ID_TOKEN}; MockClientIdConfiguration BuildClientMetadataErrorResponse( FetchStatus fetch_status) { @@ -301,6 +305,194 @@ return request; } +// Forwards IdpNetworkRequestManager calls to delegate. The purpose of this +// class is to enable querying the delegate after FederatedAuthRequestImpl +// destroys DelegatedIdpNetworkRequestManager. +class DelegatedIdpNetworkRequestManager : public MockIdpNetworkRequestManager { + public: + explicit DelegatedIdpNetworkRequestManager(IdpNetworkRequestManager* delegate) + : delegate_(delegate) { + DCHECK(delegate_); + } + + void FetchManifest(absl::optional<int> idp_brand_icon_ideal_size, + absl::optional<int> idp_brand_icon_minimum_size, + FetchManifestCallback callback) override { + delegate_->FetchManifest(idp_brand_icon_ideal_size, + idp_brand_icon_minimum_size, std::move(callback)); + } + + void FetchClientMetadata(const GURL& endpoint, + const std::string& client_id, + FetchClientMetadataCallback callback) override { + delegate_->FetchClientMetadata(endpoint, client_id, std::move(callback)); + } + + void SendAccountsRequest(const GURL& accounts_url, + const std::string& client_id, + AccountsRequestCallback callback) override { + delegate_->SendAccountsRequest(accounts_url, client_id, + std::move(callback)); + } + + void SendTokenRequest(const GURL& token_url, + const std::string& account, + const std::string& request, + TokenRequestCallback callback) override { + delegate_->SendTokenRequest(token_url, account, request, + std::move(callback)); + } + + void SendRevokeRequest(const GURL& revoke_url, + const std::string& client_id, + const std::string& hint, + RevokeCallback callback) override { + delegate_->SendRevokeRequest(revoke_url, client_id, hint, + std::move(callback)); + } + + void SendLogout(const GURL& logout_url, LogoutCallback callback) override { + delegate_->SendLogout(logout_url, std::move(callback)); + } + + private: + IdpNetworkRequestManager* delegate_; +}; + +class TestIdpNetworkRequestManager : public MockIdpNetworkRequestManager { + public: + void SetTestConfig(const MockConfiguration& configuration) { + config_ = configuration; + } + + void FetchManifest(absl::optional<int> idp_brand_icon_ideal_size, + absl::optional<int> idp_brand_icon_minimum_size, + FetchManifestCallback callback) override { + fetched_endpoints_ |= FetchedEndpoint::MANIFEST; + + IdpNetworkRequestManager::Endpoints endpoints; + endpoints.token = config_.manifest.token_endpoint; + endpoints.accounts = config_.manifest.accounts_endpoint; + endpoints.client_metadata = config_.manifest.client_metadata_endpoint; + endpoints.revocation = config_.manifest.revocation_endpoint; + std::move(callback).Run(config_.manifest.fetch_status, endpoints, + IdentityProviderMetadata()); + } + + void FetchClientMetadata(const GURL& endpoint, + const std::string& client_id, + FetchClientMetadataCallback callback) override { + fetched_endpoints_ |= FetchedEndpoint::CLIENT_METADATA; + std::move(callback).Run(config_.client_metadata.fetch_status, + IdpNetworkRequestManager::ClientMetadata{ + config_.client_metadata.privacy_policy_url, + config_.client_metadata.terms_of_service_url}); + } + + void SendAccountsRequest(const GURL& accounts_url, + const std::string& client_id, + AccountsRequestCallback callback) override { + fetched_endpoints_ |= FetchedEndpoint::ACCOUNTS; + std::move(callback).Run(config_.accounts_response, config_.accounts); + } + + void SendTokenRequest(const GURL& token_url, + const std::string& account, + const std::string& request, + TokenRequestCallback callback) override { + fetched_endpoints_ |= FetchedEndpoint::TOKEN; + std::string delivered_token = + config_.token_response == FetchStatus::kSuccess ? config_.token + : std::string(); + std::move(callback).Run(config_.token_response, delivered_token); + } + + void SendRevokeRequest(const GURL& revoke_url, + const std::string& client_id, + const std::string& hint, + RevokeCallback callback) override { + fetched_endpoints_ |= FetchedEndpoint::REVOCATION; + std::move(callback).Run(config_.revoke_response); + } + + int get_fetched_endpoints() { return fetched_endpoints_; } + + protected: + MockConfiguration config_{kConfigurationValid}; + int fetched_endpoints_{0}; +}; + +class TestLogoutIdpNetworkRequestManager : public TestIdpNetworkRequestManager { + public: + void SendLogout(const GURL& logout_url, LogoutCallback callback) override { + ++num_logout_requests_; + std::move(callback).Run(); + } + + size_t num_logout_requests() { return num_logout_requests_; } + + protected: + size_t num_logout_requests_{0}; +}; + +// TestIdpNetworkRequestManager subclass which checks the values of the method +// params when executing an endpoint request. +class IdpNetworkRequestManagerParamChecker + : public TestIdpNetworkRequestManager { + public: + void SetExpectations(const std::string& expected_client_id, + const std::string& expected_selected_account_id, + const std::string& expected_revocation_hint) { + expected_client_id_ = expected_client_id; + expected_selected_account_id_ = expected_selected_account_id; + expected_revocation_hint_ = expected_revocation_hint; + } + + void FetchClientMetadata(const GURL& endpoint, + const std::string& client_id, + FetchClientMetadataCallback callback) override { + EXPECT_EQ(config_.manifest.client_metadata_endpoint, endpoint); + EXPECT_EQ(expected_client_id_, client_id); + TestIdpNetworkRequestManager::FetchClientMetadata(endpoint, client_id, + std::move(callback)); + } + + void SendAccountsRequest(const GURL& accounts_url, + const std::string& client_id, + AccountsRequestCallback callback) override { + EXPECT_EQ(config_.manifest.accounts_endpoint, accounts_url); + EXPECT_EQ(expected_client_id_, client_id); + TestIdpNetworkRequestManager::SendAccountsRequest(accounts_url, client_id, + std::move(callback)); + } + + void SendTokenRequest(const GURL& token_url, + const std::string& account, + const std::string& request, + TokenRequestCallback callback) override { + EXPECT_EQ(config_.manifest.token_endpoint, token_url); + EXPECT_EQ(expected_selected_account_id_, account); + TestIdpNetworkRequestManager::SendTokenRequest(token_url, account, request, + std::move(callback)); + } + + void SendRevokeRequest(const GURL& revoke_url, + const std::string& client_id, + const std::string& hint, + RevokeCallback callback) override { + EXPECT_EQ(config_.manifest.revocation_endpoint, revoke_url); + EXPECT_EQ(expected_client_id_, client_id); + EXPECT_EQ(expected_revocation_hint_, hint); + TestIdpNetworkRequestManager::SendRevokeRequest(revoke_url, client_id, hint, + std::move(callback)); + } + + private: + std::string expected_client_id_; + std::string expected_selected_account_id_; + std::string expected_revocation_hint_; +}; + } // namespace class FederatedAuthRequestImplTest : public RenderViewHostImplTestHarness { @@ -333,18 +525,39 @@ federated_auth_request_impl_->SetSharingPermissionDelegateForTests( mock_sharing_permission_delegate_.get()); + + std::unique_ptr<TestIdpNetworkRequestManager> network_request_manager = + std::make_unique<TestIdpNetworkRequestManager>(); + SetNetworkRequestManager(std::move(network_request_manager)); + } + + void SetNetworkRequestManager( + std::unique_ptr<TestIdpNetworkRequestManager> manager) { + test_network_request_manager_ = std::move(manager); + // DelegatedIdpNetworkRequestManager is owned by + // |federated_auth_request_impl_|. + federated_auth_request_impl_->SetNetworkManagerForTests( + std::make_unique<DelegatedIdpNetworkRequestManager>( + test_network_request_manager_.get())); } void RunAuthTest(const RequestParameters& request_parameters, const RequestExpectations& expectation, const MockConfiguration& configuration) { - SetupIdpNetworkRequestManager(GURL(request_parameters.provider)); + test_network_request_manager_->SetTestConfig(configuration); SetMockExpectations(request_parameters, expectation, configuration); auto auth_response = PerformAuthRequest( GURL(request_parameters.provider), request_parameters.client_id, request_parameters.nonce, request_parameters.prefer_auto_sign_in); - EXPECT_EQ(auth_response.first, expectation.return_status); - EXPECT_EQ(auth_response.second, expectation.token); + ASSERT_EQ(auth_response.first, expectation.return_status); + if (auth_response.first == RequestIdTokenStatus::kSuccess) { + EXPECT_EQ(configuration.token, auth_response.second); + } else { + EXPECT_EQ(kEmptyToken, auth_response.second); + } + + EXPECT_EQ(expectation.fetched_endpoints, + test_network_request_manager_->get_fetched_endpoints()); int issue_count = main_test_rfh()->GetFederatedAuthRequestIssueCount( expectation.devtools_issue_status); @@ -408,15 +621,6 @@ } } - void SetupIdpNetworkRequestManager(const GURL& provider) { - auto mock_request_manager = - std::make_unique<NiceMock<MockIdpNetworkRequestManager>>( - provider, url::Origin::Create(GURL(kRpTestOrigin))); - mock_request_manager_ = mock_request_manager.get(); - federated_auth_request_impl()->SetNetworkManagerForTests( - std::move(mock_request_manager)); - } - std::pair<RequestIdTokenStatus, absl::optional<std::string>> PerformAuthRequest(const GURL& provider, const std::string& client_id, @@ -427,6 +631,7 @@ prefer_auto_sign_in, auth_helper.callback()); auth_helper.WaitForCallback(); + task_environment()->FastForwardBy(base::Seconds(3)); return std::make_pair(auth_helper.status(), auth_helper.token()); } @@ -442,7 +647,10 @@ return logout_helper.status(); } - RevokeStatus PerformRevokeRequest(const char* account_id) { + RevokeStatus PerformRevokeRequest(const MockConfiguration& configuration, + const char* account_id) { + test_network_request_manager_->SetTestConfig(configuration); + RevokeRequestCallbackHelper revoke_helper; request_remote_->Revoke(GURL(kProviderUrl), kClientId, account_id, revoke_helper.callback()); @@ -450,63 +658,10 @@ return revoke_helper.status(); } - bool IsExpectedFetched(MockConfiguration config, - FetchedEndpoint expected_endpoint) { - return (config.expected_fetched_endpoints & expected_endpoint) != 0; - } - void SetMockExpectations(const RequestParameters& request_parameters, - const RequestExpectations& expectation, + const RequestExpectations& expectations, const MockConfiguration& config) { - if (IsExpectedFetched(config, FetchedEndpoint::MANIFEST)) { - EXPECT_CALL(*mock_request_manager_, FetchManifest(_, _, _)) - .WillOnce(Invoke( - [&](absl::optional<int>, absl::optional<int>, - IdpNetworkRequestManager::FetchManifestCallback callback) { - IdpNetworkRequestManager::Endpoints endpoints; - endpoints.accounts = config.manifest.accounts_endpoint; - endpoints.token = config.manifest.token_endpoint; - endpoints.client_metadata = - config.manifest.client_metadata_endpoint; - std::move(callback).Run(config.manifest.fetch_status, endpoints, - IdentityProviderMetadata()); - })); - } else { - EXPECT_CALL(*mock_request_manager_, FetchManifest(_, _, _)).Times(0); - } - - if (IsExpectedFetched(config, FetchedEndpoint::CLIENT_METADATA)) { - EXPECT_CALL(*mock_request_manager_, FetchClientMetadata(_, _, _)) - .WillOnce( - Invoke([&](const GURL&, const std::string& client_id, - IdpNetworkRequestManager::FetchClientMetadataCallback - callback) { - EXPECT_EQ(request_parameters.client_id, client_id); - std::move(callback).Run( - config.client_metadata.fetch_status, - IdpNetworkRequestManager::ClientMetadata{ - config.client_metadata.privacy_policy_url, - config.client_metadata.terms_of_service_url}); - })); - } else { - EXPECT_CALL(*mock_request_manager_, FetchClientMetadata(_, _, _)) - .Times(0); - } - - if (IsExpectedFetched(config, FetchedEndpoint::ACCOUNTS)) { - EXPECT_CALL(*mock_request_manager_, SendAccountsRequest(_, _, _)) - .WillOnce(Invoke( - [&](const GURL&, const std::string&, - IdpNetworkRequestManager::AccountsRequestCallback callback) { - std::move(callback).Run(config.accounts_response, - config.accounts); - })); - } else { - EXPECT_CALL(*mock_request_manager_, SendAccountsRequest(_, _, _)) - .Times(0); - } - - if (IsExpectedFetched(config, FetchedEndpoint::ACCOUNTS) && + if ((expectations.fetched_endpoints & FetchedEndpoint::ACCOUNTS) != 0 && config.accounts_response == FetchStatus::kSuccess) { if (!request_parameters.prefer_auto_sign_in && !config.customized_dialog) { @@ -536,59 +691,12 @@ ShowAccountsDialog(_, _, _, _, _, _, _)) .Times(0); } - - if (IsExpectedFetched(config, FetchedEndpoint::TOKEN)) { - auto delivered_token = config.token_response == FetchStatus::kSuccess - ? config.token - : std::string(); - EXPECT_CALL(*mock_request_manager_, SendTokenRequest(_, _, _, _)) - .WillOnce(Invoke( - [=](const GURL& idp_signin_url, const std::string& account_id, - const std::string& request, - IdpNetworkRequestManager::TokenRequestCallback callback) { - std::move(callback).Run(config.token_response, delivered_token); - })); - task_environment()->FastForwardBy(base::Seconds(3)); - } else { - EXPECT_CALL(*mock_request_manager_, SendTokenRequest(_, _, _, _)) - .Times(0); - } - } - - // Expectations have to be set explicitly in advance using - // logout_return_count() and logout_requests(). - void SetLogoutMockExpectations() { - for (int i = logout_session_permissions_.size() - 1; i >= 0; i--) { - auto single_session_permission = logout_session_permissions_[i]; - EXPECT_CALL(*mock_active_session_permission_delegate_, - HasActiveSession(_, _, _)) - .WillOnce(Return(single_session_permission)) - .RetiresOnSaturation(); - } - - for (int i = 0; i < logout_return_count_; i++) { - EXPECT_CALL(*mock_request_manager_, SendLogout(_, _)) - .WillOnce( - Invoke([](const GURL& logout_endpoint, - IdpNetworkRequestManager::LogoutCallback callback) { - std::move(callback).Run(); - })) - .RetiresOnSaturation(); - } } FederatedAuthRequestImpl* federated_auth_request_impl() { return federated_auth_request_impl_; } - int& logout_return_count() { return logout_return_count_; } - std::vector<LogoutRpsRequestPtr>& logout_requests() { - return logout_requests_; - } - std::vector<bool>& logout_session_permissions() { - return logout_session_permissions_; - } - base::span<const content::IdentityRequestAccount> displayed_accounts() const { return displayed_accounts_; } @@ -667,8 +775,7 @@ // TestRenderFrameHost is torn down at `TearDown()` time. raw_ptr<FederatedAuthRequestImpl> federated_auth_request_impl_; - // Owned by |federated_auth_request_impl_|. - raw_ptr<NiceMock<MockIdpNetworkRequestManager>> mock_request_manager_; + std::unique_ptr<TestIdpNetworkRequestManager> test_network_request_manager_; raw_ptr<NiceMock<MockIdentityRequestDialogController>> mock_dialog_controller_; @@ -681,11 +788,6 @@ base::OnceClosure close_idp_window_callback_; - // Test case storage for Logout tests. - int logout_return_count_ = 0; - std::vector<LogoutRpsRequestPtr> logout_requests_; - std::vector<bool> logout_session_permissions_; - // Storage for displayed accounts AccountList displayed_accounts_; @@ -700,6 +802,15 @@ // Test successful FedCM request. TEST_F(BasicFederatedAuthRequestImplTest, SuccessfulRequest) { + // Use IdpNetworkRequestManagerParamChecker to validate passed-in parameters + // to IdpNetworkRequestManager methods. + std::unique_ptr<IdpNetworkRequestManagerParamChecker> checker = + std::make_unique<IdpNetworkRequestManagerParamChecker>(); + checker->SetExpectations(kDefaultRequestParameters.client_id, + kConfigurationValid.accounts[0].id, + /* expected_revocation_hint=*/""); + SetNetworkRequestManager(std::move(checker)); + RunAuthTest(kDefaultRequestParameters, kExpectationSuccess, kConfigurationValid); } @@ -708,11 +819,10 @@ TEST_F(BasicFederatedAuthRequestImplTest, MissingTokenEndpoint) { MockConfiguration configuration = kConfigurationValid; configuration.manifest.token_endpoint = ""; - configuration.expected_fetched_endpoints = FetchedEndpoint::MANIFEST; RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorFetchingManifestInvalidResponse, - kEmptyToken}; + FetchedEndpoint::MANIFEST}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); std::vector<std::string> messages = @@ -730,11 +840,10 @@ TEST_F(BasicFederatedAuthRequestImplTest, MissingAccountsEndpoint) { MockConfiguration configuration = kConfigurationValid; configuration.manifest.accounts_endpoint = ""; - configuration.expected_fetched_endpoints = FetchedEndpoint::MANIFEST; RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorFetchingManifestInvalidResponse, - kEmptyToken}; + FetchedEndpoint::MANIFEST}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); std::vector<std::string> messages = @@ -752,11 +861,10 @@ TEST_F(BasicFederatedAuthRequestImplTest, MissingClientMetadataEndpoint) { MockConfiguration configuration = kConfigurationValid; configuration.manifest.client_metadata_endpoint = ""; - configuration.expected_fetched_endpoints = FetchedEndpoint::MANIFEST; RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorFetchingManifestInvalidResponse, - kEmptyToken}; + FetchedEndpoint::MANIFEST}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); std::vector<std::string> messages = @@ -775,11 +883,10 @@ TEST_F(BasicFederatedAuthRequestImplTest, AccountEndpointDifferentOriginIdp) { MockConfiguration configuration = kConfigurationValid; configuration.manifest.accounts_endpoint = kCrossOriginAccountsEndpoint; - configuration.expected_fetched_endpoints = FetchedEndpoint::MANIFEST; RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorFetchingManifestInvalidResponse, - kEmptyToken}; + FetchedEndpoint::MANIFEST}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); } @@ -787,13 +894,11 @@ TEST_F(BasicFederatedAuthRequestImplTest, AccountEndpointCannotBeReached) { MockConfiguration configuration = kConfigurationValid; configuration.accounts_response = FetchStatus::kNoResponseError; - configuration.expected_fetched_endpoints = FetchedEndpoint::MANIFEST | - FetchedEndpoint::CLIENT_METADATA | - FetchedEndpoint::ACCOUNTS; RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorFetchingAccountsNoResponse, - kEmptyToken}; + FetchedEndpoint::MANIFEST | FetchedEndpoint::CLIENT_METADATA | + FetchedEndpoint::ACCOUNTS}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); } @@ -801,13 +906,11 @@ TEST_F(BasicFederatedAuthRequestImplTest, AccountsCannotBeParsed) { MockConfiguration configuration = kConfigurationValid; configuration.accounts_response = FetchStatus::kInvalidResponseError; - configuration.expected_fetched_endpoints = FetchedEndpoint::MANIFEST | - FetchedEndpoint::CLIENT_METADATA | - FetchedEndpoint::ACCOUNTS; RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorFetchingAccountsInvalidResponse, - kEmptyToken}; + FetchedEndpoint::MANIFEST | FetchedEndpoint::CLIENT_METADATA | + FetchedEndpoint::ACCOUNTS}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); } @@ -816,12 +919,10 @@ MockConfiguration configuration = kConfigurationValid; configuration.client_metadata = BuildClientMetadataErrorResponse(FetchStatus::kHttpNotFoundError); - configuration.expected_fetched_endpoints = - FetchedEndpoint::MANIFEST | FetchedEndpoint::CLIENT_METADATA; RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorFetchingClientMetadataHttpNotFound, - kEmptyToken}; + FetchedEndpoint::MANIFEST | FetchedEndpoint::CLIENT_METADATA}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); } @@ -830,12 +931,10 @@ MockConfiguration configuration = kConfigurationValid; configuration.client_metadata = BuildClientMetadataErrorResponse(FetchStatus::kNoResponseError); - configuration.expected_fetched_endpoints = - FetchedEndpoint::MANIFEST | FetchedEndpoint::CLIENT_METADATA; RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorFetchingClientMetadataNoResponse, - kEmptyToken}; + FetchedEndpoint::MANIFEST | FetchedEndpoint::CLIENT_METADATA}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); } @@ -844,12 +943,10 @@ MockConfiguration configuration = kConfigurationValid; configuration.client_metadata = BuildClientMetadataErrorResponse(FetchStatus::kInvalidResponseError); - configuration.expected_fetched_endpoints = - FetchedEndpoint::MANIFEST | FetchedEndpoint::CLIENT_METADATA; RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorFetchingClientMetadataInvalidResponse, - kEmptyToken}; + FetchedEndpoint::MANIFEST | FetchedEndpoint::CLIENT_METADATA}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); } @@ -860,12 +957,10 @@ configuration.client_metadata = kDefaultClientMetadata; configuration.client_metadata.privacy_policy_url = ""; configuration.client_metadata.terms_of_service_url = ""; - configuration.expected_fetched_endpoints = - FetchedEndpoint::MANIFEST | FetchedEndpoint::CLIENT_METADATA; RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorClientMetadataMissingPrivacyPolicyUrl, - kEmptyToken}; + FetchedEndpoint::MANIFEST | FetchedEndpoint::CLIENT_METADATA}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); } @@ -877,11 +972,10 @@ configuration.manifest.token_endpoint = ""; configuration.manifest.client_metadata_endpoint = "https://cross-origin-2.com"; - configuration.expected_fetched_endpoints = FetchedEndpoint::MANIFEST; RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorFetchingManifestInvalidResponse, - kEmptyToken}; + FetchedEndpoint::MANIFEST}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); std::vector<std::string> messages = RenderFrameHostTester::For(main_rfh())->GetConsoleMessages(); @@ -903,22 +997,29 @@ features::kFedCm, {{features::kFedCmIdpSignoutFieldTrialParamName, "true"}}); - SetupIdpNetworkRequestManager(GURL(kIdpTestOrigin)); + std::vector<LogoutRpsRequestPtr> logout_requests; + logout_requests.push_back( + MakeLogoutRequest("https://rp1.example", "user123")); + logout_requests.push_back( + MakeLogoutRequest("https://rp2.example", "user456")); + logout_requests.push_back( + MakeLogoutRequest("https://rp3.example", "user789")); - auto request1 = MakeLogoutRequest("https://rp1.example", "user123"); - logout_requests().push_back(std::move(request1)); - logout_session_permissions().push_back(true); - auto request2 = MakeLogoutRequest("https://rp2.example", "user456"); - logout_requests().push_back(std::move(request2)); - logout_session_permissions().push_back(true); - auto request3 = MakeLogoutRequest("https://rp3.example", "user789"); - logout_requests().push_back(std::move(request3)); - logout_session_permissions().push_back(true); - logout_return_count() = 3; + for (int i = 0; i < 3; ++i) { + EXPECT_CALL(*mock_active_session_permission_delegate_, + HasActiveSession(_, _, _)) + .WillOnce(Return(true)) + .RetiresOnSaturation(); + } - SetLogoutMockExpectations(); - auto logout_response = PerformLogoutRequest(std::move(logout_requests())); + SetNetworkRequestManager( + std::make_unique<TestLogoutIdpNetworkRequestManager>()); + + auto logout_response = PerformLogoutRequest(std::move(logout_requests)); EXPECT_EQ(logout_response, LogoutRpsStatus::kSuccess); + EXPECT_EQ(3u, static_cast<TestLogoutIdpNetworkRequestManager*>( + test_network_request_manager_.get()) + ->num_logout_requests()); } // Test Logout without session permission granted. @@ -928,25 +1029,24 @@ features::kFedCm, {{features::kFedCmIdpSignoutFieldTrialParamName, "true"}}); - SetupIdpNetworkRequestManager(GURL(kIdpTestOrigin)); + SetNetworkRequestManager( + std::make_unique<TestLogoutIdpNetworkRequestManager>()); - // logout_return_count is not set here because there should be no - // attempt at dispatch. - auto request = MakeLogoutRequest("https://rp1.example", "user123"); - logout_requests().push_back(std::move(request)); - logout_session_permissions().push_back(false); + std::vector<LogoutRpsRequestPtr> logout_requests; + logout_requests.push_back( + MakeLogoutRequest("https://rp1.example", "user123")); - SetLogoutMockExpectations(); - auto logout_response = PerformLogoutRequest(std::move(logout_requests())); + auto logout_response = PerformLogoutRequest(std::move(logout_requests)); EXPECT_EQ(logout_response, LogoutRpsStatus::kSuccess); } // Test Logout method with an empty endpoint vector. TEST_F(BasicFederatedAuthRequestImplTest, LogoutNoEndpoints) { - SetupIdpNetworkRequestManager(GURL(kIdpTestOrigin)); + SetNetworkRequestManager( + std::make_unique<TestLogoutIdpNetworkRequestManager>()); - SetLogoutMockExpectations(); - auto logout_response = PerformLogoutRequest(std::move(logout_requests())); + auto logout_response = + PerformLogoutRequest(std::vector<LogoutRpsRequestPtr>()); EXPECT_EQ(logout_response, LogoutRpsStatus::kError); } @@ -1002,7 +1102,7 @@ RequestExpectations expectations = { RequestIdTokenStatus::kError, FederatedAuthRequestResult::kErrorFetchingIdTokenInvalidResponse, - kEmptyToken}; + FETCH_ENDPOINT_ALL_REQUEST_ID_TOKEN}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); } @@ -1124,7 +1224,6 @@ TEST_F(FederatedAuthRequestImplTest, Revoke) { constexpr char kHint[] = "foo@bar.com"; - SetupIdpNetworkRequestManager(GURL(kProviderUrl)); federated_auth_request_impl()->SetRequestPermissionDelegateForTests( mock_request_permission_delegate_.get()); @@ -1137,31 +1236,20 @@ *mock_request_permission_delegate_, RevokeRequestPermission(_, url::Origin::Create(GURL(kIdpTestOrigin)))); - EXPECT_CALL(*mock_request_manager_, FetchManifest(_, _, _)) - .WillOnce( - Invoke([&](absl::optional<int>, absl::optional<int>, - IdpNetworkRequestManager::FetchManifestCallback callback) { - IdpNetworkRequestManager::Endpoints endpoints; - endpoints.revocation = kRevocationEndpoint; - std::move(callback).Run(FetchStatus::kSuccess, endpoints, - IdentityProviderMetadata()); - })); - EXPECT_CALL(*mock_request_manager_, SendRevokeRequest(_, _, _, _)) - .WillOnce(Invoke([&](const GURL& revoke_url, const std::string& client_id, - const std::string& hint, - IdpNetworkRequestManager::RevokeCallback callback) { - EXPECT_EQ(kRevocationEndpoint, revoke_url.spec()); - EXPECT_EQ(kClientId, client_id); - EXPECT_EQ(kHint, hint); - std::move(callback).Run(RevokeResponse::kSuccess); - })); + std::unique_ptr<IdpNetworkRequestManagerParamChecker> checker = + std::make_unique<IdpNetworkRequestManagerParamChecker>(); + checker->SetExpectations(kClientId, /* expected_selected_account_id=*/"", + kHint); + SetNetworkRequestManager(std::move(checker)); base::RunLoop ukm_loop; ukm_recorder()->SetOnAddEntryCallback(Entry::kEntryName, ukm_loop.QuitClosure()); - auto status = PerformRevokeRequest(kHint); + auto status = PerformRevokeRequest(kConfigurationValid, kHint); EXPECT_EQ(RevokeStatus::kSuccess, status); + EXPECT_EQ(FetchedEndpoint::MANIFEST | FetchedEndpoint::REVOCATION, + test_network_request_manager_->get_fetched_endpoints()); ukm_loop.Run(); @@ -1174,7 +1262,6 @@ TEST_F(FederatedAuthRequestImplTest, RevokeNoPermission) { constexpr char kHint[] = "foo@bar.com"; - SetupIdpNetworkRequestManager(GURL(kProviderUrl)); federated_auth_request_impl()->SetRequestPermissionDelegateForTests( mock_request_permission_delegate_.get()); @@ -1188,8 +1275,9 @@ ukm_recorder()->SetOnAddEntryCallback(Entry::kEntryName, ukm_loop.QuitClosure()); - auto status = PerformRevokeRequest(kHint); + auto status = PerformRevokeRequest(kConfigurationValid, kHint); EXPECT_EQ(RevokeStatus::kError, status); + EXPECT_EQ(0, test_network_request_manager_->get_fetched_endpoints()); ukm_loop.Run(); histogram_tester_.ExpectUniqueSample( @@ -1294,10 +1382,10 @@ EXPECT_EQ(kConfigurationValid.accounts.size(), 1u); MockConfiguration configuration = kConfigurationValid; - configuration.expected_fetched_endpoints &= ~FetchedEndpoint::TOKEN; configuration.customized_dialog = true; - RequestExpectations expectations = {RequestIdTokenStatus::kError, - FederatedAuthRequestResult::kError, ""}; + RequestExpectations expectations = { + RequestIdTokenStatus::kError, FederatedAuthRequestResult::kError, + FETCH_ENDPOINT_ALL_REQUEST_ID_TOKEN & ~FetchedEndpoint::TOKEN}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); ukm_loop.Run(); @@ -1358,10 +1446,10 @@ ASSERT_NE(web_contents_impl->GetVisibility(), Visibility::VISIBLE); MockConfiguration configuration = kConfigurationValid; - configuration.expected_fetched_endpoints &= ~FetchedEndpoint::TOKEN; configuration.customized_dialog = true; - RequestExpectations expectations = {RequestIdTokenStatus::kError, - FederatedAuthRequestResult::kError, ""}; + RequestExpectations expectations = { + RequestIdTokenStatus::kError, FederatedAuthRequestResult::kError, + FETCH_ENDPOINT_ALL_REQUEST_ID_TOKEN & ~FetchedEndpoint::TOKEN}; RunAuthTest(kDefaultRequestParameters, expectations, configuration); histogram_tester_.ExpectUniqueSample("Blink.FedCm.WebContentsVisible", 0, 1); @@ -1375,11 +1463,10 @@ EXPECT_CALL(mock_api_permission_delegate, AreThirdPartyCookiesBlocked()) .WillOnce(Return(true)); - MockConfiguration configuration = kConfigurationValid; - configuration.expected_fetched_endpoints = 0; RequestExpectations expectations = {RequestIdTokenStatus::kError, - FederatedAuthRequestResult::kError, ""}; - RunAuthTest(kDefaultRequestParameters, expectations, configuration); + FederatedAuthRequestResult::kError, + /*fetched_endpoints=*/0}; + RunAuthTest(kDefaultRequestParameters, expectations, kConfigurationValid); histogram_tester_.ExpectUniqueSample("Blink.FedCm.Status.RequestIdToken", IdTokenStatus::kThirdPartyCookiesBlocked, @@ -1391,11 +1478,10 @@ base::test::ScopedFeatureList list; list.InitAndDisableFeature(features::kFedCm); - MockConfiguration configuration = kConfigurationValid; - configuration.expected_fetched_endpoints = 0; RequestExpectations expectations = {RequestIdTokenStatus::kError, - FederatedAuthRequestResult::kError, ""}; - RunAuthTest(kDefaultRequestParameters, expectations, configuration); + FederatedAuthRequestResult::kError, + /*fetched_endpoints=*/0}; + RunAuthTest(kDefaultRequestParameters, expectations, kConfigurationValid); histogram_tester_.ExpectUniqueSample("Blink.FedCm.Status.RequestIdToken", IdTokenStatus::kDisabledInFlags, 1);
diff --git a/content/browser/webid/test/fake_identity_request_dialog_controller.cc b/content/browser/webid/test/fake_identity_request_dialog_controller.cc new file mode 100644 index 0000000..c66f78bc --- /dev/null +++ b/content/browser/webid/test/fake_identity_request_dialog_controller.cc
@@ -0,0 +1,33 @@ +// Copyright 2021 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "content/browser/webid/test/fake_identity_request_dialog_controller.h" + +#include "base/bind.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace content { + +FakeIdentityRequestDialogController::FakeIdentityRequestDialogController( + absl::optional<std::string> dialog_selected_account) + : dialog_selected_account_(dialog_selected_account) {} + +FakeIdentityRequestDialogController::~FakeIdentityRequestDialogController() = + default; + +void FakeIdentityRequestDialogController::ShowAccountsDialog( + WebContents* rp_web_contents, + const GURL& idp_signin_url, + base::span<const IdentityRequestAccount> accounts, + const IdentityProviderMetadata& idp_metadata, + const ClientIdData& client_id_data, + IdentityRequestAccount::SignInMode sign_in_mode, + AccountSelectionCallback on_selected) { + if (dialog_selected_account_) { + std::move(on_selected) + .Run(*dialog_selected_account_, true /* is_sign_in */); + } +} + +} // namespace content
diff --git a/content/browser/webid/test/fake_identity_request_dialog_controller.h b/content/browser/webid/test/fake_identity_request_dialog_controller.h new file mode 100644 index 0000000..342b9b4 --- /dev/null +++ b/content/browser/webid/test/fake_identity_request_dialog_controller.h
@@ -0,0 +1,49 @@ +// Copyright 2021 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CONTENT_BROWSER_WEBID_TEST_FAKE_IDENTITY_REQUEST_DIALOG_CONTROLLER_H_ +#define CONTENT_BROWSER_WEBID_TEST_FAKE_IDENTITY_REQUEST_DIALOG_CONTROLLER_H_ + +#include <string> + +#include "content/public/browser/identity_request_dialog_controller.h" +#include "third_party/abseil-cpp/absl/types/optional.h" +#include "url/gurl.h" + +namespace content { + +class WebContents; + +// This fakes the request dialogs to always provide user consent. +// Tests that need to vary the responses or set test expectations should use +// MockIdentityRequestDialogController. +// This also fakes an IdP sign-in page until tests can be set up to +// verify the FederatedAuthResponse mechanics. +class FakeIdentityRequestDialogController + : public IdentityRequestDialogController { + public: + explicit FakeIdentityRequestDialogController( + absl::optional<std::string> dialog_selected_account); + ~FakeIdentityRequestDialogController() override; + + FakeIdentityRequestDialogController( + const FakeIdentityRequestDialogController&) = delete; + FakeIdentityRequestDialogController& operator=( + const FakeIdentityRequestDialogController&) = delete; + + void ShowAccountsDialog(WebContents* rp_web_contents, + const GURL& idp_signin_url, + base::span<const IdentityRequestAccount> accounts, + const IdentityProviderMetadata& idp_metadata, + const ClientIdData& client_id_data, + IdentityRequestAccount::SignInMode sign_in_mode, + AccountSelectionCallback on_selected) override; + + private: + absl::optional<std::string> dialog_selected_account_; +}; + +} // namespace content + +#endif // CONTENT_BROWSER_WEBID_TEST_FAKE_IDENTITY_REQUEST_DIALOG_CONTROLLER_H_
diff --git a/content/browser/webid/test/mock_idp_network_request_manager.cc b/content/browser/webid/test/mock_idp_network_request_manager.cc index d251d30a..efb533ac 100644 --- a/content/browser/webid/test/mock_idp_network_request_manager.cc +++ b/content/browser/webid/test/mock_idp_network_request_manager.cc
@@ -8,11 +8,9 @@ namespace content { -MockIdpNetworkRequestManager::MockIdpNetworkRequestManager( - const GURL& provider, - const url::Origin& relying_party) - : IdpNetworkRequestManager(provider, - relying_party, +MockIdpNetworkRequestManager::MockIdpNetworkRequestManager() + : IdpNetworkRequestManager(GURL(), + url::Origin(), nullptr, network::mojom::ClientSecurityState::New()) {}
diff --git a/content/browser/webid/test/mock_idp_network_request_manager.h b/content/browser/webid/test/mock_idp_network_request_manager.h index 1781e33..c09ae6b3 100644 --- a/content/browser/webid/test/mock_idp_network_request_manager.h +++ b/content/browser/webid/test/mock_idp_network_request_manager.h
@@ -13,9 +13,7 @@ class MockIdpNetworkRequestManager : public IdpNetworkRequestManager { public: - MockIdpNetworkRequestManager(const GURL& provider, - const url::Origin& relaying_party_origin); - + MockIdpNetworkRequestManager(); ~MockIdpNetworkRequestManager() override; MockIdpNetworkRequestManager(const MockIdpNetworkRequestManager&) = delete;
diff --git a/content/browser/webid/webid_browsertest.cc b/content/browser/webid/webid_browsertest.cc index e2cba7a2..bd45be0 100644 --- a/content/browser/webid/webid_browsertest.cc +++ b/content/browser/webid/webid_browsertest.cc
@@ -13,7 +13,7 @@ #include "base/strings/string_number_conversions.h" #include "base/test/scoped_feature_list.h" #include "components/network_session_configurator/common/network_switches.h" -#include "content/browser/webid/fake_identity_request_dialog_controller.h" +#include "content/browser/webid/test/fake_identity_request_dialog_controller.h" #include "content/browser/webid/test/webid_test_content_browser_client.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/identity_request_dialog_controller.h"
diff --git a/content/browser/webrtc/webrtc_video_capture_service_browsertest.cc b/content/browser/webrtc/webrtc_video_capture_service_browsertest.cc index 4f12605c..eaeb2581a 100644 --- a/content/browser/webrtc/webrtc_video_capture_service_browsertest.cc +++ b/content/browser/webrtc/webrtc_video_capture_service_browsertest.cc
@@ -7,6 +7,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/base/math_util.h" #include "components/viz/common/gpu/context_provider.h"
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc index f36e637b..61f3fcbd 100644 --- a/content/browser/webui/url_data_manager_backend.cc +++ b/content/browser/webui/url_data_manager_backend.cc
@@ -16,7 +16,6 @@ #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h"
diff --git a/content/browser/webui/url_data_source_impl.cc b/content/browser/webui/url_data_source_impl.cc index 916b1e7..cd70df362 100644 --- a/content/browser/webui/url_data_source_impl.cc +++ b/content/browser/webui/url_data_source_impl.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "content/browser/webui/url_data_manager_backend.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/worker_host/shared_worker_host.cc b/content/browser/worker_host/shared_worker_host.cc index 570c08a..81b3fd7 100644 --- a/content/browser/worker_host/shared_worker_host.cc +++ b/content/browser/worker_host/shared_worker_host.cc
@@ -10,7 +10,6 @@ #include "base/feature_list.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/unguessable_token.h" #include "content/browser/broadcast_channel/broadcast_channel_provider.h" #include "content/browser/broadcast_channel/broadcast_channel_service.h"
diff --git a/content/browser/worker_host/shared_worker_service_impl.cc b/content/browser/worker_host/shared_worker_service_impl.cc index 15b4acd..beee885 100644 --- a/content/browser/worker_host/shared_worker_service_impl.cc +++ b/content/browser/worker_host/shared_worker_service_impl.cc
@@ -16,7 +16,6 @@ #include "base/check_op.h" #include "base/feature_list.h" #include "base/observer_list.h" -#include "base/task/post_task.h" #include "content/browser/devtools/shared_worker_devtools_agent_host.h" #include "content/browser/loader/file_url_loader_factory.h" #include "content/browser/service_worker/service_worker_main_resource_handle.h"
diff --git a/content/browser/worker_host/worker_script_loader.cc b/content/browser/worker_host/worker_script_loader.cc index 25b89845..5752f7c 100644 --- a/content/browser/worker_host/worker_script_loader.cc +++ b/content/browser/worker_host/worker_script_loader.cc
@@ -5,7 +5,6 @@ #include "content/browser/worker_host/worker_script_loader.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "content/browser/loader/navigation_loader_interceptor.h" #include "content/browser/service_worker/service_worker_main_resource_handle.h" #include "content/browser/service_worker/service_worker_main_resource_loader_interceptor.h"
diff --git a/content/child/child_process.h b/content/child/child_process.h index 419033f..78dc634 100644 --- a/content/child/child_process.h +++ b/content/child/child_process.h
@@ -12,6 +12,7 @@ #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/child/child_thread_impl.h b/content/child/child_thread_impl.h index 08908fda..1b5b5f16 100644 --- a/content/child/child_thread_impl.h +++ b/content/child/child_thread_impl.h
@@ -16,6 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/variations/child_process_field_trial_syncer.h" #include "content/common/associated_interfaces.mojom.h"
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc index be761223..8dcc8612 100644 --- a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc +++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc
@@ -15,7 +15,6 @@ #include "base/feature_list.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "base/trace_event/trace_event.h"
diff --git a/content/common/android/cpu_time_metrics_internal.cc b/content/common/android/cpu_time_metrics_internal.cc index b87804b87..6295d52 100644 --- a/content/common/android/cpu_time_metrics_internal.cc +++ b/content/common/android/cpu_time_metrics_internal.cc
@@ -27,7 +27,6 @@ #include "base/strings/pattern.h" #include "base/strings/string_util.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/task/task_observer.h" #include "base/task/thread_pool.h" #include "base/threading/platform_thread.h"
diff --git a/content/common/android/cpu_time_metrics_internal.h b/content/common/android/cpu_time_metrics_internal.h index 33b0c810c..821c12c 100644 --- a/content/common/android/cpu_time_metrics_internal.h +++ b/content/common/android/cpu_time_metrics_internal.h
@@ -15,6 +15,7 @@ #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_observer.h" +#include "base/time/time.h" #include "components/power_scheduler/power_mode.h" #include "components/power_scheduler/power_mode_arbiter.h" #include "content/common/process_visibility_tracker.h"
diff --git a/content/common/font_list_unittest.cc b/content/common/font_list_unittest.cc index 1afbbc7..548dca9 100644 --- a/content/common/font_list_unittest.cc +++ b/content/common/font_list_unittest.cc
@@ -8,7 +8,6 @@ #include "base/i18n/rtl.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/test/task_environment.h"
diff --git a/content/common/input/synthetic_pointer_action_params.h b/content/common/input/synthetic_pointer_action_params.h index bef67b7f..a9b4534 100644 --- a/content/common/input/synthetic_pointer_action_params.h +++ b/content/common/input/synthetic_pointer_action_params.h
@@ -6,6 +6,7 @@ #define CONTENT_COMMON_INPUT_SYNTHETIC_POINTER_ACTION_PARAMS_H_ #include "base/check_op.h" +#include "base/time/time.h" #include "content/common/content_export.h" #include "content/common/input/synthetic_gesture_params.h" #include "third_party/blink/public/common/input/web_mouse_event.h"
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 9f840287..660c5f3 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc
@@ -24,6 +24,7 @@ #include "base/task/single_thread_task_executor.h" #include "base/task/thread_pool.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "base/timer/hi_res_timer_manager.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h"
diff --git a/content/gpu/gpu_service_factory.cc b/content/gpu/gpu_service_factory.cc index ef89f73..b48d647 100644 --- a/content/gpu/gpu_service_factory.cc +++ b/content/gpu/gpu_service_factory.cc
@@ -7,7 +7,6 @@ #include <memory> #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h"
diff --git a/content/public/browser/navigation_controller.h b/content/public/browser/navigation_controller.h index 085fb5f..8c5a267 100644 --- a/content/public/browser/navigation_controller.h +++ b/content/public/browser/navigation_controller.h
@@ -11,6 +11,7 @@ #include <string> #include <vector> +#include "base/time/time.h" #include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/browser/global_request_id.h"
diff --git a/content/public/browser/storage_partition.h b/content/public/browser/storage_partition.h index 1125a96..ea403e6e 100644 --- a/content/public/browser/storage_partition.h +++ b/content/public/browser/storage_partition.h
@@ -49,9 +49,6 @@ class QuotaManager; class SpecialStoragePolicy; struct QuotaSettings; -} - -namespace storage { class DatabaseTracker; } @@ -186,6 +183,9 @@ // https://github.com/WICG/turtledove/blob/main/FLEDGE.md REMOVE_DATA_MASK_INTEREST_GROUPS = 1 << 12, REMOVE_DATA_MASK_AGGREGATION_SERVICE = 1 << 13, + // Shared storage data as part of the Shared Storage API. + // Public explainer: https://github.com/pythagoraskitty/shared-storage + REMOVE_DATA_MASK_SHARED_STORAGE = 1 << 14, REMOVE_DATA_MASK_ALL = 0xFFFFFFFF, // Corresponds to storage::kStorageTypeTemporary.
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h index 5bd9df5..762b159 100644 --- a/content/public/common/content_features.h +++ b/content/public/common/content_features.h
@@ -10,6 +10,7 @@ #include "base/feature_list.h" #include "base/metrics/field_trial_params.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "content/common/content_export.h"
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index bf2342c9..dc96641 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc
@@ -799,11 +799,6 @@ const char kUseFakeCodecForPeerConnection[] = "use-fake-codec-for-peer-connection"; -// Bypass the FedCM account selection dialog. If a value is provided for -// this switch, that account ID is selected, otherwise the first account -// is chosen. -const char kUseFakeUIForFedCM[] = "use-fake-ui-for-fedcm"; - // Bypass the media stream infobar by selecting the default device for media // streams (e.g. WebRTC). Works with --use-fake-device-for-media-stream. const char kUseFakeUIForMediaStream[] = "use-fake-ui-for-media-stream";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index ce85db8..07877047 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h
@@ -221,7 +221,6 @@ CONTENT_EXPORT extern const char kTouchEventFeatureDetectionDisabled[]; CONTENT_EXPORT extern const char kTrustableWebBundleFileUrl[]; CONTENT_EXPORT extern const char kUseFakeCodecForPeerConnection[]; -CONTENT_EXPORT extern const char kUseFakeUIForFedCM[]; CONTENT_EXPORT extern const char kUseFakeUIForMediaStream[]; CONTENT_EXPORT extern const char kVideoImageTextureTarget[]; CONTENT_EXPORT extern const char kUseMobileUserAgent[];
diff --git a/content/public/common/profiling.cc b/content/public/common/profiling.cc index f4e4751..864060b9 100644 --- a/content/public/common/profiling.cc +++ b/content/public/common/profiling.cc
@@ -16,6 +16,7 @@ #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "content/public/common/content_switches.h" namespace content {
diff --git a/content/public/test/background_sync_test_util.cc b/content/public/test/background_sync_test_util.cc index a8dcd83e..db5891d 100644 --- a/content/public/test/background_sync_test_util.cc +++ b/content/public/test/background_sync_test_util.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "content/browser/background_sync/background_sync_context_impl.h" #include "content/browser/background_sync/background_sync_manager.h"
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc index f2bace5..286da2c 100644 --- a/content/public/test/browser_test_utils.cc +++ b/content/public/test/browser_test_utils.cc
@@ -29,7 +29,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/test_switches.h" #include "base/test/test_timeouts.h"
diff --git a/content/public/test/fake_download_item.h b/content/public/test/fake_download_item.h index 9007b9f..bac9f5f 100644 --- a/content/public/test/fake_download_item.h +++ b/content/public/test/fake_download_item.h
@@ -11,6 +11,7 @@ #include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "components/download/public/common/download_danger_type.h" #include "components/download/public/common/download_interrupt_reasons.h" #include "components/download/public/common/download_item.h"
diff --git a/content/public/test/mock_download_manager.h b/content/public/test/mock_download_manager.h index 025f0732..8874c6a3 100644 --- a/content/public/test/mock_download_manager.h +++ b/content/public/test/mock_download_manager.h
@@ -11,6 +11,7 @@ #include <utility> #include <vector> +#include "base/time/time.h" #include "components/download/public/common/download_item_rename_progress_update.h" #include "components/download/public/common/download_url_parameters.h" #include "components/download/public/common/input_stream.h"
diff --git a/content/public/test/navigation_handle_observer.h b/content/public/test/navigation_handle_observer.h index 898291f..c97f44ba 100644 --- a/content/public/test/navigation_handle_observer.h +++ b/content/public/test/navigation_handle_observer.h
@@ -7,6 +7,7 @@ #include <cstdint> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "content/public/browser/navigation_handle_timing.h" #include "content/public/browser/reload_type.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/public/test/signed_exchange_browser_test_helper.cc b/content/public/test/signed_exchange_browser_test_helper.cc index 95bcd6d4..e66ce46 100644 --- a/content/public/test/signed_exchange_browser_test_helper.cc +++ b/content/public/test/signed_exchange_browser_test_helper.cc
@@ -9,7 +9,6 @@ #include "base/files/file_path.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/threading/thread_restrictions.h" #include "content/browser/web_package/signed_exchange_utils.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/public/test/web_transport_simple_test_server.h b/content/public/test/web_transport_simple_test_server.h index 5838099..7c8322c 100644 --- a/content/public/test/web_transport_simple_test_server.h +++ b/content/public/test/web_transport_simple_test_server.h
@@ -7,6 +7,7 @@ #include <memory> +#include "base/time/time.h" #include "net/base/ip_endpoint.h" namespace base {
diff --git a/content/renderer/browser_exposed_renderer_interfaces.cc b/content/renderer/browser_exposed_renderer_interfaces.cc index 58d403e..a69e649 100644 --- a/content/renderer/browser_exposed_renderer_interfaces.cc +++ b/content/renderer/browser_exposed_renderer_interfaces.cc
@@ -13,7 +13,6 @@ #include "base/feature_list.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate.h b/content/renderer/media/renderer_webmediaplayer_delegate.h index 0527f4e1..2ace312 100644 --- a/content/renderer/media/renderer_webmediaplayer_delegate.h +++ b/content/renderer/media/renderer_webmediaplayer_delegate.h
@@ -16,6 +16,7 @@ #include "base/metrics/single_sample_metrics.h" #include "base/task/single_thread_task_runner.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "content/common/content_export.h" #include "content/public/renderer/render_frame_observer.h"
diff --git a/content/renderer/mhtml_handle_writer.cc b/content/renderer/mhtml_handle_writer.cc index 52f32c0..aa6b25d 100644 --- a/content/renderer/mhtml_handle_writer.cc +++ b/content/renderer/mhtml_handle_writer.cc
@@ -5,7 +5,6 @@ #include "content/renderer/mhtml_handle_writer.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h"
diff --git a/content/renderer/mhtml_handle_writer.h b/content/renderer/mhtml_handle_writer.h index f5ddfc1c..2783bb6f 100644 --- a/content/renderer/mhtml_handle_writer.h +++ b/content/renderer/mhtml_handle_writer.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/files/file.h" +#include "base/time/time.h" #include "content/common/download/mhtml_file_writer.mojom-forward.h" #include "mojo/public/cpp/system/data_pipe.h" @@ -134,4 +135,4 @@ } // namespace content -#endif // CONTENT_RENDERER_MHTML_HANDLE_WRITER_H_ \ No newline at end of file +#endif // CONTENT_RENDERER_MHTML_HANDLE_WRITER_H_
diff --git a/content/renderer/pepper/host_globals.cc b/content/renderer/pepper/host_globals.cc index e30ae7c..2db2139 100644 --- a/content/renderer/pepper/host_globals.cc +++ b/content/renderer/pepper/host_globals.cc
@@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/rand_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "content/public/common/content_switches.h"
diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.h b/content/renderer/pepper/pepper_hung_plugin_filter.h index cdda93924..4f3b06e 100644 --- a/content/renderer/pepper/pepper_hung_plugin_filter.h +++ b/content/renderer/pepper/pepper_hung_plugin_filter.h
@@ -7,6 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "content/common/pepper_plugin.mojom.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_sync_message_filter.h"
diff --git a/content/renderer/pepper/pepper_media_stream_audio_track_host.h b/content/renderer/pepper/pepper_media_stream_audio_track_host.h index 2c1c8f44..8176030 100644 --- a/content/renderer/pepper/pepper_media_stream_audio_track_host.h +++ b/content/renderer/pepper/pepper_media_stream_audio_track_host.h
@@ -11,6 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "content/renderer/pepper/pepper_media_stream_track_host_base.h" #include "media/base/audio_parameters.h" #include "ppapi/host/host_message_context.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_output.cc b/content/renderer/pepper/pepper_platform_audio_output.cc index c5561d2..8d1fc02 100644 --- a/content/renderer/pepper/pepper_platform_audio_output.cc +++ b/content/renderer/pepper/pepper_platform_audio_output.cc
@@ -156,7 +156,7 @@ const media::AudioParameters& params) { DCHECK(io_task_runner_->BelongsToCurrentThread()); if (ipc_) - ipc_->CreateStream(this, params, absl::nullopt); + ipc_->CreateStream(this, params); } void PepperPlatformAudioOutput::StartPlaybackOnIOThread() {
diff --git a/content/renderer/pepper/pepper_platform_audio_output_dev.cc b/content/renderer/pepper/pepper_platform_audio_output_dev.cc index ccf5d3e5..12dd98e9 100644 --- a/content/renderer/pepper/pepper_platform_audio_output_dev.cc +++ b/content/renderer/pepper/pepper_platform_audio_output_dev.cc
@@ -314,7 +314,7 @@ case IDLE: if (did_receive_auth_.IsSignaled() && device_id_.empty()) { state_ = CREATING_STREAM; - ipc_->CreateStream(this, params, absl::nullopt); + ipc_->CreateStream(this, params); } else { RequestDeviceAuthorizationOnIOThread(); start_on_authorized_ = true; @@ -327,7 +327,7 @@ case AUTHORIZED: state_ = CREATING_STREAM; - ipc_->CreateStream(this, params, absl::nullopt); + ipc_->CreateStream(this, params); start_on_authorized_ = false; break;
diff --git a/content/renderer/pepper/pepper_platform_audio_output_dev.h b/content/renderer/pepper/pepper_platform_audio_output_dev.h index 75bb7d7e..8d3334e 100644 --- a/content/renderer/pepper/pepper_platform_audio_output_dev.h +++ b/content/renderer/pepper/pepper_platform_audio_output_dev.h
@@ -10,6 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/waitable_event.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "media/audio/audio_output_ipc.h" #include "media/base/audio_parameters.h"
diff --git a/content/renderer/pepper/url_request_info_util.cc b/content/renderer/pepper/url_request_info_util.cc index 7350fbf..983d654 100644 --- a/content/renderer/pepper/url_request_info_util.cc +++ b/content/renderer/pepper/url_request_info_util.cc
@@ -10,6 +10,7 @@ #include "base/check.h" #include "base/notreached.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "content/public/renderer/render_frame.h" #include "content/renderer/pepper/host_globals.h" #include "content/renderer/pepper/pepper_file_ref_renderer_host.h"
diff --git a/content/renderer/pepper/video_encoder_shim.cc b/content/renderer/pepper/video_encoder_shim.cc index a3417f26..a366dbbf 100644 --- a/content/renderer/pepper/video_encoder_shim.cc +++ b/content/renderer/pepper/video_encoder_shim.cc
@@ -15,6 +15,7 @@ #include "base/system/sys_info.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "content/renderer/pepper/pepper_video_encoder_host.h" #include "content/renderer/render_thread_impl.h" #include "media/base/media_log.h"
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 452caed..df66eff 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc
@@ -40,7 +40,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 3475260..4d443ca 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc
@@ -37,7 +37,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequence_bound.h"
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc index 030fd7e..ec8318c00 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -25,7 +25,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h"
diff --git a/content/renderer/service_worker/service_worker_provider_context.cc b/content/renderer/service_worker/service_worker_provider_context.cc index a06bf3df..49b4140 100644 --- a/content/renderer/service_worker/service_worker_provider_context.cc +++ b/content/renderer/service_worker/service_worker_provider_context.cc
@@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/containers/cxx20_erase.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner_helpers.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/content/services/auction_worklet/bidder_worklet_unittest.cc b/content/services/auction_worklet/bidder_worklet_unittest.cc index e354c8d..59baa98 100644 --- a/content/services/auction_worklet/bidder_worklet_unittest.cc +++ b/content/services/auction_worklet/bidder_worklet_unittest.cc
@@ -17,6 +17,7 @@ #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "content/services/auction_worklet/public/mojom/auction_worklet_service.mojom.h" #include "content/services/auction_worklet/worklet_devtools_debug_test_util.h"
diff --git a/content/services/auction_worklet/seller_worklet.h b/content/services/auction_worklet/seller_worklet.h index 626cbb4..3c104e4 100644 --- a/content/services/auction_worklet/seller_worklet.h +++ b/content/services/auction_worklet/seller_worklet.h
@@ -15,6 +15,7 @@ #include "base/callback.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "content/services/auction_worklet/public/mojom/auction_worklet_service.mojom-forward.h" #include "content/services/auction_worklet/public/mojom/auction_worklet_service.mojom.h"
diff --git a/content/services/auction_worklet/set_bid_bindings.h b/content/services/auction_worklet/set_bid_bindings.h index a405b0e..04e9dc4 100644 --- a/content/services/auction_worklet/set_bid_bindings.h +++ b/content/services/auction_worklet/set_bid_bindings.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "content/services/auction_worklet/public/mojom/bidder_worklet.mojom-forward.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index 9e6fde15..cf042eeb 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn
@@ -133,6 +133,8 @@ "browser/shell_download_manager_delegate.h", "browser/shell_federated_permission_context.cc", "browser/shell_federated_permission_context.h", + "browser/shell_identity_dialog_controller.cc", + "browser/shell_identity_dialog_controller.h", "browser/shell_javascript_dialog.h", "browser/shell_javascript_dialog_manager.cc", "browser/shell_javascript_dialog_manager.h",
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc index 1720e904..353d55e5 100644 --- a/content/shell/browser/shell_content_browser_client.cc +++ b/content/shell/browser/shell_content_browser_client.cc
@@ -51,6 +51,7 @@ #include "content/shell/browser/shell_browser_context.h" #include "content/shell/browser/shell_browser_main_parts.h" #include "content/shell/browser/shell_devtools_manager_delegate.h" +#include "content/shell/browser/shell_identity_dialog_controller.h" #include "content/shell/browser/shell_paths.h" #include "content/shell/browser/shell_quota_permission_context.h" #include "content/shell/browser/shell_web_contents_view_delegate_creator.h" @@ -620,6 +621,11 @@ return http_status_code >= 400 && http_status_code < 600; } +std::unique_ptr<IdentityRequestDialogController> +ShellContentBrowserClient::CreateIdentityRequestDialogController() { + return std::make_unique<ShellIdentityDialogController>(); +} + void ShellContentBrowserClient::CreateFeatureListAndFieldTrials() { local_state_ = CreateLocalState(); SetUpFieldTrials();
diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h index 9aa5169..7d02e93b 100644 --- a/content/shell/browser/shell_content_browser_client.h +++ b/content/shell/browser/shell_content_browser_client.h
@@ -128,6 +128,8 @@ void GetHyphenationDictionary( base::OnceCallback<void(const base::FilePath&)>) override; bool HasErrorPage(int http_status_code) override; + std::unique_ptr<IdentityRequestDialogController> + CreateIdentityRequestDialogController() override; void OnNetworkServiceCreated( network::mojom::NetworkService* network_service) override;
diff --git a/content/shell/browser/shell_devtools_bindings.cc b/content/shell/browser/shell_devtools_bindings.cc index 5b7da37..d0432d17 100644 --- a/content/shell/browser/shell_devtools_bindings.cc +++ b/content/shell/browser/shell_devtools_bindings.cc
@@ -23,7 +23,6 @@ #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/values.h" #include "build/build_config.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/shell/browser/shell_identity_dialog_controller.cc b/content/shell/browser/shell_identity_dialog_controller.cc new file mode 100644 index 0000000..2727183 --- /dev/null +++ b/content/shell/browser/shell_identity_dialog_controller.cc
@@ -0,0 +1,23 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "content/shell/browser/shell_identity_dialog_controller.h" + +namespace content { + +void ShellIdentityDialogController::ShowAccountsDialog( + content::WebContents* rp_web_contents, + const GURL& idp_signin_url, + base::span<const IdentityRequestAccount> accounts, + const IdentityProviderMetadata& idp_metadata, + const ClientIdData& client_id_data, + IdentityRequestAccount::SignInMode sign_in_mode, + AccountSelectionCallback on_selected) { + // Similar in spirit to allowlisted permissions in ShellPermissionManager, + // we automatically select the first account here so that tests can pass. + DCHECK_GT(accounts.size(), 0ul); + std::move(on_selected).Run(accounts[0].id, /* is_sign_in= */ false); +} + +} // namespace content
diff --git a/content/shell/browser/shell_identity_dialog_controller.h b/content/shell/browser/shell_identity_dialog_controller.h new file mode 100644 index 0000000..b7eec9c --- /dev/null +++ b/content/shell/browser/shell_identity_dialog_controller.h
@@ -0,0 +1,25 @@ +// Copyright 2022 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CONTENT_SHELL_BROWSER_SHELL_IDENTITY_DIALOG_CONTROLLER_H_ +#define CONTENT_SHELL_BROWSER_SHELL_IDENTITY_DIALOG_CONTROLLER_H_ + +#include "content/public/browser/identity_request_dialog_controller.h" + +namespace content { + +class ShellIdentityDialogController : public IdentityRequestDialogController { + public: + void ShowAccountsDialog(content::WebContents* rp_web_contents, + const GURL& idp_signin_url, + base::span<const IdentityRequestAccount> accounts, + const IdentityProviderMetadata& idp_metadata, + const ClientIdData& client_id_data, + IdentityRequestAccount::SignInMode sign_in_mode, + AccountSelectionCallback on_selected) override; +}; + +} // namespace content + +#endif // CONTENT_SHELL_BROWSER_SHELL_IDENTITY_DIALOG_CONTROLLER_H_
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 5325219..bfaafcd 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn
@@ -1357,6 +1357,8 @@ "../browser/web_package/web_bundle_file_browsertest.cc", "../browser/web_package/web_bundle_network_browsertest.cc", "../browser/web_package/web_bundle_trustable_file_browsertest.cc", + "../browser/webid/test/fake_identity_request_dialog_controller.cc", + "../browser/webid/test/fake_identity_request_dialog_controller.h", "../browser/webid/test/webid_test_content_browser_client.cc", "../browser/webid/test/webid_test_content_browser_client.h", "../browser/webid/webid_browsertest.cc", @@ -2331,6 +2333,8 @@ "../browser/web_package/web_bundle_utils_unittest.cc", "../browser/webid/federated_auth_request_impl_unittest.cc", "../browser/webid/idp_network_request_manager_unittest.cc", + "../browser/webid/test/fake_identity_request_dialog_controller.cc", + "../browser/webid/test/fake_identity_request_dialog_controller.h", "../browser/webid/test/mock_active_session_permission_delegate.cc", "../browser/webid/test/mock_active_session_permission_delegate.h", "../browser/webid/test/mock_api_permission_delegate.cc",
diff --git a/content/test/attribution_simulator_impl.cc b/content/test/attribution_simulator_impl.cc index 7c8520d..0e66469 100644 --- a/content/test/attribution_simulator_impl.cc +++ b/content/test/attribution_simulator_impl.cc
@@ -17,6 +17,7 @@ #include "base/scoped_observation.h" #include "base/test/bind.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "base/time/time_to_iso8601.h" #include "base/values.h" #include "content/browser/attribution_reporting/attribution_cookie_checker.h"
diff --git a/content/test/fuzzer/mojolpm_fuzzer_support.h b/content/test/fuzzer/mojolpm_fuzzer_support.h index b0acc49..363471c 100644 --- a/content/test/fuzzer/mojolpm_fuzzer_support.h +++ b/content/test/fuzzer/mojolpm_fuzzer_support.h
@@ -7,6 +7,7 @@ #include "base/at_exit.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "content/public/test/browser_task_environment.h" #include "content/public/test/test_content_client_initializer.h" #include "content/public/test/test_renderer_host.h" @@ -82,4 +83,4 @@ } // namespace mojolpm } // namespace content -#endif // CONTENT_TEST_FUZZER_MOJOLPM_FUZZER_SUPPORT_H_ \ No newline at end of file +#endif // CONTENT_TEST_FUZZER_MOJOLPM_FUZZER_SUPPORT_H_
diff --git a/content/test/navigation_simulator_impl.h b/content/test/navigation_simulator_impl.h index 55714a8..ced318c 100644 --- a/content/test/navigation_simulator_impl.h +++ b/content/test/navigation_simulator_impl.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "content/browser/renderer_host/navigation_request.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_throttle.h"
diff --git a/content/web_test/browser/web_test_browser_context.cc b/content/web_test/browser/web_test_browser_context.cc index f2a44cb0..864234d9 100644 --- a/content/web_test/browser/web_test_browser_context.cc +++ b/content/web_test/browser/web_test_browser_context.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/web_test/browser/web_test_browser_main_runner.cc b/content/web_test/browser/web_test_browser_main_runner.cc index 823bfa0..107cd00 100644 --- a/content/web_test/browser/web_test_browser_main_runner.cc +++ b/content/web_test/browser/web_test_browser_main_runner.cc
@@ -211,9 +211,6 @@ command_line.AppendSwitch(switches::kUseFakeUIForMediaStream); command_line.AppendSwitch(switches::kUseFakeDeviceForMediaStream); - // Always run with fake FedCM UI. - command_line.AppendSwitch(switches::kUseFakeUIForFedCM); - // Enable the deprecated WebAuthn Mojo Testing API. command_line.AppendSwitch(switches::kEnableWebAuthDeprecatedMojoTestingApi);
diff --git a/content/web_test/browser/web_test_control_host.cc b/content/web_test/browser/web_test_control_host.cc index 98c2113..33cbb03 100644 --- a/content/web_test/browser/web_test_control_host.cc +++ b/content/web_test/browser/web_test_control_host.cc
@@ -32,7 +32,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index f82a6286..47a2e52 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc
@@ -24,7 +24,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/threading/scoped_blocking_call.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h"
diff --git a/crypto/nss_util_chromeos.cc b/crypto/nss_util_chromeos.cc index c30801b..ff3d3c1 100644 --- a/crypto/nss_util_chromeos.cc +++ b/crypto/nss_util_chromeos.cc
@@ -28,7 +28,6 @@ #include "base/path_service.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/threading/thread_checker.h"
diff --git a/dbus/bus_unittest.cc b/dbus/bus_unittest.cc index c907bc8..db825330 100644 --- a/dbus/bus_unittest.cc +++ b/dbus/bus_unittest.cc
@@ -14,6 +14,7 @@ #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "dbus/exported_object.h" #include "dbus/object_path.h" #include "dbus/object_proxy.h"
diff --git a/dbus/end_to_end_async_unittest.cc b/dbus/end_to_end_async_unittest.cc index 3b24454..aca0e9f 100644 --- a/dbus/end_to_end_async_unittest.cc +++ b/dbus/end_to_end_async_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/test_timeouts.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "dbus/bus.h" #include "dbus/message.h" #include "dbus/object_path.h"
diff --git a/dbus/object_manager_unittest.cc b/dbus/object_manager_unittest.cc index cd691a7e..b87a315 100644 --- a/dbus/object_manager_unittest.cc +++ b/dbus/object_manager_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "dbus/bus.h" #include "dbus/object_path.h" #include "dbus/object_proxy.h"
diff --git a/dbus/property_unittest.cc b/dbus/property_unittest.cc index 38c8b53..dcd226037 100644 --- a/dbus/property_unittest.cc +++ b/dbus/property_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "dbus/bus.h" #include "dbus/object_path.h" #include "dbus/object_proxy.h"
diff --git a/dbus/signal_sender_verification_unittest.cc b/dbus/signal_sender_verification_unittest.cc index ed33d04..3328608 100644 --- a/dbus/signal_sender_verification_unittest.cc +++ b/dbus/signal_sender_verification_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "dbus/bus.h" #include "dbus/message.h" #include "dbus/object_proxy.h"
diff --git a/dbus/test_server.cc b/dbus/test_server.cc index dae44e94..9c8b74c 100644 --- a/dbus/test_server.cc +++ b/dbus/test_server.cc
@@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/message_loop/message_pump_type.h" #include "base/test/test_timeouts.h" +#include "base/time/time.h" #include "dbus/bus.h" #include "dbus/test_service.h"
diff --git a/dbus/test_service.cc b/dbus/test_service.cc index 1dd9166..d08589d 100644 --- a/dbus/test_service.cc +++ b/dbus/test_service.cc
@@ -18,6 +18,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "dbus/bus.h" #include "dbus/exported_object.h" #include "dbus/message.h"
diff --git a/device/bluetooth/adapter.h b/device/bluetooth/adapter.h index accf6ea8..2b243318 100644 --- a/device/bluetooth/adapter.h +++ b/device/bluetooth/adapter.h
@@ -11,6 +11,7 @@ #include <vector> #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_advertisement.h" #include "device/bluetooth/bluetooth_gatt_connection.h"
diff --git a/device/bluetooth/bluetooth_adapter_winrt.cc b/device/bluetooth/bluetooth_adapter_winrt.cc index 7cb5de5..00550ee5 100644 --- a/device/bluetooth/bluetooth_adapter_winrt.cc +++ b/device/bluetooth/bluetooth_adapter_winrt.cc
@@ -27,7 +27,6 @@ #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/device/bluetooth/bluetooth_low_energy_device_watcher_mac.h b/device/bluetooth/bluetooth_low_energy_device_watcher_mac.h index 8afcd01..9230fa4 100644 --- a/device/bluetooth/bluetooth_low_energy_device_watcher_mac.h +++ b/device/bluetooth/bluetooth_low_energy_device_watcher_mac.h
@@ -15,7 +15,6 @@ #include "base/memory/ref_counted.h" #include "base/sequence_checker.h" #include "base/task/cancelable_task_tracker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/bluetooth_socket_thread.h b/device/bluetooth/bluetooth_socket_thread.h index c1c5972..768042d 100644 --- a/device/bluetooth/bluetooth_socket_thread.h +++ b/device/bluetooth/bluetooth_socket_thread.h
@@ -9,6 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "device/bluetooth/bluetooth_export.h" namespace base {
diff --git a/device/bluetooth/bluetooth_task_manager_win.cc b/device/bluetooth/bluetooth_task_manager_win.cc index fb3dc450..35d21e3 100644 --- a/device/bluetooth/bluetooth_task_manager_win.cc +++ b/device/bluetooth/bluetooth_task_manager_win.cc
@@ -18,7 +18,6 @@ #include "base/no_destructor.h" #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_thread_priority.h"
diff --git a/device/bluetooth/bluetooth_task_manager_win.h b/device/bluetooth/bluetooth_task_manager_win.h index 3f6a79e..0320a27 100644 --- a/device/bluetooth/bluetooth_task_manager_win.h +++ b/device/bluetooth/bluetooth_task_manager_win.h
@@ -14,6 +14,7 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "base/win/scoped_handle.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_export.h"
diff --git a/device/bluetooth/cast/bluetooth_adapter_cast.cc b/device/bluetooth/cast/bluetooth_adapter_cast.cc index 424bd6d..a2fe58f5 100644 --- a/device/bluetooth/cast/bluetooth_adapter_cast.cc +++ b/device/bluetooth/cast/bluetooth_adapter_cast.cc
@@ -11,7 +11,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chromecast/device/bluetooth/bluetooth_util.h" #include "chromecast/device/bluetooth/le/gatt_client_manager.h"
diff --git a/device/bluetooth/dbus/bluez_dbus_thread_manager.h b/device/bluetooth/dbus/bluez_dbus_thread_manager.h index 895e8764d..a97cb167 100644 --- a/device/bluetooth/dbus/bluez_dbus_thread_manager.h +++ b/device/bluetooth/dbus/bluez_dbus_thread_manager.h
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "device/bluetooth/bluetooth_export.h" namespace base {
diff --git a/device/bluetooth/dbus/fake_bluetooth_device_client.cc b/device/bluetooth/dbus/fake_bluetooth_device_client.cc index 62fee6c4..2647b85 100644 --- a/device/bluetooth/dbus/fake_bluetooth_device_client.cc +++ b/device/bluetooth/dbus/fake_bluetooth_device_client.cc
@@ -25,7 +25,6 @@ #include "base/observer_list.h" #include "base/rand_util.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/device/bluetooth/floss/floss_dbus_manager.h b/device/bluetooth/floss/floss_dbus_manager.h index 5152bee7..0f0455e 100644 --- a/device/bluetooth/floss/floss_dbus_manager.h +++ b/device/bluetooth/floss/floss_dbus_manager.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "device/bluetooth/bluetooth_export.h" namespace base {
diff --git a/device/bluetooth/test/bluetooth_test_cast.cc b/device/bluetooth/test/bluetooth_test_cast.cc index ea28562..2945434 100644 --- a/device/bluetooth/test/bluetooth_test_cast.cc +++ b/device/bluetooth/test/bluetooth_test_cast.cc
@@ -5,7 +5,6 @@ #include "device/bluetooth/test/bluetooth_test_cast.h" #include "base/callback_helpers.h" -#include "base/task/post_task.h" #include "chromecast/device/bluetooth/bluetooth_util.h" #include "chromecast/device/bluetooth/le/mock_gatt_client_manager.h" #include "chromecast/device/bluetooth/le/remote_device.h"
diff --git a/device/bluetooth/test/fake_central.cc b/device/bluetooth/test/fake_central.cc index 868f29c..1116949 100644 --- a/device/bluetooth/test/fake_central.cc +++ b/device/bluetooth/test/fake_central.cc
@@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/location.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "device/bluetooth/bluetooth_device.h" #include "device/bluetooth/bluetooth_discovery_filter.h"
diff --git a/device/fido/cable/fido_cable_discovery.cc b/device/fido/cable/fido_cable_discovery.cc index 8ad291b..8c9e18af 100644 --- a/device/fido/cable/fido_cable_discovery.cc +++ b/device/fido/cable/fido_cable_discovery.cc
@@ -30,10 +30,6 @@ #include "device/fido/features.h" #include "device/fido/fido_parsing_utils.h" -#if BUILDFLAG(IS_MAC) -#include "device/fido/mac/util.h" -#endif - namespace device { namespace { @@ -272,17 +268,6 @@ OnSetPowered(); } -#if BUILDFLAG(IS_MAC) - if (fido::mac::ProcessIsSigned()) { - FIDO_LOG(DEBUG) << "Bluetooth authorized: " - << (adapter_->GetOsPermissionStatus() != - BluetoothAdapter::PermissionStatus::kDenied); - } else { - FIDO_LOG(DEBUG) - << "Build not signed. Assuming Bluetooth permission is granted."; - } -#endif - // FidoCableDiscovery blocks its transport availability callback on the // DiscoveryStarted() calls of all instantiated discoveries. Hence, this call // must not be put behind the BLE adapter getting powered on (which is
diff --git a/device/fido/mac/util.h b/device/fido/mac/util.h index 38a899e1..2853e7f 100644 --- a/device/fido/mac/util.h +++ b/device/fido/mac/util.h
@@ -58,9 +58,6 @@ std::unique_ptr<PublicKey> SecKeyRefToECPublicKey(SecKeyRef public_key_ref) API_AVAILABLE(macosx(10.12.2)); -// ProcessIsSigned returns true if the current process has been code signed. -bool ProcessIsSigned(); - } // namespace mac } // namespace fido } // namespace device
diff --git a/device/fido/mac/util.mm b/device/fido/mac/util.mm index e7df480e..9c847aa 100644 --- a/device/fido/mac/util.mm +++ b/device/fido/mac/util.mm
@@ -152,17 +152,6 @@ return key; } -bool ProcessIsSigned() { - base::ScopedCFTypeRef<SecTaskRef> task(SecTaskCreateFromSelf(nullptr)); - if (!task) { - return false; - } - - base::ScopedCFTypeRef<CFStringRef> sign_id( - SecTaskCopySigningIdentifier(task.get(), /* error= */ nullptr)); - return static_cast<bool>(sign_id); -} - } // namespace mac } // namespace fido } // namespace device
diff --git a/device/fido/win/authenticator.cc b/device/fido/win/authenticator.cc index 03cf91e..484ba28 100644 --- a/device/fido/win/authenticator.cc +++ b/device/fido/win/authenticator.cc
@@ -15,7 +15,6 @@ #include "base/memory/ref_counted.h" #include "base/notreached.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "device/fido/authenticator_supported_options.h"
diff --git a/device/gamepad/nintendo_data_fetcher_unittest.cc b/device/gamepad/nintendo_data_fetcher_unittest.cc index 0be61da..5420abe 100644 --- a/device/gamepad/nintendo_data_fetcher_unittest.cc +++ b/device/gamepad/nintendo_data_fetcher_unittest.cc
@@ -11,6 +11,7 @@ #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "device/gamepad/gamepad_service.h" #include "services/device/device_service_test_base.h"
diff --git a/device/gamepad/test_support/fake_igamepad_statics.cc b/device/gamepad/test_support/fake_igamepad_statics.cc index 16366b9..98fb217 100644 --- a/device/gamepad/test_support/fake_igamepad_statics.cc +++ b/device/gamepad/test_support/fake_igamepad_statics.cc
@@ -7,7 +7,6 @@ #include "base/notreached.h" #include "base/run_loop.h" #include "base/strings/string_piece_forward.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "device/gamepad/test_support/fake_igamepad.h"
diff --git a/device/gamepad/wgi_data_fetcher_win_unittest.cc b/device/gamepad/wgi_data_fetcher_win_unittest.cc index 71c4c60d..6238ce6 100644 --- a/device/gamepad/wgi_data_fetcher_win_unittest.cc +++ b/device/gamepad/wgi_data_fetcher_win_unittest.cc
@@ -13,6 +13,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/win/scoped_hstring.h" #include "base/win/windows_version.h" #include "device/gamepad/gamepad_id_list.h"
diff --git a/device/vr/android/arcore/arcore_device.cc b/device/vr/android/arcore/arcore_device.cc index fe78b1f..c12063e 100644 --- a/device/vr/android/arcore/arcore_device.cc +++ b/device/vr/android/arcore/arcore_device.cc
@@ -11,7 +11,6 @@ #include "base/containers/contains.h" #include "base/no_destructor.h" #include "base/numerics/math_constants.h" -#include "base/task/post_task.h" #include "base/trace_event/trace_event.h" #include "device/base/features.h" #include "device/vr/android/arcore/ar_image_transport.h"
diff --git a/device/vr/android/arcore/arcore_gl.cc b/device/vr/android/arcore/arcore_gl.cc index 07016fb..e63e0050 100644 --- a/device/vr/android/arcore/arcore_gl.cc +++ b/device/vr/android/arcore/arcore_gl.cc
@@ -17,7 +17,6 @@ #include "base/cxx17_backports.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h"
diff --git a/device/vr/android/arcore/arcore_gl.h b/device/vr/android/arcore/arcore_gl.h index 0e2d909..a56664d 100644 --- a/device/vr/android/arcore/arcore_gl.h +++ b/device/vr/android/arcore/arcore_gl.h
@@ -14,6 +14,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "device/vr/android/arcore/ar_compositor_frame_sink.h" #include "device/vr/public/cpp/xr_frame_sink_client.h" #include "device/vr/public/mojom/isolated_xr_service.mojom.h"
diff --git a/docs/security/clusterfuzz-for-sheriffs.md b/docs/security/clusterfuzz-for-sheriffs.md index 7f1c81a..961ce23 100644 --- a/docs/security/clusterfuzz-for-sheriffs.md +++ b/docs/security/clusterfuzz-for-sheriffs.md
@@ -16,6 +16,9 @@ Please *do* specify the crbug number when uploading the test case. This will allow ClusterFuzz to keep the crbug updated with progress. +Please *don't* upload test cases unless they're obviously harmless. Currently +ClusterFuzz does not support untrusted workloads. + ## Useful jobs You should chose the right job type depending on the format of file you want to
diff --git a/docs/security/sheriff.md b/docs/security/sheriff.md index 190de2a..1b04c76 100644 --- a/docs/security/sheriff.md +++ b/docs/security/sheriff.md
@@ -227,15 +227,16 @@ Tips for reproducing bugs: -* For any sort of a crash, CHECK/DCHECK or memory safety problem - [use ClusterFuzz](clusterfuzz-for-sheriffs.md). As well as reproducing bugs, - ClusterFuzz will help you with lots of subsequent bisection and labelling - tasks. * Assume that test cases may be malicious. You should only reproduce bugs on your local machine if you're completely certain that you understand 100% of the test case. If not, use a disposable virtual machine. If you're inside Google, a good way to do this is using [Redshell](https://goto.google.com/redshell-for-chrome-sheriffs). +* For any sort of a crash, CHECK/DCHECK or memory safety problem + [use ClusterFuzz](clusterfuzz-for-sheriffs.md). As well as reproducing bugs, + ClusterFuzz will help you with lots of subsequent bisection and labelling + tasks. Currently ClusterFuzz cannot guard against malicious test cases, + so be just as paranoid as if you were running a test case locally. * [Instructions for using an Android emulator can be found here](/docs/android_emulator.md). If you're inside Google, we have a [guide for testing using Google infrastructure](https://goto.google.com/android-for-chrome-sheriffs).
diff --git a/extensions/browser/api/alarms/alarm_manager.h b/extensions/browser/api/alarms/alarm_manager.h index f6c596c..7f4dc2b3 100644 --- a/extensions/browser/api/alarms/alarm_manager.h +++ b/extensions/browser/api/alarms/alarm_manager.h
@@ -15,6 +15,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_registry.h"
diff --git a/extensions/browser/api/declarative_net_request/declarative_net_request_api.cc b/extensions/browser/api/declarative_net_request/declarative_net_request_api.cc index 5d222b02..2693499 100644 --- a/extensions/browser/api/declarative_net_request/declarative_net_request_api.cc +++ b/extensions/browser/api/declarative_net_request/declarative_net_request_api.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/time/time.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/extensions/browser/api/declarative_net_request/file_sequence_helper_unittest.cc b/extensions/browser/api/declarative_net_request/file_sequence_helper_unittest.cc index 77bd96e0..5766f62f 100644 --- a/extensions/browser/api/declarative_net_request/file_sequence_helper_unittest.cc +++ b/extensions/browser/api/declarative_net_request/file_sequence_helper_unittest.cc
@@ -13,7 +13,6 @@ #include "base/format_macros.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_restrictions.h" #include "components/crx_file/id_util.h"
diff --git a/extensions/browser/api/declarative_net_request/rules_monitor_service.cc b/extensions/browser/api/declarative_net_request/rules_monitor_service.cc index 17babe0..90e0451 100644 --- a/extensions/browser/api/declarative_net_request/rules_monitor_service.cc +++ b/extensions/browser/api/declarative_net_request/rules_monitor_service.cc
@@ -19,7 +19,6 @@ #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_restrictions.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/extensions/browser/api/feedback_private/log_source_access_manager.cc b/extensions/browser/api/feedback_private/log_source_access_manager.cc index 93261b5a..c657a038b 100644 --- a/extensions/browser/api/feedback_private/log_source_access_manager.cc +++ b/extensions/browser/api/feedback_private/log_source_access_manager.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/strings/string_split.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/time/default_tick_clock.h"
diff --git a/extensions/browser/api/file_handlers/app_file_handler_util.cc b/extensions/browser/api/file_handlers/app_file_handler_util.cc index effe0e1..65b2c988 100644 --- a/extensions/browser/api/file_handlers/app_file_handler_util.cc +++ b/extensions/browser/api/file_handlers/app_file_handler_util.cc
@@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/extensions/browser/api/file_handlers/directory_util.cc b/extensions/browser/api/file_handlers/directory_util.cc index 803e163..b3a53e2 100644 --- a/extensions/browser/api/file_handlers/directory_util.cc +++ b/extensions/browser/api/file_handlers/directory_util.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "build/chromeos_buildflags.h"
diff --git a/extensions/browser/api/file_handlers/mime_util.cc b/extensions/browser/api/file_handlers/mime_util.cc index 11371d1..d1d555a 100644 --- a/extensions/browser/api/file_handlers/mime_util.cc +++ b/extensions/browser/api/file_handlers/mime_util.cc
@@ -10,7 +10,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h"
diff --git a/extensions/browser/api/file_system/file_system_api.cc b/extensions/browser/api/file_system/file_system_api.cc index 38e181e9..033dbc3b 100644 --- a/extensions/browser/api/file_system/file_system_api.cc +++ b/extensions/browser/api/file_system/file_system_api.cc
@@ -24,6 +24,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/extensions/browser/api/guest_view/web_view/web_view_internal_api.h b/extensions/browser/api/guest_view/web_view/web_view_internal_api.h index 45ee413..3f87956 100644 --- a/extensions/browser/api/guest_view/web_view/web_view_internal_api.h +++ b/extensions/browser/api/guest_view/web_view/web_view_internal_api.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "extensions/browser/api/execute_code_function.h" #include "extensions/browser/api/web_contents_capture_client.h" #include "extensions/browser/extension_function.h"
diff --git a/extensions/browser/api/lock_screen_data/data_item.cc b/extensions/browser/api/lock_screen_data/data_item.cc index 052a9530..65bfbfe 100644 --- a/extensions/browser/api/lock_screen_data/data_item.cc +++ b/extensions/browser/api/lock_screen_data/data_item.cc
@@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h" #include "components/value_store/value_store.h"
diff --git a/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc b/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc index 40f1375..feb7e42e 100644 --- a/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc +++ b/extensions/browser/api/lock_screen_data/lock_screen_item_storage_unittest.cc
@@ -19,7 +19,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/values.h" #include "chromeos/login/login_state/login_state.h"
diff --git a/extensions/browser/api/networking_private/networking_private_linux.h b/extensions/browser/api/networking_private/networking_private_linux.h index 3d94778..a2a8a09 100644 --- a/extensions/browser/api/networking_private/networking_private_linux.h +++ b/extensions/browser/api/networking_private/networking_private_linux.h
@@ -12,6 +12,7 @@ #include "base/observer_list.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "components/keyed_service/core/keyed_service.h" #include "extensions/browser/api/networking_private/networking_private_delegate.h"
diff --git a/extensions/browser/api/networking_private/networking_private_service_client.cc b/extensions/browser/api/networking_private/networking_private_service_client.cc index 204bfde..42b11c4 100644 --- a/extensions/browser/api/networking_private/networking_private_service_client.cc +++ b/extensions/browser/api/networking_private/networking_private_service_client.cc
@@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/task/lazy_thread_pool_task_runner.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "components/onc/onc_constants.h"
diff --git a/extensions/browser/api/serial/serial_api.cc b/extensions/browser/api/serial/serial_api.cc index a705a3880..c1cb2eb 100644 --- a/extensions/browser/api/serial/serial_api.cc +++ b/extensions/browser/api/serial/serial_api.cc
@@ -10,7 +10,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/values.h" #include "build/build_config.h" #include "extensions/browser/api/api_resource_manager.h"
diff --git a/extensions/browser/api/sockets_udp/test_udp_echo_server.cc b/extensions/browser/api/sockets_udp/test_udp_echo_server.cc index 44485ae..af73de0 100644 --- a/extensions/browser/api/sockets_udp/test_udp_echo_server.cc +++ b/extensions/browser/api/sockets_udp/test_udp_echo_server.cc
@@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/ip_address.h"
diff --git a/extensions/browser/api/sockets_udp/test_udp_echo_server.h b/extensions/browser/api/sockets_udp/test_udp_echo_server.h index 1d05486..5a8af82 100644 --- a/extensions/browser/api/sockets_udp/test_udp_echo_server.h +++ b/extensions/browser/api/sockets_udp/test_udp_echo_server.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/base/host_port_pair.h" namespace net {
diff --git a/extensions/browser/api/system_info/system_info_provider.cc b/extensions/browser/api/system_info/system_info_provider.cc index cee41e96..24326c6 100644 --- a/extensions/browser/api/system_info/system_info_provider.cc +++ b/extensions/browser/api/system_info/system_info_provider.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/extensions/browser/api/system_network/system_network_api.cc b/extensions/browser/api/system_network/system_network_api.cc index 5e60fed..1295fc7a 100644 --- a/extensions/browser/api/system_network/system_network_api.cc +++ b/extensions/browser/api/system_network/system_network_api.cc
@@ -5,7 +5,6 @@ #include "extensions/browser/api/system_network/system_network_api.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/network_service_instance.h" #include "services/network/public/mojom/network_service.mojom.h"
diff --git a/extensions/browser/api/system_storage/system_storage_api.cc b/extensions/browser/api/system_storage/system_storage_api.cc index 40e6524..3971d850 100644 --- a/extensions/browser/api/system_storage/system_storage_api.cc +++ b/extensions/browser/api/system_storage/system_storage_api.cc
@@ -5,7 +5,6 @@ #include "extensions/browser/api/system_storage/system_storage_api.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc index 456e9c1..9b86e4a 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc
@@ -25,7 +25,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "base/values.h"
diff --git a/extensions/browser/api/web_request/web_request_time_tracker_unittest.cc b/extensions/browser/api/web_request/web_request_time_tracker_unittest.cc index 2f5ad6f..8531d67 100644 --- a/extensions/browser/api/web_request/web_request_time_tracker_unittest.cc +++ b/extensions/browser/api/web_request/web_request_time_tracker_unittest.cc
@@ -8,6 +8,7 @@ #include <stdint.h> #include "base/test/metrics/histogram_tester.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace {
diff --git a/extensions/browser/content_hash_fetcher.cc b/extensions/browser/content_hash_fetcher.cc index 2c6d8551..2e8633b 100644 --- a/extensions/browser/content_hash_fetcher.cc +++ b/extensions/browser/content_hash_fetcher.cc
@@ -13,7 +13,6 @@ #include "base/bind.h" #include "base/files/file_util.h" #include "base/json/json_reader.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/content_verifier/content_hash.cc b/extensions/browser/content_verifier/content_hash.cc index 0307ea57..0e801dd6 100644 --- a/extensions/browser/content_verifier/content_hash.cc +++ b/extensions/browser/content_verifier/content_hash.cc
@@ -13,7 +13,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/timer/elapsed_timer.h" #include "content/public/browser/browser_thread.h" #include "crypto/sha2.h"
diff --git a/extensions/browser/content_verify_job.cc b/extensions/browser/content_verify_job.cc index bcbec8d..a7bef9e 100644 --- a/extensions/browser/content_verify_job.cc +++ b/extensions/browser/content_verify_job.cc
@@ -10,7 +10,6 @@ #include "base/lazy_instance.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/timer/elapsed_timer.h" #include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/event_router.cc b/extensions/browser/event_router.cc index aaa47d0e..3d8a23d 100644 --- a/extensions/browser/event_router.cc +++ b/extensions/browser/event_router.cc
@@ -14,7 +14,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h" -#include "base/task/post_task.h" #include "base/values.h" #include "components/crx_file/id_util.h" #include "content/public/browser/browser_context.h"
diff --git a/extensions/browser/extension_api_frame_id_map.cc b/extensions/browser/extension_api_frame_id_map.cc index 49f8b0b0..9fbe9c26 100644 --- a/extensions/browser/extension_api_frame_id_map.cc +++ b/extensions/browser/extension_api_frame_id_map.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/check_op.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/navigation_handle.h"
diff --git a/extensions/browser/guest_view/web_view/web_view_content_script_manager.cc b/extensions/browser/guest_view/web_view/web_view_content_script_manager.cc index 4000194..20735e8 100644 --- a/extensions/browser/guest_view/web_view/web_view_content_script_manager.cc +++ b/extensions/browser/guest_view/web_view/web_view_content_script_manager.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc index 6412ca421..5617a28 100644 --- a/extensions/browser/guest_view/web_view/web_view_guest.cc +++ b/extensions/browser/guest_view/web_view/web_view_guest.cc
@@ -17,7 +17,6 @@ #include "base/metrics/user_metrics.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "components/guest_view/browser/guest_view_event.h" #include "components/guest_view/browser/guest_view_manager.h"
diff --git a/extensions/browser/image_loader.cc b/extensions/browser/image_loader.cc index d8490d37..d648285 100644 --- a/extensions/browser/image_loader.cc +++ b/extensions/browser/image_loader.cc
@@ -15,7 +15,6 @@ #include "base/compiler_specific.h" #include "base/files/file_util.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/component_extension_resource_manager.h"
diff --git a/extensions/browser/quota_service_unittest.cc b/extensions/browser/quota_service_unittest.cc index deecc6d9..9e1bc87 100644 --- a/extensions/browser/quota_service_unittest.cc +++ b/extensions/browser/quota_service_unittest.cc
@@ -9,6 +9,7 @@ #include "base/process/process.h" #include "base/run_loop.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "content/public/test/browser_task_environment.h" #include "extensions/browser/extension_function.h" #include "extensions/browser/extension_function_registry.h"
diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc index b73738d0..92ed57f 100644 --- a/extensions/browser/sandboxed_unpacker.cc +++ b/extensions/browser/sandboxed_unpacker.cc
@@ -22,7 +22,6 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/timer/elapsed_timer.h" #include "build/build_config.h"
diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/browser/updater/extension_downloader.cc index d9d1910a..0514158 100644 --- a/extensions/browser/updater/extension_downloader.cc +++ b/extensions/browser/updater/extension_downloader.cc
@@ -19,7 +19,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/version.h" #include "components/crx_file/crx_verifier.h"
diff --git a/extensions/browser/web_ui_user_script_loader.cc b/extensions/browser/web_ui_user_script_loader.cc index 444d9f5..b901491 100644 --- a/extensions/browser/web_ui_user_script_loader.cc +++ b/extensions/browser/web_ui_user_script_loader.cc
@@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/extensions/browser/zipfile_installer.cc b/extensions/browser/zipfile_installer.cc index 93a8af596..f166da5 100644 --- a/extensions/browser/zipfile_installer.cc +++ b/extensions/browser/zipfile_installer.cc
@@ -10,7 +10,6 @@ #include "base/json/json_reader.h" #include "base/path_service.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "components/services/unzip/content/unzip_service.h" #include "components/services/unzip/public/cpp/unzip.h"
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc index 2ebf408..621e25e 100644 --- a/extensions/renderer/script_injection.cc +++ b/extensions/renderer/script_injection.cc
@@ -11,6 +11,7 @@ #include "base/feature_list.h" #include "base/lazy_instance.h" #include "base/metrics/histogram_macros.h" +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "base/trace_event/typed_macros.h" #include "base/tracing/protos/chrome_track_event.pbzero.h"
diff --git a/extensions/shell/browser/shell_browser_context.cc b/extensions/shell/browser/shell_browser_context.cc index 07be4ab..d4607cc405 100644 --- a/extensions/shell/browser/shell_browser_context.cc +++ b/extensions/shell/browser/shell_browser_context.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/memory/scoped_refptr.h" -#include "base/task/post_task.h" #include "components/guest_view/browser/guest_view_manager.h" #include "extensions/shell/browser/shell_special_storage_policy.h"
diff --git a/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc b/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc index 7c92cb7..3e97daf 100644 --- a/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc +++ b/extensions/shell/browser/shell_desktop_controller_aura_browsertest.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/time/time.h" #include "components/keep_alive_registry/keep_alive_registry.h"
diff --git a/fuchsia/engine/browser/content_directory_loader_factory.cc b/fuchsia/engine/browser/content_directory_loader_factory.cc index ff93e9e..59708722 100644 --- a/fuchsia/engine/browser/content_directory_loader_factory.cc +++ b/fuchsia/engine/browser/content_directory_loader_factory.cc
@@ -21,7 +21,6 @@ #include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "fuchsia/base/fuchsia_dir_scheme.h"
diff --git a/fuchsia/engine/browser/frame_permission_controller.cc b/fuchsia/engine/browser/frame_permission_controller.cc index 0c0c198..51865c8 100644 --- a/fuchsia/engine/browser/frame_permission_controller.cc +++ b/fuchsia/engine/browser/frame_permission_controller.cc
@@ -102,7 +102,8 @@ PermissionType permission, const url::Origin& requesting_origin) { url::Origin embedding_origin = url::Origin::Create( - permissions::PermissionUtil::GetLastCommittedOriginAsURL(web_contents_)); + permissions::PermissionUtil::GetLastCommittedOriginAsURL( + web_contents_->GetMainFrame())); const url::Origin& canonical_origin = GetCanonicalOrigin(permission, requesting_origin, embedding_origin);
diff --git a/fuchsia/engine/browser/media_player_impl_unittest.cc b/fuchsia/engine/browser/media_player_impl_unittest.cc index f67930f..a399876 100644 --- a/fuchsia/engine/browser/media_player_impl_unittest.cc +++ b/fuchsia/engine/browser/media_player_impl_unittest.cc
@@ -8,6 +8,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "content/public/browser/media_session.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/fuchsia/engine/renderer/web_engine_audio_device_factory.h b/fuchsia/engine/renderer/web_engine_audio_device_factory.h index 177dea2c..2b853e1 100644 --- a/fuchsia/engine/renderer/web_engine_audio_device_factory.h +++ b/fuchsia/engine/renderer/web_engine_audio_device_factory.h
@@ -6,6 +6,7 @@ #define FUCHSIA_ENGINE_RENDERER_WEB_ENGINE_AUDIO_DEVICE_FACTORY_H_ #include "base/threading/thread.h" +#include "base/time/time.h" #include "third_party/blink/public/common/tokens/tokens.h" #include "third_party/blink/public/platform/web_common.h" #include "third_party/blink/public/web/modules/media/audio/audio_device_factory.h"
diff --git a/fuchsia/engine/renderer/web_engine_audio_renderer.cc b/fuchsia/engine/renderer/web_engine_audio_renderer.cc index 45eeb9c..5c8e83f8 100644 --- a/fuchsia/engine/renderer/web_engine_audio_renderer.cc +++ b/fuchsia/engine/renderer/web_engine_audio_renderer.cc
@@ -12,6 +12,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "media/base/cdm_context.h" #include "media/base/decoder_buffer.h" #include "media/base/renderer_client.h"
diff --git a/fuchsia/engine/renderer/web_engine_audio_renderer_test.cc b/fuchsia/engine/renderer/web_engine_audio_renderer_test.cc index 0381d210..3f1ad83f 100644 --- a/fuchsia/engine/renderer/web_engine_audio_renderer_test.cc +++ b/fuchsia/engine/renderer/web_engine_audio_renderer_test.cc
@@ -14,6 +14,7 @@ #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "media/base/cdm_context.h" #include "media/base/decoder_buffer.h" #include "media/base/renderer_client.h"
diff --git a/gin/v8_platform.cc b/gin/v8_platform.cc index 78b8a28..9520232 100644 --- a/gin/v8_platform.cc +++ b/gin/v8_platform.cc
@@ -16,7 +16,6 @@ #include "base/rand_util.h" #include "base/system/sys_info.h" #include "base/task/post_job.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/google_apis/calendar/calendar_api_requests.h b/google_apis/calendar/calendar_api_requests.h index 17203e89..32ffdfe 100644 --- a/google_apis/calendar/calendar_api_requests.h +++ b/google_apis/calendar/calendar_api_requests.h
@@ -5,6 +5,7 @@ #ifndef GOOGLE_APIS_CALENDAR_CALENDAR_API_REQUESTS_H_ #define GOOGLE_APIS_CALENDAR_CALENDAR_API_REQUESTS_H_ +#include "base/time/time.h" #include "google_apis/calendar/calendar_api_response_types.h" #include "google_apis/calendar/calendar_api_url_generator.h" #include "google_apis/common/api_error_codes.h"
diff --git a/google_apis/calendar/calendar_api_requests_unittest.cc b/google_apis/calendar/calendar_api_requests_unittest.cc index 7cc33bf..4a520d6 100644 --- a/google_apis/calendar/calendar_api_requests_unittest.cc +++ b/google_apis/calendar/calendar_api_requests_unittest.cc
@@ -7,6 +7,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "google_apis/calendar/calendar_api_response_types.h" #include "google_apis/common/dummy_auth_service.h" #include "google_apis/common/request_sender.h"
diff --git a/google_apis/calendar/calendar_api_url_generator_unittest.cc b/google_apis/calendar/calendar_api_url_generator_unittest.cc index ba923869..3cf5fcf 100644 --- a/google_apis/calendar/calendar_api_url_generator_unittest.cc +++ b/google_apis/calendar/calendar_api_url_generator_unittest.cc
@@ -4,6 +4,7 @@ #include "google_apis/calendar/calendar_api_url_generator.h" +#include "base/time/time.h" #include "third_party/googletest/src/googletest/include/gtest/gtest.h" namespace google_apis {
diff --git a/google_apis/drive/drive_api_requests_unittest.cc b/google_apis/drive/drive_api_requests_unittest.cc index fb7ea70..ec93790 100644 --- a/google_apis/drive/drive_api_requests_unittest.cc +++ b/google_apis/drive/drive_api_requests_unittest.cc
@@ -21,6 +21,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "base/values.h" #include "google_apis/common/dummy_auth_service.h" #include "google_apis/common/request_sender.h"
diff --git a/google_apis/gcm/engine/heartbeat_manager.h b/google_apis/gcm/engine/heartbeat_manager.h index 3853717..f0dd034 100644 --- a/google_apis/gcm/engine/heartbeat_manager.h +++ b/google_apis/gcm/engine/heartbeat_manager.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/memory/weak_ptr.h" #include "base/power_monitor/power_observer.h" +#include "base/time/time.h" #include "google_apis/gcm/base/gcm_export.h" #include "google_apis/gcm/engine/connection_factory.h"
diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_probe.cc index e1a5d98..2dfcf903 100644 --- a/google_apis/gcm/tools/mcs_probe.cc +++ b/google_apis/gcm/tools/mcs_probe.cc
@@ -32,6 +32,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "google_apis/gcm/base/fake_encryptor.h"
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index c5e660a..7c33d18 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -31,6 +31,7 @@ #include "base/strings/string_split.h" #include "base/system/sys_info.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/memory_allocator_dump.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/process_memory_dump.h"
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.h b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.h index a11155b7..685d44a 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough.h
@@ -901,6 +901,7 @@ // Include the prototypes of all the doer functions from a separate header to // keep this file clean. +#include "base/time/time.h" #include "gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doer_prototypes.h" };
diff --git a/gpu/command_buffer/service/gpu_tracer.h b/gpu/command_buffer/service/gpu_tracer.h index 24b1b6d..26319426 100644 --- a/gpu/command_buffer/service/gpu_tracer.h +++ b/gpu/command_buffer/service/gpu_tracer.h
@@ -16,6 +16,7 @@ #include "base/containers/stack.h" #include "base/memory/raw_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "gpu/gpu_gles2_export.h" namespace gl {
diff --git a/gpu/command_buffer/service/gpu_tracer_unittest.cc b/gpu/command_buffer/service/gpu_tracer_unittest.cc index 67e8e65..f3b1c52 100644 --- a/gpu/command_buffer/service/gpu_tracer_unittest.cc +++ b/gpu/command_buffer/service/gpu_tracer_unittest.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/bind.h" +#include "base/time/time.h" #include "gpu/command_buffer/client/client_test_helper.h" #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" #include "gpu/command_buffer/service/gpu_service_test.h"
diff --git a/gpu/command_buffer/service/query_manager_unittest.cc b/gpu/command_buffer/service/query_manager_unittest.cc index 959c8d6..40c55df 100644 --- a/gpu/command_buffer/service/query_manager_unittest.cc +++ b/gpu/command_buffer/service/query_manager_unittest.cc
@@ -8,6 +8,7 @@ #include <memory> #include "base/bind.h" +#include "base/time/time.h" #include "gpu/command_buffer/client/client_test_helper.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" #include "gpu/command_buffer/service/error_state_mock.h"
diff --git a/gpu/command_buffer/service/scheduler_unittest.cc b/gpu/command_buffer/service/scheduler_unittest.cc index e921d556..3cc920c 100644 --- a/gpu/command_buffer/service/scheduler_unittest.cc +++ b/gpu/command_buffer/service/scheduler_unittest.cc
@@ -7,7 +7,6 @@ #include <algorithm> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" #include "base/time/time.h"
diff --git a/gpu/command_buffer/service/shared_image_manager.cc b/gpu/command_buffer/service/shared_image_manager.cc index 95255b2..9e1a68c 100644 --- a/gpu/command_buffer/service/shared_image_manager.cc +++ b/gpu/command_buffer/service/shared_image_manager.cc
@@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/process_memory_dump.h" #include "base/trace_event/trace_event.h"
diff --git a/gpu/command_buffer/tests/decoder_perftest.cc b/gpu/command_buffer/tests/decoder_perftest.cc index 334b356..8010a4e 100644 --- a/gpu/command_buffer/tests/decoder_perftest.cc +++ b/gpu/command_buffer/tests/decoder_perftest.cc
@@ -8,6 +8,7 @@ #include "base/memory/raw_ptr.h" #include "base/process/process.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "gpu/command_buffer/client/gles2_cmd_helper.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/command_buffer/client/gpu_control.h"
diff --git a/gpu/command_buffer/tests/egl_test.cc b/gpu/command_buffer/tests/egl_test.cc index d34ffdfc..79d7220 100644 --- a/gpu/command_buffer/tests/egl_test.cc +++ b/gpu/command_buffer/tests/egl_test.cc
@@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "gpu/gles2_conform_support/egl/test_support.h" // This file tests EGL basic interface for command_buffer_gles2, the mode of
diff --git a/gpu/ipc/host/shader_disk_cache.cc b/gpu/ipc/host/shader_disk_cache.cc index 8caa5e4..f5c6feb 100644 --- a/gpu/ipc/host/shader_disk_cache.cc +++ b/gpu/ipc/host/shader_disk_cache.cc
@@ -11,6 +11,7 @@ #include "base/strings/string_number_conversions.h" #include "base/system/sys_info.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "build/build_config.h" #include "gpu/command_buffer/common/constants.h" #include "gpu/config/gpu_preferences.h"
diff --git a/gpu/ipc/host/shader_disk_cache_unittest.cc b/gpu/ipc/host/shader_disk_cache_unittest.cc index 2a33f84..b7d50d0b 100644 --- a/gpu/ipc/host/shader_disk_cache_unittest.cc +++ b/gpu/ipc/host/shader_disk_cache_unittest.cc
@@ -7,6 +7,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/test/bind.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "net/base/test_completion_callback.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/gpu/ipc/in_process_command_buffer.h b/gpu/ipc/in_process_command_buffer.h index adb65b8..20b099d 100644 --- a/gpu/ipc/in_process_command_buffer.h +++ b/gpu/ipc/in_process_command_buffer.h
@@ -23,6 +23,7 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/viz/common/display/update_vsync_parameters_callback.h" #include "components/viz/common/gpu/gpu_vsync_callback.h"
diff --git a/gpu/ipc/service/gpu_channel_manager.h b/gpu/ipc/service/gpu_channel_manager.h index 3788f0a1..5ede05a06 100644 --- a/gpu/ipc/service/gpu_channel_manager.h +++ b/gpu/ipc/service/gpu_channel_manager.h
@@ -19,6 +19,7 @@ #include "base/process/process_handle.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "build/build_config.h" #include "gpu/command_buffer/common/activity_flags.h"
diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm index 224542e..767d3f6 100644 --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
@@ -12,6 +12,7 @@ #include "base/command_line.h" #include "base/metrics/histogram_macros.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "gpu/command_buffer/common/swap_buffers_complete_params.h" #include "gpu/ipc/service/gpu_channel_manager.h"
diff --git a/gpu/ipc/service/pass_through_image_transport_surface.cc b/gpu/ipc/service/pass_through_image_transport_surface.cc index a05d004..01c2cba 100644 --- a/gpu/ipc/service/pass_through_image_transport_surface.cc +++ b/gpu/ipc/service/pass_through_image_transport_surface.cc
@@ -10,6 +10,7 @@ #include "base/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros_local.h" +#include "base/time/time.h" #include "build/build_config.h" #include "gpu/command_buffer/common/swap_buffers_complete_params.h" #include "ui/gfx/vsync_provider.h"
diff --git a/headless/app/headless_shell.cc b/headless/app/headless_shell.cc index fe33f70..11772f5 100644 --- a/headless/app/headless_shell.cc +++ b/headless/app/headless_shell.cc
@@ -23,7 +23,6 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "build/branding_buildflags.h"
diff --git a/headless/lib/browser/headless_request_context_manager.cc b/headless/lib/browser/headless_request_context_manager.cc index 22a72c2b..8587de8 100644 --- a/headless/lib/browser/headless_request_context_manager.cc +++ b/headless/lib/browser/headless_request_context_manager.cc
@@ -5,7 +5,6 @@ #include "headless/lib/browser/headless_request_context_manager.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/headless/lib/browser/policy/headless_browser_policy_connector.cc b/headless/lib/browser/policy/headless_browser_policy_connector.cc index 277bf3e9..a8dc184a 100644 --- a/headless/lib/browser/policy/headless_browser_policy_connector.cc +++ b/headless/lib/browser/policy/headless_browser_policy_connector.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/headless/lib/browser/protocol/headless_handler.cc b/headless/lib/browser/protocol/headless_handler.cc index 1433e6d..1078d5e 100644 --- a/headless/lib/browser/protocol/headless_handler.cc +++ b/headless/lib/browser/protocol/headless_handler.cc
@@ -9,6 +9,7 @@ #include "base/base_switches.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/time/time.h" #include "cc/base/switches.h" #include "components/viz/common/frame_sinks/begin_frame_args.h" #include "components/viz/common/switches.h"
diff --git a/ios/chrome/app/application_delegate/metrics_mediator.mm b/ios/chrome/app/application_delegate/metrics_mediator.mm index 68108707..bb85935 100644 --- a/ios/chrome/app/application_delegate/metrics_mediator.mm +++ b/ios/chrome/app/application_delegate/metrics_mediator.mm
@@ -11,7 +11,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/user_metrics_action.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "build/branding_buildflags.h"
diff --git a/ios/chrome/app/memory_monitor.mm b/ios/chrome/app/memory_monitor.mm index af110b1..76f9fb7 100644 --- a/ios/chrome/app/memory_monitor.mm +++ b/ios/chrome/app/memory_monitor.mm
@@ -14,7 +14,6 @@ #import "base/mac/foundation_util.h" #include "base/strings/sys_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #import "components/previous_session_info/previous_session_info.h"
diff --git a/ios/chrome/app/startup_tasks.mm b/ios/chrome/app/startup_tasks.mm index 1430412..99a7f77 100644 --- a/ios/chrome/app/startup_tasks.mm +++ b/ios/chrome/app/startup_tasks.mm
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #import "ios/chrome/app/deferred_initialization_runner.h" #include "ios/chrome/browser/application_context.h"
diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.mm b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.mm index 7dd3fe57..791b83c 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.mm +++ b/ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.mm
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/callback.h" #include "base/check_op.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "components/cookie_config/cookie_store_util.h"
diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.mm b/ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.mm index 80fde88..3e83201 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.mm +++ b/ios/chrome/browser/browser_state/chrome_browser_state_manager_impl.mm
@@ -13,7 +13,6 @@ #include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm b/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm index d00012c..194d3e7 100644 --- a/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm +++ b/ios/chrome/browser/browser_state/chrome_browser_state_removal_controller.mm
@@ -12,7 +12,6 @@ #include "base/location.h" #include "base/mac/foundation_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/prefs/pref_service.h" #include "google_apis/gaia/gaia_auth_util.h"
diff --git a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.h b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.h index 5cea7e8..a83da76 100644 --- a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.h +++ b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_impl.h
@@ -5,6 +5,7 @@ #ifndef IOS_CHROME_BROWSER_BROWSER_STATE_OFF_THE_RECORD_CHROME_BROWSER_STATE_IMPL_H_ #define IOS_CHROME_BROWSER_BROWSER_STATE_OFF_THE_RECORD_CHROME_BROWSER_STATE_IMPL_H_ +#include "base/time/time.h" #include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.h"
diff --git a/ios/chrome/browser/browsing_data/browsing_data_remover_impl.mm b/ios/chrome/browser/browsing_data/browsing_data_remover_impl.mm index 1c7d699..775a579 100644 --- a/ios/chrome/browser/browsing_data/browsing_data_remover_impl.mm +++ b/ios/chrome/browser/browsing_data/browsing_data_remover_impl.mm
@@ -18,7 +18,6 @@ #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "components/autofill/core/browser/personal_data_manager.h"
diff --git a/ios/chrome/browser/crash_report/crash_helper.mm b/ios/chrome/browser/crash_report/crash_helper.mm index 747c119..db7ca6fb 100644 --- a/ios/chrome/browser/crash_report/crash_helper.mm +++ b/ios/chrome/browser/crash_report/crash_helper.mm
@@ -24,8 +24,8 @@ #include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "components/crash/core/app/crashpad.h" #include "components/crash/core/common/crash_key.h" #include "components/crash/core/common/reporter_running_ios.h"
diff --git a/ios/chrome/browser/download/ar_quick_look_tab_helper.mm b/ios/chrome/browser/download/ar_quick_look_tab_helper.mm index eb73336..2e9749c 100644 --- a/ios/chrome/browser/download/ar_quick_look_tab_helper.mm +++ b/ios/chrome/browser/download/ar_quick_look_tab_helper.mm
@@ -13,7 +13,6 @@ #include "base/metrics/histogram_functions.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #import "ios/chrome/browser/download/ar_quick_look_tab_helper_delegate.h" #include "ios/chrome/browser/download/download_directory_util.h"
diff --git a/ios/chrome/browser/download/download_directory_util.mm b/ios/chrome/browser/download/download_directory_util.mm index 052318f..a49bb2ce 100644 --- a/ios/chrome/browser/download/download_directory_util.mm +++ b/ios/chrome/browser/download/download_directory_util.mm
@@ -9,7 +9,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/mac/foundation_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "ios/web/common/features.h"
diff --git a/ios/chrome/browser/external_files/external_file_remover_impl.mm b/ios/chrome/browser/external_files/external_file_remover_impl.mm index f092f8c..b7d96a3 100644 --- a/ios/chrome/browser/external_files/external_file_remover_impl.mm +++ b/ios/chrome/browser/external_files/external_file_remover_impl.mm
@@ -10,7 +10,6 @@ #include "base/callback_helpers.h" #include "base/logging.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "components/bookmarks/browser/bookmark_model.h"
diff --git a/ios/chrome/browser/feature_engagement/tracker_factory_util.mm b/ios/chrome/browser/feature_engagement/tracker_factory_util.mm index 6539695b..28bcdea 100644 --- a/ios/chrome/browser/feature_engagement/tracker_factory_util.mm +++ b/ios/chrome/browser/feature_engagement/tracker_factory_util.mm
@@ -6,7 +6,6 @@ #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "components/feature_engagement/public/tracker.h"
diff --git a/ios/chrome/browser/install_time_util_unittest.mm b/ios/chrome/browser/install_time_util_unittest.mm index 6b9b5e88..ac5dc2f 100644 --- a/ios/chrome/browser/install_time_util_unittest.mm +++ b/ios/chrome/browser/install_time_util_unittest.mm
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ios/chrome/browser/install_time_util.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h" #include "testing/platform_test.h"
diff --git a/ios/chrome/browser/json_parser/in_process_json_parser.cc b/ios/chrome/browser/json_parser/in_process_json_parser.cc index b8d7ac2..c214c8a 100644 --- a/ios/chrome/browser/json_parser/in_process_json_parser.cc +++ b/ios/chrome/browser/json_parser/in_process_json_parser.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/json/json_reader.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/values.h"
diff --git a/ios/chrome/browser/link_to_text/link_to_text_response.h b/ios/chrome/browser/link_to_text/link_to_text_response.h index 9838956a..35b4869 100644 --- a/ios/chrome/browser/link_to_text/link_to_text_response.h +++ b/ios/chrome/browser/link_to_text/link_to_text_response.h
@@ -7,6 +7,7 @@ #import <UIKit/UIKit.h> +#include "base/time/time.h" #import "components/shared_highlighting/core/common/shared_highlighting_metrics.h" #import "ios/chrome/browser/link_to_text/link_generation_outcome.h" #import "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/ios/chrome/browser/metrics/chrome_browser_state_client.mm b/ios/chrome/browser/metrics/chrome_browser_state_client.mm index d5d3c0b..18ae8f14 100644 --- a/ios/chrome/browser/metrics/chrome_browser_state_client.mm +++ b/ios/chrome/browser/metrics/chrome_browser_state_client.mm
@@ -4,6 +4,7 @@ #include "ios/chrome/browser/metrics/chrome_browser_state_client.h" +#include "base/time/time.h" #include "components/network_time/network_time_tracker.h" #include "ios/chrome/browser/application_context.h" #include "ios/chrome/browser/browser_state/browser_state_info_cache.h"
diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm index 48d7471..2f226da 100644 --- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm
@@ -24,7 +24,6 @@ #include "base/path_service.h" #include "base/process/process_metrics.h" #include "base/rand_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/platform_thread.h" #include "components/crash/core/common/crash_keys.h"
diff --git a/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.mm b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.mm index 5dcf2ca..7caeae22 100644 --- a/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.mm +++ b/ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.mm
@@ -11,7 +11,6 @@ #include "base/path_service.h" #include "base/strings/sys_string_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/version.h" #import "components/breadcrumbs/core/breadcrumb_persistent_storage_manager.h"
diff --git a/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory_util.mm b/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory_util.mm index 9b0c149..6d070d5 100644 --- a/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory_util.mm +++ b/ios/chrome/browser/ntp_snippets/ios_chrome_content_suggestions_service_factory_util.mm
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_path.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_clock.h" #include "base/timer/timer.h"
diff --git a/ios/chrome/browser/ntp_tiles/ios_most_visited_sites_factory.cc b/ios/chrome/browser/ntp_tiles/ios_most_visited_sites_factory.cc index 6c4c3afe..7404221c 100644 --- a/ios/chrome/browser/ntp_tiles/ios_most_visited_sites_factory.cc +++ b/ios/chrome/browser/ntp_tiles/ios_most_visited_sites_factory.cc
@@ -4,7 +4,6 @@ #include "ios/chrome/browser/ntp_tiles/ios_most_visited_sites_factory.h" -#include "base/task/post_task.h" #include "components/history/core/browser/top_sites.h" #include "components/image_fetcher/core/image_fetcher_impl.h" #include "components/image_fetcher/ios/ios_image_decoder_impl.h"
diff --git a/ios/chrome/browser/omaha/omaha_service.h b/ios/chrome/browser/omaha/omaha_service.h index 75a49fe..725c4f3 100644 --- a/ios/chrome/browser/omaha/omaha_service.h +++ b/ios/chrome/browser/omaha/omaha_service.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/gtest_prod_util.h" #include "base/no_destructor.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/version.h"
diff --git a/ios/chrome/browser/omaha/omaha_service_unittest.mm b/ios/chrome/browser/omaha/omaha_service_unittest.mm index c3990463..bbe0303 100644 --- a/ios/chrome/browser/omaha/omaha_service_unittest.mm +++ b/ios/chrome/browser/omaha/omaha_service_unittest.mm
@@ -12,6 +12,7 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #import "base/test/ios/wait_util.h" +#include "base/time/time.h" #include "components/metrics/metrics_pref_names.h" #include "components/prefs/pref_registry_simple.h" #include "components/version_info/version_info.h"
diff --git a/ios/chrome/browser/passwords/ios_chrome_password_check_manager.h b/ios/chrome/browser/passwords/ios_chrome_password_check_manager.h index 2316949..228ddf1 100644 --- a/ios/chrome/browser/passwords/ios_chrome_password_check_manager.h +++ b/ios/chrome/browser/passwords/ios_chrome_password_check_manager.h
@@ -10,6 +10,7 @@ #include "base/observer_list.h" #include "base/observer_list_types.h" #include "base/scoped_observation.h" +#include "base/time/time.h" #include "components/password_manager/core/browser/ui/bulk_leak_check_service_adapter.h" #include "components/password_manager/core/browser/ui/credential_utils.h" #include "components/password_manager/core/browser/ui/insecure_credentials_manager.h"
diff --git a/ios/chrome/browser/passwords/ios_chrome_password_store_factory.mm b/ios/chrome/browser/passwords/ios_chrome_password_store_factory.mm index 07e3856..4c7d6d36 100644 --- a/ios/chrome/browser/passwords/ios_chrome_password_store_factory.mm +++ b/ios/chrome/browser/passwords/ios_chrome_password_store_factory.mm
@@ -10,7 +10,6 @@ #include "base/callback_helpers.h" #include "base/command_line.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/ios/chrome/browser/policy/browser_dm_token_storage_ios.mm b/ios/chrome/browser/policy/browser_dm_token_storage_ios.mm index 7590d14..dc1c38f 100644 --- a/ios/chrome/browser/policy/browser_dm_token_storage_ios.mm +++ b/ios/chrome/browser/policy/browser_dm_token_storage_ios.mm
@@ -16,7 +16,6 @@ #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #import "components/policy/core/common/policy_loader_ios_constants.h"
diff --git a/ios/chrome/browser/policy/browser_policy_connector_ios.mm b/ios/chrome/browser/policy/browser_policy_connector_ios.mm index 7a580be..f646cc7 100644 --- a/ios/chrome/browser/policy/browser_policy_connector_ios.mm +++ b/ios/chrome/browser/policy/browser_policy_connector_ios.mm
@@ -10,7 +10,6 @@ #include "base/callback.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
diff --git a/ios/chrome/browser/policy/policy_watcher_browser_agent.mm b/ios/chrome/browser/policy/policy_watcher_browser_agent.mm index 844b5a57..bc293dc7 100644 --- a/ios/chrome/browser/policy/policy_watcher_browser_agent.mm +++ b/ios/chrome/browser/policy/policy_watcher_browser_agent.mm
@@ -11,7 +11,6 @@ #include "base/metrics/histogram_functions.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/prefs/pref_change_registrar.h" #include "components/prefs/pref_service.h"
diff --git a/ios/chrome/browser/policy/reporting/report_scheduler_ios_unittest.mm b/ios/chrome/browser/policy/reporting/report_scheduler_ios_unittest.mm index 399547b..e8c2e41c 100644 --- a/ios/chrome/browser/policy/reporting/report_scheduler_ios_unittest.mm +++ b/ios/chrome/browser/policy/reporting/report_scheduler_ios_unittest.mm
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ios/chrome/browser/policy/reporting/report_scheduler_ios.h" +#include "base/time/time.h" #include "components/enterprise/browser/reporting/real_time_report_generator.h" #if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/prerender/preload_controller.mm b/ios/chrome/browser/prerender/preload_controller.mm index 714773cb..fe57272 100644 --- a/ios/chrome/browser/prerender/preload_controller.mm +++ b/ios/chrome/browser/prerender/preload_controller.mm
@@ -11,6 +11,7 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram_macros.h" #include "base/strings/sys_string_conversions.h" +#include "base/time/time.h" #import "components/prefs/ios/pref_observer_bridge.h" #include "components/prefs/pref_service.h" #import "components/signin/ios/browser/account_consistency_service.h"
diff --git a/ios/chrome/browser/reading_list/offline_page_tab_helper.mm b/ios/chrome/browser/reading_list/offline_page_tab_helper.mm index 3058c71..d1bd98e 100644 --- a/ios/chrome/browser/reading_list/offline_page_tab_helper.mm +++ b/ios/chrome/browser/reading_list/offline_page_tab_helper.mm
@@ -11,7 +11,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/timer/timer.h" #include "components/reading_list/core/offline_url_utils.h"
diff --git a/ios/chrome/browser/reading_list/reading_list_download_service.mm b/ios/chrome/browser/reading_list/reading_list_download_service.mm index d096831..105af2b 100644 --- a/ios/chrome/browser/reading_list/reading_list_download_service.mm +++ b/ios/chrome/browser/reading_list/reading_list_download_service.mm
@@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/reading_list/core/offline_url_utils.h" #include "components/reading_list/core/reading_list_entry.h"
diff --git a/ios/chrome/browser/reading_list/url_downloader.mm b/ios/chrome/browser/reading_list/url_downloader.mm index e4ec640..3f45d28 100644 --- a/ios/chrome/browser/reading_list/url_downloader.mm +++ b/ios/chrome/browser/reading_list/url_downloader.mm
@@ -18,7 +18,6 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/reading_list/core/offline_url_utils.h" #include "ios/chrome/browser/chrome_paths.h"
diff --git a/ios/chrome/browser/safe_browsing/safe_browsing_tab_helper.mm b/ios/chrome/browser/safe_browsing/safe_browsing_tab_helper.mm index ff05a2b..37cf92d5 100644 --- a/ios/chrome/browser/safe_browsing/safe_browsing_tab_helper.mm +++ b/ios/chrome/browser/safe_browsing/safe_browsing_tab_helper.mm
@@ -10,7 +10,6 @@ #include "base/feature_list.h" #include "base/metrics/histogram_macros.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "components/safe_browsing/core/browser/safe_browsing_url_checker_impl.h" #include "components/safe_browsing/core/common/features.h" #include "components/safe_browsing/core/common/safebrowsing_constants.h"
diff --git a/ios/chrome/browser/sessions/session_service_ios.mm b/ios/chrome/browser/sessions/session_service_ios.mm index d8b8ebf..5902c8cd 100644 --- a/ios/chrome/browser/sessions/session_service_ios.mm +++ b/ios/chrome/browser/sessions/session_service_ios.mm
@@ -17,7 +17,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/ios/chrome/browser/snapshots/snapshot_cache.mm b/ios/chrome/browser/snapshots/snapshot_cache.mm index 6eabcc70..c4b3bd18 100644 --- a/ios/chrome/browser/snapshots/snapshot_cache.mm +++ b/ios/chrome/browser/snapshots/snapshot_cache.mm
@@ -21,7 +21,6 @@ #include "base/path_service.h" #include "base/sequence_checker.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/ios/chrome/browser/snapshots/snapshots_util.mm b/ios/chrome/browser/snapshots/snapshots_util.mm index ed91f26..a6db552e 100644 --- a/ios/chrome/browser/snapshots/snapshots_util.mm +++ b/ios/chrome/browser/snapshots/snapshots_util.mm
@@ -12,7 +12,6 @@ #include "base/mac/foundation_util.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/sync/session_sync_service_factory.mm b/ios/chrome/browser/sync/session_sync_service_factory.mm index e8d1a3bf..f9e59618 100644 --- a/ios/chrome/browser/sync/session_sync_service_factory.mm +++ b/ios/chrome/browser/sync/session_sync_service_factory.mm
@@ -7,7 +7,6 @@ #include <utility> #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "components/dom_distiller/core/url_constants.h" #include "components/history/core/browser/history_service.h"
diff --git a/ios/chrome/browser/sync/sync_service_factory.mm b/ios/chrome/browser/sync/sync_service_factory.mm index c09a714..4be5148 100644 --- a/ios/chrome/browser/sync/sync_service_factory.mm +++ b/ios/chrome/browser/sync/sync_service_factory.mm
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "components/autofill/core/browser/personal_data_manager.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h"
diff --git a/ios/chrome/browser/ui/download/download_manager_mediator.mm b/ios/chrome/browser/ui/download/download_manager_mediator.mm index a8b0a85..e14cacc 100644 --- a/ios/chrome/browser/ui/download/download_manager_mediator.mm +++ b/ios/chrome/browser/ui/download/download_manager_mediator.mm
@@ -11,7 +11,6 @@ #include "base/files/file_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "ios/chrome/browser/download/download_directory_util.h" #import "ios/chrome/browser/download/external_app_util.h"
diff --git a/ios/chrome/browser/ui/first_run/first_run_util.mm b/ios/chrome/browser/ui/first_run/first_run_util.mm index fd661248..6a9b3e0b 100644 --- a/ios/chrome/browser/ui/first_run/first_run_util.mm +++ b/ios/chrome/browser/ui/first_run/first_run_util.mm
@@ -8,7 +8,6 @@ #include "base/callback.h" #include "base/metrics/histogram_functions.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #import "components/metrics/metrics_reporting_default_state.h"
diff --git a/ios/chrome/browser/ui/image_util/image_saver.mm b/ios/chrome/browser/ui/image_util/image_saver.mm index 8f759d17..54fa0e2 100644 --- a/ios/chrome/browser/ui/image_util/image_saver.mm +++ b/ios/chrome/browser/ui/image_util/image_saver.mm
@@ -12,7 +12,6 @@ #include "base/format_macros.h" #include "base/ios/ios_util.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "components/strings/grit/components_strings.h"
diff --git a/ios/chrome/browser/ui/link_to_text/link_to_text_mediator_unittest.mm b/ios/chrome/browser/ui/link_to_text/link_to_text_mediator_unittest.mm index 9224449..73d08bd1 100644 --- a/ios/chrome/browser/ui/link_to_text/link_to_text_mediator_unittest.mm +++ b/ios/chrome/browser/ui/link_to_text/link_to_text_mediator_unittest.mm
@@ -3,6 +3,7 @@ // found in the LICENSE file. #import "ios/chrome/browser/ui/link_to_text/link_to_text_mediator.h" +#include "base/time/time.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support."
diff --git a/ios/chrome/browser/ui/ntp/feed_metrics_recorder.mm b/ios/chrome/browser/ui/ntp/feed_metrics_recorder.mm index 40229190..560adad 100644 --- a/ios/chrome/browser/ui/ntp/feed_metrics_recorder.mm +++ b/ios/chrome/browser/ui/ntp/feed_metrics_recorder.mm
@@ -9,6 +9,7 @@ #import "base/metrics/histogram_macros.h" #import "base/metrics/user_metrics.h" #import "base/metrics/user_metrics_action.h" +#include "base/time/time.h" #import "components/feed/core/v2/public/common_enums.h" #if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm index 132bacce..8d7f2c9 100644 --- a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm +++ b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
@@ -8,6 +8,7 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" +#include "base/time/time.h" #include "components/feed/core/v2/public/ios/pref_names.h" #import "components/pref_registry/pref_registry_syncable.h" #import "components/prefs/ios/pref_observer_bridge.h"
diff --git a/ios/chrome/browser/ui/ntp/ntp_tile_saver.mm b/ios/chrome/browser/ui/ntp/ntp_tile_saver.mm index 22d3955..6bb99014 100644 --- a/ios/chrome/browser/ui/ntp/ntp_tile_saver.mm +++ b/ios/chrome/browser/ui/ntp/ntp_tile_saver.mm
@@ -8,7 +8,6 @@ #include "base/hash/md5.h" #include "base/logging.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "components/favicon/core/fallback_url_util.h"
diff --git a/ios/chrome/browser/ui/omnibox/chrome_omnibox_client_ios.mm b/ios/chrome/browser/ui/omnibox/chrome_omnibox_client_ios.mm index ec830f6..b03bc5d 100644 --- a/ios/chrome/browser/ui/omnibox/chrome_omnibox_client_ios.mm +++ b/ios/chrome/browser/ui/omnibox/chrome_omnibox_client_ios.mm
@@ -6,7 +6,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "components/favicon/ios/web_favicon_driver.h" #include "components/omnibox/browser/autocomplete_match.h"
diff --git a/ios/chrome/browser/ui/open_in/open_in_controller.mm b/ios/chrome/browser/ui/open_in/open_in_controller.mm index 329a33f9..2371e4e 100644 --- a/ios/chrome/browser/ui/open_in/open_in_controller.mm +++ b/ios/chrome/browser/ui/open_in/open_in_controller.mm
@@ -16,7 +16,6 @@ #include "base/metrics/user_metrics_action.h" #include "base/sequence_checker.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.mm b/ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.mm index 2e2048b6..bedc18a 100644 --- a/ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.mm +++ b/ios/chrome/browser/ui/recent_tabs/recent_tabs_table_view_controller.mm
@@ -12,6 +12,7 @@ #include "base/notreached.h" #import "base/numerics/safe_conversions.h" #include "base/strings/sys_string_conversions.h" +#include "base/time/time.h" #include "components/prefs/pref_service.h" #include "components/search_engines/template_url_service.h" #include "components/sessions/core/session_id.h"
diff --git a/ios/chrome/browser/ui/settings/password/password_details/add_password_mediator.mm b/ios/chrome/browser/ui/settings/password/password_details/add_password_mediator.mm index 7465f76..98a8993 100644 --- a/ios/chrome/browser/ui/settings/password/password_details/add_password_mediator.mm +++ b/ios/chrome/browser/ui/settings/password/password_details/add_password_mediator.mm
@@ -8,7 +8,6 @@ #include "base/ranges/algorithm.h" #include "base/strings/sys_string_conversions.h" #include "base/task/cancelable_task_tracker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/ios/chrome/browser/ui/settings/password/password_exporter.mm b/ios/chrome/browser/ui/settings/password/password_exporter.mm index 28b57f6..0b990c6 100644 --- a/ios/chrome/browser/ui/settings/password/password_exporter.mm +++ b/ios/chrome/browser/ui/settings/password/password_exporter.mm
@@ -10,7 +10,6 @@ #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm index b297757..00db60c 100644 --- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm +++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_coordinator.mm
@@ -10,6 +10,7 @@ #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "base/strings/sys_string_conversions.h" +#include "base/time/time.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/search_engines/template_url_service.h" #include "components/strings/grit/components_strings.h"
diff --git a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_view_controller.mm b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_view_controller.mm index c95a6e0..b4910d7 100644 --- a/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_view_controller.mm +++ b/ios/chrome/browser/ui/tab_switcher/tab_grid/tab_grid_view_controller.mm
@@ -9,7 +9,6 @@ #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "ios/chrome/browser/crash_report/crash_keys_helper.h" #import "ios/chrome/browser/ui/commands/application_commands.h" #import "ios/chrome/browser/ui/commands/popup_menu_commands.h"
diff --git a/ios/chrome/browser/ui/webui/policy/policy_ui_handler.mm b/ios/chrome/browser/ui/webui/policy/policy_ui_handler.mm index 2ab6500..6c376f979 100644 --- a/ios/chrome/browser/ui/webui/policy/policy_ui_handler.mm +++ b/ios/chrome/browser/ui/webui/policy/policy_ui_handler.mm
@@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/callback_helpers.h" #import "base/strings/sys_string_conversions.h" +#include "base/time/time.h" #include "base/values.h" #include "components/enterprise/browser/controller/browser_dm_token_storage.h" #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
diff --git a/ios/chrome/browser/ui/webui/version_ui.mm b/ios/chrome/browser/ui/webui/version_ui.mm index 77b98e91..707f8c05 100644 --- a/ios/chrome/browser/ui/webui/version_ui.mm +++ b/ios/chrome/browser/ui/webui/version_ui.mm
@@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/grit/components_resources.h" #include "components/grit/components_scaled_resources.h"
diff --git a/ios/chrome/browser/web/progress_indicator_egtest.mm b/ios/chrome/browser/web/progress_indicator_egtest.mm index dfad0a19..81608c1d 100644 --- a/ios/chrome/browser/web/progress_indicator_egtest.mm +++ b/ios/chrome/browser/web/progress_indicator_egtest.mm
@@ -8,7 +8,6 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/synchronization/condition_variable.h" -#include "base/task/post_task.h" #import "base/test/ios/wait_util.h" #include "base/threading/thread_restrictions.h" #include "base/time/time.h"
diff --git a/ios/chrome/browser/web/session_state/web_session_state_cache.mm b/ios/chrome/browser/web/session_state/web_session_state_cache.mm index c6cc5f6..0a355ec 100644 --- a/ios/chrome/browser/web/session_state/web_session_state_cache.mm +++ b/ios/chrome/browser/web/session_state/web_session_state_cache.mm
@@ -17,7 +17,6 @@ #include "base/path_service.h" #include "base/sequence_checker.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/ios/chrome/browser/web/session_state/web_session_state_tab_helper.mm b/ios/chrome/browser/web/session_state/web_session_state_tab_helper.mm index 59b93ef0..f211cff 100644 --- a/ios/chrome/browser/web/session_state/web_session_state_tab_helper.mm +++ b/ios/chrome/browser/web/session_state/web_session_state_tab_helper.mm
@@ -13,7 +13,6 @@ #include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread_restrictions.h" #import "build/branding_buildflags.h"
diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 index 2fd61be..e6d4fcf 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -58a80dc11cd01dbb9510161c4a34c114029b9b09 \ No newline at end of file +06f94b1f449d2a661e13930b1936634443eb79d0 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 index 2cfbc45..58026f7 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -3c57ee3358a542eae8c22cbee0d4a512a2554cb0 \ No newline at end of file +6204f2dadf52470f899897d0907d439315516f35 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 index a87b3cc4..3536d214 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -436af7c9cc15fb08d12483643530b139c426d83f \ No newline at end of file +18830bf3e7c20f3ebf8964eddbcd5bc25fbefb91 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 index 8b67be4..c3f7018 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -883e4f3903b305f89c269cab22cd7a4198960ff9 \ No newline at end of file +0b6931d764e2058e383e69f2c076c6e1be661d66 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 index 72a3238..15405e38 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -65096249749c1476c816a619fac61a8eb7ced539 \ No newline at end of file +4a3f925467c5daa9ec003c574decb2eb58b429d9 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 index f46b912..1acebd3e 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -5d80b7de1bfc3973a24e2d4332c7351e70d3b3d2 \ No newline at end of file +dacdd80dbfe276f636d6e14934f07814b57c48ad \ No newline at end of file
diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 index b40fbef..2c687cb 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -f90224d126bcbef5cda996cfaa635c804acfada5 \ No newline at end of file +f29f5595b4fac0d8470dfea8dd6217b6ae55b3fe \ No newline at end of file
diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 index eb9e11d..0fefffb7 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -12c5f52299aeea38df16d9c536d6f056381ec017 \ No newline at end of file +3e24517c55d0f112715b971862c5172e9c8f800e \ No newline at end of file
diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 index f138bf0..e4a5be2 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -c563d472fbed23c3428aa4b173f4c1c3377aada4 \ No newline at end of file +88f919e6ee0bf6e72ade9ddee218789767fdfcc6 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 index 9136cf26..a020261 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -38d660e55a45de6bc575f0aba03461cfc07867cc \ No newline at end of file +6b77211bbabf726a8d398119a3a9f9f36501b254 \ No newline at end of file
diff --git a/ios/net/cookies/cookie_store_ios_test_util.h b/ios/net/cookies/cookie_store_ios_test_util.h index d9fb015..5b65a9e 100644 --- a/ios/net/cookies/cookie_store_ios_test_util.h +++ b/ios/net/cookies/cookie_store_ios_test_util.h
@@ -9,7 +9,6 @@ #include <vector> #include "base/callback_forward.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "ios/net/cookies/cookie_store_ios_client.h" #include "net/cookies/cookie_change_dispatcher.h"
diff --git a/ios/net/crn_http_protocol_handler.h b/ios/net/crn_http_protocol_handler.h index 8830e61..4df5953 100644 --- a/ios/net/crn_http_protocol_handler.h +++ b/ios/net/crn_http_protocol_handler.h
@@ -9,6 +9,7 @@ #include <memory> +#include "base/time/time.h" #include "net/base/load_timing_info.h" #include "net/http/http_response_info.h"
diff --git a/ios/web/browsing_data/browsing_data_remover.mm b/ios/web/browsing_data/browsing_data_remover.mm index 7f117639..d4c9179 100644 --- a/ios/web/browsing_data/browsing_data_remover.mm +++ b/ios/web/browsing_data/browsing_data_remover.mm
@@ -8,7 +8,6 @@ #import "base/ios/block_types.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #import "ios/web/browsing_data/browsing_data_remover_observer.h" #import "ios/web/common/uikit_ui_util.h" #import "ios/web/public/browser_state.h"
diff --git a/ios/web/init/web_main_loop.mm b/ios/web/init/web_main_loop.mm index 3933f84..6abe9c88 100644 --- a/ios/web/init/web_main_loop.mm +++ b/ios/web/init/web_main_loop.mm
@@ -21,6 +21,7 @@ #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #import "ios/web/net/cookie_notification_bridge.h" #include "ios/web/public/init/ios_global_state.h" #include "ios/web/public/init/web_main_parts.h"
diff --git a/ios/web/navigation/navigation_item_impl.h b/ios/web/navigation/navigation_item_impl.h index 2c99b8f..cde870b 100644 --- a/ios/web/navigation/navigation_item_impl.h +++ b/ios/web/navigation/navigation_item_impl.h
@@ -10,6 +10,7 @@ #include <memory> #include <string> +#include "base/time/time.h" #include "ios/web/public/favicon/favicon_status.h" #import "ios/web/public/navigation/navigation_item.h" #include "ios/web/public/navigation/referrer.h"
diff --git a/ios/web/public/test/fakes/fake_web_client.mm b/ios/web/public/test/fakes/fake_web_client.mm index eb4ee70..734cd6f 100644 --- a/ios/web/public/test/fakes/fake_web_client.mm +++ b/ios/web/public/test/fakes/fake_web_client.mm
@@ -7,7 +7,6 @@ #import <UIKit/UIKit.h> #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #import "ios/web/common/uikit_ui_util.h" #include "ios/web/public/test/error_test_util.h" #import "ios/web/public/test/js_test_util.h"
diff --git a/ios/web/public/test/fakes/fake_web_frame.cc b/ios/web/public/test/fakes/fake_web_frame.cc index 913e96f..f61e2859 100644 --- a/ios/web/public/test/fakes/fake_web_frame.cc +++ b/ios/web/public/test/fakes/fake_web_frame.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/callback.h" #include "base/json/json_writer.h" -#include "base/task/post_task.h" #include "base/values.h" #include "ios/web/public/thread/web_task_traits.h"
diff --git a/ios/web/security/crw_cert_verification_controller.mm b/ios/web/security/crw_cert_verification_controller.mm index b40b8f81..91a5506 100644 --- a/ios/web/security/crw_cert_verification_controller.mm +++ b/ios/web/security/crw_cert_verification_controller.mm
@@ -11,7 +11,6 @@ #import "base/ios/block_types.h" #include "base/memory/ref_counted.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "ios/web/public/browser_state.h" #include "ios/web/public/security/certificate_policy_cache.h"
diff --git a/ios/web/test/test_web_thread.cc b/ios/web/test/test_web_thread.cc index 5cfaffb..16bc5d26 100644 --- a/ios/web/test/test_web_thread.cc +++ b/ios/web/test/test_web_thread.cc
@@ -5,6 +5,7 @@ #include "ios/web/public/test/test_web_thread.h" #include "base/message_loop/message_pump_type.h" +#include "base/time/time.h" #include "ios/web/web_sub_thread.h" #include "ios/web/web_thread_impl.h"
diff --git a/ios/web/web_thread_impl.cc b/ios/web/web_thread_impl.cc index e4d60cf..e6f9579 100644 --- a/ios/web/web_thread_impl.cc +++ b/ios/web/web_thread_impl.cc
@@ -13,7 +13,6 @@ #include "base/compiler_specific.h" #include "base/lazy_instance.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_executor.h" #include "base/time/time.h"
diff --git a/ios/web_view/internal/autofill/cwv_credit_card_saver.mm b/ios/web_view/internal/autofill/cwv_credit_card_saver.mm index a614813..7c93812 100644 --- a/ios/web_view/internal/autofill/cwv_credit_card_saver.mm +++ b/ios/web_view/internal/autofill/cwv_credit_card_saver.mm
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "components/autofill/core/browser/payments/legal_message_line.h" #include "ios/web/public/thread/web_task_traits.h" #include "ios/web/public/thread/web_thread.h"
diff --git a/ios/web_view/internal/cwv_download_task.mm b/ios/web_view/internal/cwv_download_task.mm index f1c5607..a6c36f7 100644 --- a/ios/web_view/internal/cwv_download_task.mm +++ b/ios/web_view/internal/cwv_download_task.mm
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/ios/web_view/internal/passwords/web_view_password_store_factory.mm b/ios/web_view/internal/passwords/web_view_password_store_factory.mm index d50fe216..5df00a9 100644 --- a/ios/web_view/internal/passwords/web_view_password_store_factory.mm +++ b/ios/web_view/internal/passwords/web_view_password_store_factory.mm
@@ -10,7 +10,6 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/ios/web_view/internal/web_view_url_request_context_getter.mm b/ios/web_view/internal/web_view_url_request_context_getter.mm index a9862807..491186e 100644 --- a/ios/web_view/internal/web_view_url_request_context_getter.mm +++ b/ios/web_view/internal/web_view_url_request_context_getter.mm
@@ -11,7 +11,6 @@ #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "ios/components/webui/web_ui_url_constants.h" #import "ios/net/cookies/cookie_store_ios.h"
diff --git a/ios/web_view/internal/web_view_web_client.mm b/ios/web_view/internal/web_view_web_client.mm index 2b8fbb55..c7da791d 100644 --- a/ios/web_view/internal/web_view_web_client.mm +++ b/ios/web_view/internal/web_view_web_client.mm
@@ -11,7 +11,6 @@ #import "base/ios/ns_error_util.h" #include "base/mac/bundle_locations.h" #include "base/strings/sys_string_conversions.h" -#include "base/task/post_task.h" #include "components/autofill/ios/browser/autofill_java_script_feature.h" #import "components/autofill/ios/browser/suggestion_controller_java_script_feature.h" #import "components/autofill/ios/form_util/form_handlers_java_script_feature.h"
diff --git a/ipc/ipc_channel_mojo_unittest.cc b/ipc/ipc_channel_mojo_unittest.cc index 29270a96..82a15e08 100644 --- a/ipc/ipc_channel_mojo_unittest.cc +++ b/ipc/ipc_channel_mojo_unittest.cc
@@ -36,6 +36,7 @@ #include "base/test/test_timeouts.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_utils.h"
diff --git a/ipc/ipc_channel_proxy_unittest.cc b/ipc/ipc_channel_proxy_unittest.cc index 78b2b9f..fd333bd 100644 --- a/ipc/ipc_channel_proxy_unittest.cc +++ b/ipc/ipc_channel_proxy_unittest.cc
@@ -12,6 +12,7 @@ #include "base/pickle.h" #include "base/run_loop.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "ipc/ipc_message.h" #include "ipc/ipc_test_base.h" #include "ipc/message_filter.h"
diff --git a/ipc/ipc_mojo_perftest.cc b/ipc/ipc_mojo_perftest.cc index 80e7f36..e145581 100644 --- a/ipc/ipc_mojo_perftest.cc +++ b/ipc/ipc_mojo_perftest.cc
@@ -19,6 +19,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "ipc/ipc_channel_mojo.h" #include "ipc/ipc_perftest_messages.h"
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index b3c740f..7ff74da 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc
@@ -25,6 +25,7 @@ #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "ipc/ipc_listener.h" #include "ipc/ipc_message.h"
diff --git a/media/audio/alive_checker.h b/media/audio/alive_checker.h index 5405f09..b95c9fe 100644 --- a/media/audio/alive_checker.h +++ b/media/audio/alive_checker.h
@@ -12,6 +12,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "media/audio/power_observer_helper.h" #include "media/base/media_export.h"
diff --git a/media/audio/alive_checker_unittest.cc b/media/audio/alive_checker_unittest.cc index d4132aa1..556d3da 100644 --- a/media/audio/alive_checker_unittest.cc +++ b/media/audio/alive_checker_unittest.cc
@@ -11,6 +11,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/audio/alive_checker.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/audio/android/opensles_input.h b/media/audio/android/opensles_input.h index 736c6c5..ddad9837 100644 --- a/media/audio/android/opensles_input.h +++ b/media/audio/android/opensles_input.h
@@ -15,6 +15,7 @@ #include "base/memory/raw_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/audio/android/opensles_util.h" #include "media/audio/audio_io.h" #include "media/base/audio_parameters.h"
diff --git a/media/audio/android/opensles_output.h b/media/audio/android/opensles_output.h index 9dab981..c7b9273 100644 --- a/media/audio/android/opensles_output.h +++ b/media/audio/android/opensles_output.h
@@ -16,6 +16,7 @@ #include "base/memory/raw_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/audio/android/muteable_audio_output_stream.h" #include "media/audio/android/opensles_util.h" #include "media/base/audio_parameters.h"
diff --git a/media/audio/audio_debug_file_writer.h b/media/audio/audio_debug_file_writer.h index ec9e382..aa535ac7 100644 --- a/media/audio/audio_debug_file_writer.h +++ b/media/audio/audio_debug_file_writer.h
@@ -12,7 +12,6 @@ #include "base/files/file.h" #include "base/memory/ref_counted.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "media/base/audio_parameters.h"
diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc index 66fbda1f..fb6f3de4 100644 --- a/media/audio/audio_input_device.cc +++ b/media/audio/audio_input_device.cc
@@ -17,6 +17,7 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "media/audio/audio_manager_base.h"
diff --git a/media/audio/audio_opus_encoder.cc b/media/audio/audio_opus_encoder.cc index 7d534a37..13b9c6f 100644 --- a/media/audio/audio_opus_encoder.cc +++ b/media/audio/audio_opus_encoder.cc
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/numerics/checked_math.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "media/base/bind_to_current_loop.h" #include "media/base/channel_mixer.h" #include "media/base/encoder_status.h"
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc index 1465e0db..adf7e0c 100644 --- a/media/audio/audio_output_device.cc +++ b/media/audio/audio_output_device.cc
@@ -40,7 +40,6 @@ state_(IDLE), session_id_(sink_params.session_id), device_id_(sink_params.device_id), - processing_id_(sink_params.processing_id), stopping_hack_(false), did_receive_auth_(base::WaitableEvent::ResetPolicy::MANUAL, base::WaitableEvent::InitialState::NOT_SIGNALED), @@ -229,7 +228,7 @@ if (state_ == IDLE && !(did_receive_auth_.IsSignaled() && device_id_.empty())) RequestDeviceAuthorizationOnIOThread(); - ipc_->CreateStream(this, audio_parameters_, processing_id_); + ipc_->CreateStream(this, audio_parameters_); // By default, start playing right away. ipc_->PlayStream(); state_ = STREAM_CREATION_REQUESTED;
diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h index 7db76720..a8bfc71 100644 --- a/media/audio/audio_output_device.h +++ b/media/audio/audio_output_device.h
@@ -211,8 +211,6 @@ // received in OnDeviceAuthorized(). std::string matched_device_id_; - absl::optional<base::UnguessableToken> processing_id_; - // In order to avoid a race between OnStreamCreated and Stop(), we use this // guard to control stopping and starting the audio thread. base::Lock audio_thread_lock_;
diff --git a/media/audio/audio_output_device_thread_callback.h b/media/audio/audio_output_device_thread_callback.h index 719613e..b98d8b5 100644 --- a/media/audio/audio_output_device_thread_callback.h +++ b/media/audio/audio_output_device_thread_callback.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/unsafe_shared_memory_region.h" +#include "base/time/time.h" #include "media/audio/audio_device_thread.h" #include "media/base/audio_renderer_sink.h"
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc index 2dc004e..34742159 100644 --- a/media/audio/audio_output_device_unittest.cc +++ b/media/audio/audio_output_device_unittest.cc
@@ -70,11 +70,9 @@ void(AudioOutputIPCDelegate* delegate, const base::UnguessableToken& session_id, const std::string& device_id)); - MOCK_METHOD3( - CreateStream, - void(AudioOutputIPCDelegate* delegate, - const AudioParameters& params, - const absl::optional<base::UnguessableToken>& processing_id)); + MOCK_METHOD2(CreateStream, + void(AudioOutputIPCDelegate* delegate, + const AudioParameters& params)); MOCK_METHOD0(PlayStream, void()); MOCK_METHOD0(PauseStream, void()); MOCK_METHOD0(FlushStream, void()); @@ -177,7 +175,7 @@ void AudioOutputDeviceTest::StartAudioDevice() { if (device_status_ == OUTPUT_DEVICE_STATUS_OK) - EXPECT_CALL(*audio_output_ipc_, CreateStream(audio_device_.get(), _, _)); + EXPECT_CALL(*audio_output_ipc_, CreateStream(audio_device_.get(), _)); else EXPECT_CALL(callback_, OnRenderError());
diff --git a/media/audio/audio_output_ipc.h b/media/audio/audio_output_ipc.h index a826727..7fb9898 100644 --- a/media/audio/audio_output_ipc.h +++ b/media/audio/audio_output_ipc.h
@@ -84,10 +84,8 @@ // the default device will be used. // Once the stream has been created, the implementation will notify // |delegate| by calling OnStreamCreated(). - virtual void CreateStream( - AudioOutputIPCDelegate* delegate, - const AudioParameters& params, - const absl::optional<base::UnguessableToken>& processing_id) = 0; + virtual void CreateStream(AudioOutputIPCDelegate* delegate, + const AudioParameters& params) = 0; // Starts playing the stream. This should generate a call to // AudioOutputController::Play().
diff --git a/media/audio/audio_sink_parameters.h b/media/audio/audio_sink_parameters.h index 45b89b3..a96679b 100644 --- a/media/audio/audio_sink_parameters.h +++ b/media/audio/audio_sink_parameters.h
@@ -9,7 +9,6 @@ #include "base/unguessable_token.h" #include "media/base/media_export.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace media { @@ -18,10 +17,6 @@ // use. |device_id| is preferred over |session_id| if both are set // (i.e. session_id is nonzero). If neither is set, the default output device // will be selected. This is the state when default constructed. -// If the optional |processing_id| is provided, it is used to indicate that this -// stream is to be used as the reference signal during audio processing. An -// audio source must be constructed with the same processing id to complete the -// association. struct MEDIA_EXPORT AudioSinkParameters final { AudioSinkParameters(); AudioSinkParameters(const base::UnguessableToken& session_id, @@ -31,7 +26,6 @@ base::UnguessableToken session_id; std::string device_id; - absl::optional<base::UnguessableToken> processing_id; }; } // namespace media
diff --git a/media/audio/audio_source_parameters.cc b/media/audio/audio_source_parameters.cc index b8c631af..8585904f 100644 --- a/media/audio/audio_source_parameters.cc +++ b/media/audio/audio_source_parameters.cc
@@ -14,11 +14,4 @@ const AudioSourceParameters& params) = default; AudioSourceParameters::~AudioSourceParameters() = default; -AudioSourceParameters::ProcessingConfig::ProcessingConfig( - base::UnguessableToken id, - AudioProcessingSettings settings) - : id(id), settings(settings) { - DCHECK(!id.is_empty()); -} - } // namespace media
diff --git a/media/audio/audio_source_parameters.h b/media/audio/audio_source_parameters.h index efd2da31..d0e36fed 100644 --- a/media/audio/audio_source_parameters.h +++ b/media/audio/audio_source_parameters.h
@@ -23,15 +23,7 @@ ~AudioSourceParameters(); base::UnguessableToken session_id; - - struct MEDIA_EXPORT ProcessingConfig { - ProcessingConfig(base::UnguessableToken id, - AudioProcessingSettings settings); - base::UnguessableToken id; - AudioProcessingSettings settings; - }; - - absl::optional<ProcessingConfig> processing; + absl::optional<AudioProcessingSettings> processing; }; } // namespace media
diff --git a/media/audio/audio_thread_hang_monitor.cc b/media/audio/audio_thread_hang_monitor.cc index 94c68cc..c3c7b7e 100644 --- a/media/audio/audio_thread_hang_monitor.cc +++ b/media/audio/audio_thread_hang_monitor.cc
@@ -15,7 +15,6 @@ #include "base/metrics/histogram_macros.h" #include "base/power_monitor/power_monitor.h" #include "base/process/process.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/media/audio/audio_thread_hang_monitor_unittest.cc b/media/audio/audio_thread_hang_monitor_unittest.cc index 0412cfb2..345975f8 100644 --- a/media/audio/audio_thread_hang_monitor_unittest.cc +++ b/media/audio/audio_thread_hang_monitor_unittest.cc
@@ -7,10 +7,10 @@ #include "base/bind.h" #include "base/location.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/audio/audio_thread_impl.h b/media/audio/audio_thread_impl.h index 340b2719..7aa3e39 100644 --- a/media/audio/audio_thread_impl.h +++ b/media/audio/audio_thread_impl.h
@@ -8,6 +8,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/audio/audio_thread.h" #include "media/audio/audio_thread_hang_monitor.h"
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h index 389625f..e204bfa7 100644 --- a/media/audio/fake_audio_input_stream.h +++ b/media/audio/fake_audio_input_stream.h
@@ -15,6 +15,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/audio/audio_io.h" #include "media/base/audio_parameters.h" #include "media/base/fake_audio_worker.h"
diff --git a/media/audio/fake_audio_output_stream.h b/media/audio/fake_audio_output_stream.h index 28edd9ec..bdbb0558 100644 --- a/media/audio/fake_audio_output_stream.h +++ b/media/audio/fake_audio_output_stream.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "media/audio/android/muteable_audio_output_stream.h" #include "media/audio/audio_io.h" #include "media/base/audio_parameters.h"
diff --git a/media/audio/fuchsia/audio_output_stream_fuchsia.h b/media/audio/fuchsia/audio_output_stream_fuchsia.h index 4cc9daa..2fdba87 100644 --- a/media/audio/fuchsia/audio_output_stream_fuchsia.h +++ b/media/audio/fuchsia/audio_output_stream_fuchsia.h
@@ -8,6 +8,7 @@ #include <fuchsia/media/cpp/fidl.h> #include "base/memory/shared_memory_mapping.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "media/audio/audio_io.h" #include "media/base/audio_parameters.h"
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index ebdc636..b8805f9 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc
@@ -21,6 +21,7 @@ #include "base/power_monitor/power_observer.h" #include "base/strings/sys_string_conversions.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/audio/audio_device_description.h" #include "media/audio/mac/audio_auhal_mac.h" #include "media/audio/mac/audio_input_mac.h"
diff --git a/media/audio/null_audio_sink.h b/media/audio/null_audio_sink.h index 8a69c418..b6818d3 100644 --- a/media/audio/null_audio_sink.h +++ b/media/audio/null_audio_sink.h
@@ -9,6 +9,7 @@ #include <string> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "media/base/audio_renderer_sink.h" namespace base {
diff --git a/media/audio/power_observer_helper_unittest.cc b/media/audio/power_observer_helper_unittest.cc index 9f92044a..b02a66909 100644 --- a/media/audio/power_observer_helper_unittest.cc +++ b/media/audio/power_observer_helper_unittest.cc
@@ -8,6 +8,7 @@ #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/audio/power_observer_helper.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/audio/test_audio_thread.h b/media/audio/test_audio_thread.h index db7acf5..d651960 100644 --- a/media/audio/test_audio_thread.h +++ b/media/audio/test_audio_thread.h
@@ -10,6 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/audio/audio_thread.h" namespace media {
diff --git a/media/audio/win/audio_low_latency_input_win.h b/media/audio/win/audio_low_latency_input_win.h index dbd5e5f..05f5f87 100644 --- a/media/audio/win/audio_low_latency_input_win.h +++ b/media/audio/win/audio_low_latency_input_win.h
@@ -73,6 +73,7 @@ #include "base/sequence_checker.h" #include "base/threading/platform_thread.h" #include "base/threading/simple_thread.h" +#include "base/time/time.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_com_initializer.h" #include "base/win/scoped_handle.h"
diff --git a/media/audio/win/audio_low_latency_output_win.h b/media/audio/win/audio_low_latency_output_win.h index b46a0e6..3e89f68 100644 --- a/media/audio/win/audio_low_latency_output_win.h +++ b/media/audio/win/audio_low_latency_output_win.h
@@ -107,6 +107,7 @@ #include "base/memory/weak_ptr.h" #include "base/threading/platform_thread.h" #include "base/threading/simple_thread.h" +#include "base/time/time.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_com_initializer.h" #include "base/win/scoped_handle.h"
diff --git a/media/base/android/media_codec_bridge_impl_unittest.cc b/media/base/android/media_codec_bridge_impl_unittest.cc index 322eb3d5..d1010650 100644 --- a/media/base/android/media_codec_bridge_impl_unittest.cc +++ b/media/base/android/media_codec_bridge_impl_unittest.cc
@@ -11,6 +11,7 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/memory/ptr_util.h" +#include "base/time/time.h" #include "media/base/android/media_codec_bridge_impl.h" #include "media/base/android/media_codec_util.h" #include "media/base/decoder_buffer.h"
diff --git a/media/base/android/media_service_throttler_unittest.cc b/media/base/android/media_service_throttler_unittest.cc index 0e3928f0..7b12f8a 100644 --- a/media/base/android/media_service_throttler_unittest.cc +++ b/media/base/android/media_service_throttler_unittest.cc
@@ -8,6 +8,7 @@ #include "base/numerics/safe_conversions.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "media/base/android/media_server_crash_listener.h" #include "media/base/fake_single_thread_task_runner.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/base/audio_buffer_unittest.cc b/media/base/audio_buffer_unittest.cc index 7a11dcf..e20fff8 100644 --- a/media/base/audio_buffer_unittest.cc +++ b/media/base/audio_buffer_unittest.cc
@@ -8,6 +8,7 @@ #include <memory> #include "base/test/gtest_util.h" +#include "base/time/time.h" #include "media/base/audio_buffer.h" #include "media/base/audio_bus.h" #include "media/base/test_helpers.h"
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc index ebbeb8c..d094586 100644 --- a/media/base/audio_renderer_mixer_unittest.cc +++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -18,6 +18,7 @@ #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "media/base/audio_renderer_mixer_input.h" #include "media/base/audio_renderer_mixer_pool.h" #include "media/base/fake_audio_render_callback.h"
diff --git a/media/base/audio_shifter_unittest.cc b/media/base/audio_shifter_unittest.cc index 206048a..4d99cea 100644 --- a/media/base/audio_shifter_unittest.cc +++ b/media/base/audio_shifter_unittest.cc
@@ -8,6 +8,7 @@ #include <memory> #include <vector> +#include "base/time/time.h" #include "media/base/audio_bus.h" #include "media/base/audio_shifter.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/base/data_buffer_unittest.cc b/media/base/data_buffer_unittest.cc index 0647bfe..0faaecd8 100644 --- a/media/base/data_buffer_unittest.cc +++ b/media/base/data_buffer_unittest.cc
@@ -10,6 +10,7 @@ #include <utility> #include "base/strings/string_util.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace media {
diff --git a/media/base/fake_audio_render_callback.h b/media/base/fake_audio_render_callback.h index 3fe33f2..1f5e39b 100644 --- a/media/base/fake_audio_render_callback.h +++ b/media/base/fake_audio_render_callback.h
@@ -7,6 +7,7 @@ #include <stdint.h> +#include "base/time/time.h" #include "media/base/audio_converter.h" #include "media/base/audio_renderer_sink.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/base/fake_demuxer_stream.h b/media/base/fake_demuxer_stream.h index c0a19a3..1a2251e 100644 --- a/media/base/fake_demuxer_stream.h +++ b/media/base/fake_demuxer_stream.h
@@ -6,6 +6,7 @@ #define MEDIA_BASE_FAKE_DEMUXER_STREAM_H_ #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "media/base/audio_decoder_config.h" #include "media/base/demuxer_stream.h" #include "media/base/media_resource.h"
diff --git a/media/base/fake_single_thread_task_runner.h b/media/base/fake_single_thread_task_runner.h index 84e302f8..fd61d665 100644 --- a/media/base/fake_single_thread_task_runner.h +++ b/media/base/fake_single_thread_task_runner.h
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" namespace media {
diff --git a/media/base/feedback_signal_accumulator_unittest.cc b/media/base/feedback_signal_accumulator_unittest.cc index d6c11a9..f1d09ba 100644 --- a/media/base/feedback_signal_accumulator_unittest.cc +++ b/media/base/feedback_signal_accumulator_unittest.cc
@@ -4,6 +4,7 @@ #include "media/base/feedback_signal_accumulator.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace media {
diff --git a/media/base/media_log_properties.h b/media/base/media_log_properties.h index 3bca8a08..ddd20e9 100644 --- a/media/base/media_log_properties.h +++ b/media/base/media_log_properties.h
@@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/time/time.h" #include "media/base/audio_decoder_config.h" #include "media/base/media_export.h" #include "media/base/media_log_type_enforcement.h"
diff --git a/media/base/null_video_sink.h b/media/base/null_video_sink.h index f113e09..28ddf2a 100644 --- a/media/base/null_video_sink.h +++ b/media/base/null_video_sink.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/time/default_tick_clock.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "media/base/media_export.h" #include "media/base/video_renderer_sink.h"
diff --git a/media/base/null_video_sink_unittest.cc b/media/base/null_video_sink_unittest.cc index cbb954f..cc89d6fa 100644 --- a/media/base/null_video_sink_unittest.cc +++ b/media/base/null_video_sink_unittest.cc
@@ -9,6 +9,7 @@ #include "base/test/gmock_callback_support.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/viz/common/frame_sinks/begin_frame_args.h" #include "media/base/null_video_sink.h" #include "media/base/test_helpers.h"
diff --git a/media/base/offloading_audio_encoder_unittest.cc b/media/base/offloading_audio_encoder_unittest.cc index 467ce41..39c2719a 100644 --- a/media/base/offloading_audio_encoder_unittest.cc +++ b/media/base/offloading_audio_encoder_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "media/base/media_util.h" #include "media/base/mock_filters.h" #include "media/base/offloading_audio_encoder.h"
diff --git a/media/base/pipeline_impl.h b/media/base/pipeline_impl.h index d88da084..6262fa9 100644 --- a/media/base/pipeline_impl.h +++ b/media/base/pipeline_impl.h
@@ -11,6 +11,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/base/media_export.h" #include "media/base/pipeline.h" #include "media/base/renderer.h"
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc index 07c9530..c9f047b 100644 --- a/media/base/pipeline_impl_unittest.cc +++ b/media/base/pipeline_impl_unittest.cc
@@ -20,6 +20,7 @@ #include "base/threading/simple_thread.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/clock.h" +#include "base/time/time.h" #include "media/base/fake_text_track_stream.h" #include "media/base/media_util.h" #include "media/base/mock_filters.h"
diff --git a/media/base/text_renderer_unittest.cc b/media/base/text_renderer_unittest.cc index 40c14d2..68e805b 100644 --- a/media/base/text_renderer_unittest.cc +++ b/media/base/text_renderer_unittest.cc
@@ -13,6 +13,7 @@ #include "base/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "media/base/audio_decoder_config.h" #include "media/base/decoder_buffer.h" #include "media/base/demuxer_stream.h"
diff --git a/media/base/time_delta_interpolator_unittest.cc b/media/base/time_delta_interpolator_unittest.cc index ed8b35c..c1c7935e 100644 --- a/media/base/time_delta_interpolator_unittest.cc +++ b/media/base/time_delta_interpolator_unittest.cc
@@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/test/simple_test_tick_clock.h" #include "media/base/time_delta_interpolator.h" +#include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace media {
diff --git a/media/base/tuneable.cc b/media/base/tuneable.cc index c3b6d42..d018fd6 100644 --- a/media/base/tuneable.cc +++ b/media/base/tuneable.cc
@@ -10,6 +10,7 @@ #include "base/hash/hash.h" #include "base/metrics/field_trial_params.h" #include "base/strings/string_number_conversions.h" +#include "base/time/time.h" #include "media/base/media_switches.h" namespace {
diff --git a/media/base/video_frame.h b/media/base/video_frame.h index 7d4abde..edf7429 100644 --- a/media/base/video_frame.h +++ b/media/base/video_frame.h
@@ -22,6 +22,7 @@ #include "base/memory/unsafe_shared_memory_region.h" #include "base/synchronization/lock.h" #include "base/thread_annotations.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "build/build_config.h" #include "gpu/command_buffer/common/mailbox_holder.h"
diff --git a/media/base/video_frame_pool.cc b/media/base/video_frame_pool.cc index e5aa15c..8f6a048 100644 --- a/media/base/video_frame_pool.cc +++ b/media/base/video_frame_pool.cc
@@ -12,6 +12,7 @@ #include "base/synchronization/lock.h" #include "base/thread_annotations.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" namespace media {
diff --git a/media/base/wall_clock_time_source_unittest.cc b/media/base/wall_clock_time_source_unittest.cc index 05c7718f..20b701a3 100644 --- a/media/base/wall_clock_time_source_unittest.cc +++ b/media/base/wall_clock_time_source_unittest.cc
@@ -5,6 +5,7 @@ #include <memory> #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "media/base/wall_clock_time_source.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/capabilities/in_memory_video_decode_stats_db_impl.cc b/media/capabilities/in_memory_video_decode_stats_db_impl.cc index dcee0b3..8f85d255 100644 --- a/media/capabilities/in_memory_video_decode_stats_db_impl.cc +++ b/media/capabilities/in_memory_video_decode_stats_db_impl.cc
@@ -13,7 +13,6 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "media/base/bind_to_current_loop.h" #include "media/capabilities/video_decode_stats_db_provider.h"
diff --git a/media/capabilities/learning_helper.cc b/media/capabilities/learning_helper.cc index d31645f..c88e0d4 100644 --- a/media/capabilities/learning_helper.cc +++ b/media/capabilities/learning_helper.cc
@@ -4,7 +4,6 @@ #include "media/capabilities/learning_helper.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "media/learning/common/feature_library.h" #include "media/learning/common/learning_task.h"
diff --git a/media/capabilities/video_decode_stats_db_impl.cc b/media/capabilities/video_decode_stats_db_impl.cc index fc8f11b5..7df2548 100644 --- a/media/capabilities/video_decode_stats_db_impl.cc +++ b/media/capabilities/video_decode_stats_db_impl.cc
@@ -17,7 +17,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_clock.h"
diff --git a/media/capabilities/video_decode_stats_db_impl.h b/media/capabilities/video_decode_stats_db_impl.h index 5a68d2cc..e7457ea5 100644 --- a/media/capabilities/video_decode_stats_db_impl.h +++ b/media/capabilities/video_decode_stats_db_impl.h
@@ -13,6 +13,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial_params.h" +#include "base/time/time.h" #include "components/leveldb_proto/public/proto_database.h" #include "media/base/media_export.h" #include "media/base/video_codecs.h"
diff --git a/media/capabilities/video_decode_stats_db_impl_unittest.cc b/media/capabilities/video_decode_stats_db_impl_unittest.cc index 68595ea..565b743 100644 --- a/media/capabilities/video_decode_stats_db_impl_unittest.cc +++ b/media/capabilities/video_decode_stats_db_impl_unittest.cc
@@ -17,6 +17,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/leveldb_proto/testing/fake_db.h" #include "media/base/media_switches.h" #include "media/base/test_data_util.h"
diff --git a/media/capabilities/webrtc_video_stats_db_impl.cc b/media/capabilities/webrtc_video_stats_db_impl.cc index 4d31823..fefbc7b7 100644 --- a/media/capabilities/webrtc_video_stats_db_impl.cc +++ b/media/capabilities/webrtc_video_stats_db_impl.cc
@@ -18,7 +18,6 @@ #include "base/metrics/histogram_macros.h" #include "base/sequence_checker.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_clock.h"
diff --git a/media/capabilities/webrtc_video_stats_db_impl.h b/media/capabilities/webrtc_video_stats_db_impl.h index 934a91b..ac9b2e1 100644 --- a/media/capabilities/webrtc_video_stats_db_impl.h +++ b/media/capabilities/webrtc_video_stats_db_impl.h
@@ -12,6 +12,7 @@ #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial_params.h" +#include "base/time/time.h" #include "components/leveldb_proto/public/proto_database.h" #include "media/base/media_export.h" #include "media/base/video_codecs.h"
diff --git a/media/capture/content/smooth_event_sampler_unittest.cc b/media/capture/content/smooth_event_sampler_unittest.cc index ee233e85..fb18539 100644 --- a/media/capture/content/smooth_event_sampler_unittest.cc +++ b/media/capture/content/smooth_event_sampler_unittest.cc
@@ -8,6 +8,7 @@ #include <stdint.h> #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace media {
diff --git a/media/capture/content/video_capture_oracle_unittest.cc b/media/capture/content/video_capture_oracle_unittest.cc index 06dc6735..eb0f4de1 100644 --- a/media/capture/content/video_capture_oracle_unittest.cc +++ b/media/capture/content/video_capture_oracle_unittest.cc
@@ -4,6 +4,7 @@ #include "media/capture/content/video_capture_oracle.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/capture/run_all_unittests.cc b/media/capture/run_all_unittests.cc index 6b69c1c..3131bbb2 100644 --- a/media/capture/run_all_unittests.cc +++ b/media/capture/run_all_unittests.cc
@@ -12,6 +12,7 @@ #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "mojo/core/embedder/embedder.h" #include "mojo/core/embedder/scoped_ipc_support.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/capture/video/chromeos/camera_3a_controller.h b/media/capture/video/chromeos/camera_3a_controller.h index 7728dab..f55ded1b 100644 --- a/media/capture/video/chromeos/camera_3a_controller.h +++ b/media/capture/video/chromeos/camera_3a_controller.h
@@ -8,6 +8,7 @@ #include <unordered_set> #include "base/cancelable_callback.h" +#include "base/time/time.h" #include "media/base/media_export.h" #include "media/capture/video/chromeos/mojom/camera3.mojom.h" #include "media/capture/video/chromeos/request_manager.h"
diff --git a/media/capture/video/chromeos/camera_3a_controller_unittest.cc b/media/capture/video/chromeos/camera_3a_controller_unittest.cc index 520117f..c3ef25b 100644 --- a/media/capture/video/chromeos/camera_3a_controller_unittest.cc +++ b/media/capture/video/chromeos/camera_3a_controller_unittest.cc
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/capture/video/chromeos/camera_metadata_utils.h" #include "media/capture/video/chromeos/request_builder.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/capture/video/chromeos/camera_device_delegate_unittest.cc b/media/capture/video/chromeos/camera_device_delegate_unittest.cc index fc5f25c..7ccc6ca 100644 --- a/media/capture/video/chromeos/camera_device_delegate_unittest.cc +++ b/media/capture/video/chromeos/camera_device_delegate_unittest.cc
@@ -15,6 +15,7 @@ #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "media/base/bind_to_current_loop.h" #include "media/capture/video/chromeos/camera_buffer_factory.h" #include "media/capture/video/chromeos/camera_device_context.h"
diff --git a/media/capture/video/chromeos/camera_hal_delegate.h b/media/capture/video/chromeos/camera_hal_delegate.h index fbf9098..9bfc2d0 100644 --- a/media/capture/video/chromeos/camera_hal_delegate.h +++ b/media/capture/video/chromeos/camera_hal_delegate.h
@@ -15,6 +15,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/capture/video/chromeos/camera_hal_dispatcher_impl.h" #include "media/capture/video/chromeos/mojom/camera3.mojom.h" #include "media/capture/video/chromeos/mojom/camera_common.mojom.h"
diff --git a/media/capture/video/chromeos/camera_hal_dispatcher_impl.h b/media/capture/video/chromeos/camera_hal_dispatcher_impl.h index 042d5b4..feda1f7ef 100644 --- a/media/capture/video/chromeos/camera_hal_dispatcher_impl.h +++ b/media/capture/video/chromeos/camera_hal_dispatcher_impl.h
@@ -21,6 +21,7 @@ #include "base/synchronization/waitable_event.h" #include "base/thread_annotations.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "components/chromeos_camera/common/jpeg_encode_accelerator.mojom.h" #include "components/chromeos_camera/common/mjpeg_decode_accelerator.mojom.h"
diff --git a/media/capture/video/chromeos/mock_camera_module.h b/media/capture/video/chromeos/mock_camera_module.h index bdb6545d..e9c3166 100644 --- a/media/capture/video/chromeos/mock_camera_module.h +++ b/media/capture/video/chromeos/mock_camera_module.h
@@ -9,6 +9,7 @@ #include <stdint.h> #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/capture/video/chromeos/mojom/camera3.mojom.h" #include "media/capture/video/chromeos/mojom/camera_common.mojom.h" #include "mojo/public/cpp/bindings/associated_remote.h"
diff --git a/media/capture/video/chromeos/mock_vendor_tag_ops.h b/media/capture/video/chromeos/mock_vendor_tag_ops.h index 91eb412..98d42ca4b 100644 --- a/media/capture/video/chromeos/mock_vendor_tag_ops.h +++ b/media/capture/video/chromeos/mock_vendor_tag_ops.h
@@ -10,6 +10,7 @@ #include <vector> #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/capture/video/chromeos/mojom/camera_common.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/media/capture/video/chromeos/request_manager.h b/media/capture/video/chromeos/request_manager.h index c81b1f5..2beab7e 100644 --- a/media/capture/video/chromeos/request_manager.h +++ b/media/capture/video/chromeos/request_manager.h
@@ -14,6 +14,7 @@ #include "base/containers/flat_map.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "media/capture/mojom/image_capture.mojom.h" #include "media/capture/video/chromeos/camera_app_device_impl.h" #include "media/capture/video/chromeos/camera_device_context.h"
diff --git a/media/capture/video/chromeos/video_capture_device_chromeos_delegate.h b/media/capture/video/chromeos/video_capture_device_chromeos_delegate.h index a0225c0..1b28f10f 100644 --- a/media/capture/video/chromeos/video_capture_device_chromeos_delegate.h +++ b/media/capture/video/chromeos/video_capture_device_chromeos_delegate.h
@@ -12,6 +12,7 @@ #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/capture/video/chromeos/camera_device_context.h" #include "media/capture/video/chromeos/display_rotation_observer.h" #include "media/capture/video/video_capture_device.h"
diff --git a/media/capture/video/fake_video_capture_device.h b/media/capture/video/fake_video_capture_device.h index f8daa30..70f07fb 100644 --- a/media/capture/video/fake_video_capture_device.h +++ b/media/capture/video/fake_video_capture_device.h
@@ -12,6 +12,7 @@ #include "base/memory/raw_ptr.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/capture/video/video_capture_device.h" namespace gpu {
diff --git a/media/capture/video/file_video_capture_device.h b/media/capture/video/file_video_capture_device.h index c3dd666d..74d8723 100644 --- a/media/capture/video/file_video_capture_device.h +++ b/media/capture/video/file_video_capture_device.h
@@ -14,6 +14,7 @@ #include "base/files/memory_mapped_file.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "gpu/ipc/common/gpu_memory_buffer_support.h" #include "media/capture/video/video_capture_device.h"
diff --git a/media/capture/video/fuchsia/video_capture_device_fuchsia_test.cc b/media/capture/video/fuchsia/video_capture_device_fuchsia_test.cc index aa8e473..a0932e6 100644 --- a/media/capture/video/fuchsia/video_capture_device_fuchsia_test.cc +++ b/media/capture/video/fuchsia/video_capture_device_fuchsia_test.cc
@@ -7,6 +7,7 @@ #include "base/fuchsia/test_component_context_for_process.h" #include "base/test/bind.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "media/capture/video/fuchsia/video_capture_device_factory_fuchsia.h" #include "media/fuchsia/camera/fake_fuchsia_camera.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/capture/video/linux/fake_v4l2_impl.cc b/media/capture/video/linux/fake_v4l2_impl.cc index bda8321..40b22bb 100644 --- a/media/capture/video/linux/fake_v4l2_impl.cc +++ b/media/capture/video/linux/fake_v4l2_impl.cc
@@ -14,6 +14,7 @@ #include "base/bits.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/base/video_frame.h" #ifndef KERNEL_VERSION
diff --git a/media/capture/video/linux/v4l2_capture_delegate.h b/media/capture/video/linux/v4l2_capture_delegate.h index 500fdd3..d0b6c41ca 100644 --- a/media/capture/video/linux/v4l2_capture_delegate.h +++ b/media/capture/video/linux/v4l2_capture_delegate.h
@@ -14,6 +14,7 @@ #include "base/containers/queue.h" #include "base/files/scoped_file.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/capture/video/linux/scoped_v4l2_device_fd.h" #include "media/capture/video/linux/v4l2_capture_device_impl.h"
diff --git a/media/capture/video/linux/video_capture_device_linux.h b/media/capture/video/linux/video_capture_device_linux.h index 08de3f0..a409185 100644 --- a/media/capture/video/linux/video_capture_device_linux.h +++ b/media/capture/video/linux/video_capture_device_linux.h
@@ -18,6 +18,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/capture/video/linux/v4l2_capture_device_impl.h" #include "media/capture/video/video_capture_device.h" #include "media/capture/video_capture_types.h"
diff --git a/media/capture/video/mac/video_capture_device_avfoundation_mac.h b/media/capture/video/mac/video_capture_device_avfoundation_mac.h index 9915c3e..c5a618b 100644 --- a/media/capture/video/mac/video_capture_device_avfoundation_mac.h +++ b/media/capture/video/mac/video_capture_device_avfoundation_mac.h
@@ -13,6 +13,7 @@ #include "base/mac/scoped_nsobject.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/capture/video/mac/sample_buffer_transformer_mac.h" #include "media/capture/video/video_capture_device.h" #include "media/capture/video_capture_types.h"
diff --git a/media/capture/video/mac/video_capture_device_decklink_mac.mm b/media/capture/video/mac/video_capture_device_decklink_mac.mm index 1c893f1d..2aec8fe5 100644 --- a/media/capture/video/mac/video_capture_device_decklink_mac.mm +++ b/media/capture/video/mac/video_capture_device_decklink_mac.mm
@@ -10,6 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/strings/sys_string_conversions.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "media/capture/video/video_capture_device_info.h" #include "third_party/decklink/mac/include/DeckLinkAPI.h"
diff --git a/media/capture/video/win/sink_input_pin_win.cc b/media/capture/video/win/sink_input_pin_win.cc index 2c80ba4..fe194c0 100644 --- a/media/capture/video/win/sink_input_pin_win.cc +++ b/media/capture/video/win/sink_input_pin_win.cc
@@ -12,6 +12,7 @@ #include <stdint.h> #include "base/logging.h" +#include "base/time/time.h" #include "base/win/win_util.h" #include "media/base/timestamp_constants.h" #include "media/base/video_frame.h"
diff --git a/media/capture/video/win/video_capture_device_factory_win.h b/media/capture/video/win/video_capture_device_factory_win.h index 6dab62d5..ed2126b 100644 --- a/media/capture/video/win/video_capture_device_factory_win.h +++ b/media/capture/video/win/video_capture_device_factory_win.h
@@ -16,6 +16,7 @@ #include <wrl.h> #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/base/win/dxgi_device_manager.h" #include "media/capture/video/video_capture_device_factory.h"
diff --git a/media/capture/video/win/video_capture_device_win.h b/media/capture/video/win/video_capture_device_win.h index 2f29428..ee3b5e9 100644 --- a/media/capture/video/win/video_capture_device_win.h +++ b/media/capture/video/win/video_capture_device_win.h
@@ -20,6 +20,7 @@ #include "base/containers/queue.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/capture/video/video_capture_device.h" #include "media/capture/video/win/capability_list_win.h" #include "media/capture/video/win/sink_filter_win.h"
diff --git a/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc b/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc index 8bd7476c..12e9f5f 100644 --- a/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc +++ b/media/cast/logging/receiver_time_offset_estimator_impl_unittest.cc
@@ -12,6 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "media/base/fake_single_thread_task_runner.h" #include "media/cast/cast_environment.h" #include "media/cast/logging/logging_defines.h"
diff --git a/media/cast/logging/stats_event_subscriber.h b/media/cast/logging/stats_event_subscriber.h index 5ca11a0..aa14f85 100644 --- a/media/cast/logging/stats_event_subscriber.h +++ b/media/cast/logging/stats_event_subscriber.h
@@ -17,6 +17,7 @@ #include "base/memory/raw_ptr.h" #include "base/threading/thread_checker.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "media/cast/logging/logging_defines.h" #include "media/cast/logging/raw_event_subscriber.h" #include "media/cast/logging/receiver_time_offset_estimator.h"
diff --git a/media/cast/logging/stats_event_subscriber_unittest.cc b/media/cast/logging/stats_event_subscriber_unittest.cc index 7487914..b340c6a 100644 --- a/media/cast/logging/stats_event_subscriber_unittest.cc +++ b/media/cast/logging/stats_event_subscriber_unittest.cc
@@ -14,6 +14,7 @@ #include "base/rand_util.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "media/base/fake_single_thread_task_runner.h" #include "media/cast/cast_environment.h"
diff --git a/media/cast/net/cast_transport_config.h b/media/cast/net/cast_transport_config.h index 7cf158b7c..7b86cc8 100644 --- a/media/cast/net/cast_transport_config.h +++ b/media/cast/net/cast_transport_config.h
@@ -12,6 +12,7 @@ #include <string> #include "base/callback.h" +#include "base/time/time.h" #include "media/cast/cast_config.h" #include "media/cast/common/rtp_time.h" #include "media/cast/net/cast_transport_defines.h"
diff --git a/media/cast/net/rtcp/receiver_rtcp_session.h b/media/cast/net/rtcp/receiver_rtcp_session.h index d10e4698..1e9e8493 100644 --- a/media/cast/net/rtcp/receiver_rtcp_session.h +++ b/media/cast/net/rtcp/receiver_rtcp_session.h
@@ -7,6 +7,7 @@ #include "base/memory/raw_ptr.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "media/cast/common/clock_drift_smoother.h" #include "media/cast/net/pacing/paced_sender.h" #include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h"
diff --git a/media/cast/net/rtcp/rtcp_builder.cc b/media/cast/net/rtcp/rtcp_builder.cc index a7fb6509..8c39955 100644 --- a/media/cast/net/rtcp/rtcp_builder.cc +++ b/media/cast/net/rtcp/rtcp_builder.cc
@@ -10,6 +10,7 @@ #include <vector> #include "base/logging.h" +#include "base/time/time.h" #include "media/cast/net/rtcp/rtcp_utility.h" namespace media {
diff --git a/media/cast/net/rtcp/rtcp_defines.h b/media/cast/net/rtcp/rtcp_defines.h index 79b56d11..160811d8 100644 --- a/media/cast/net/rtcp/rtcp_defines.h +++ b/media/cast/net/rtcp/rtcp_defines.h
@@ -13,6 +13,7 @@ #include <utility> #include <vector> +#include "base/time/time.h" #include "media/cast/logging/logging_defines.h" #include "media/cast/net/cast_transport_defines.h"
diff --git a/media/cast/net/rtcp/rtcp_unittest.cc b/media/cast/net/rtcp/rtcp_unittest.cc index 5d2ce44b..97937efd 100644 --- a/media/cast/net/rtcp/rtcp_unittest.cc +++ b/media/cast/net/rtcp/rtcp_unittest.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "media/cast/net/cast_transport_config.h" #include "media/cast/net/pacing/paced_sender.h" #include "media/cast/net/rtcp/receiver_rtcp_session.h"
diff --git a/media/cast/sender/audio_encoder_unittest.cc b/media/cast/sender/audio_encoder_unittest.cc index 1622735..0ae5bdf 100644 --- a/media/cast/sender/audio_encoder_unittest.cc +++ b/media/cast/sender/audio_encoder_unittest.cc
@@ -14,6 +14,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/logging.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/audio_bus.h" #include "media/base/fake_single_thread_task_runner.h"
diff --git a/media/cast/sender/av1_encoder.h b/media/cast/sender/av1_encoder.h index 0abd4437..4a0ae6df 100644 --- a/media/cast/sender/av1_encoder.h +++ b/media/cast/sender/av1_encoder.h
@@ -13,6 +13,7 @@ #include "media/cast/sender/software_video_encoder.h" #include "third_party/libaom/source/libaom/aom/aom_encoder.h" +#include "base/time/time.h" #include "ui/gfx/geometry/size.h" namespace media {
diff --git a/media/cast/sender/external_video_encoder.cc b/media/cast/sender/external_video_encoder.cc index b25dab61..d6d25ab 100644 --- a/media/cast/sender/external_video_encoder.cc +++ b/media/cast/sender/external_video_encoder.cc
@@ -18,6 +18,7 @@ #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/bind_to_current_loop.h" #include "media/base/bitrate.h"
diff --git a/media/cast/sender/h264_vt_encoder.cc b/media/cast/sender/h264_vt_encoder.cc index 78154cf..c5a5fd9b 100644 --- a/media/cast/sender/h264_vt_encoder.cc +++ b/media/cast/sender/h264_vt_encoder.cc
@@ -17,6 +17,7 @@ #include "base/logging.h" #include "base/power_monitor/power_monitor.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/mac/video_frame_mac.h" #include "media/cast/common/rtp_time.h"
diff --git a/media/cast/sender/h264_vt_encoder_unittest.cc b/media/cast/sender/h264_vt_encoder_unittest.cc index 80a349b..3af0fd9 100644 --- a/media/cast/sender/h264_vt_encoder_unittest.cc +++ b/media/cast/sender/h264_vt_encoder_unittest.cc
@@ -15,6 +15,7 @@ #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" #include "base/test/test_suite.h" +#include "base/time/time.h" #include "media/base/cdm_context.h" #include "media/base/decoder_buffer.h" #include "media/base/media.h"
diff --git a/media/cast/sender/video_encoder_unittest.cc b/media/cast/sender/video_encoder_unittest.cc index cd28b9f8..2ea52951 100644 --- a/media/cast/sender/video_encoder_unittest.cc +++ b/media/cast/sender/video_encoder_unittest.cc
@@ -16,6 +16,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/fake_single_thread_task_runner.h" #include "media/base/video_frame.h"
diff --git a/media/cast/sender/video_sender_unittest.cc b/media/cast/sender/video_sender_unittest.cc index 530411b..0aa95a9 100644 --- a/media/cast/sender/video_sender_unittest.cc +++ b/media/cast/sender/video_sender_unittest.cc
@@ -17,6 +17,7 @@ #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "media/base/fake_single_thread_task_runner.h" #include "media/base/video_frame.h" #include "media/cast/cast_environment.h"
diff --git a/media/cast/sender/vpx_encoder.h b/media/cast/sender/vpx_encoder.h index 8fa1a24..de17fed 100644 --- a/media/cast/sender/vpx_encoder.h +++ b/media/cast/sender/vpx_encoder.h
@@ -8,6 +8,7 @@ #include <stdint.h> #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/base/feedback_signal_accumulator.h" #include "media/cast/cast_config.h" #include "media/cast/sender/software_video_encoder.h"
diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc index 0ccb2d9..fa5d887 100644 --- a/media/cast/test/cast_benchmarks.cc +++ b/media/cast/test/cast_benchmarks.cc
@@ -46,6 +46,7 @@ #include "base/test/simple_test_tick_clock.h" #include "base/threading/thread.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "media/base/audio_bus.h" #include "media/base/fake_single_thread_task_runner.h" #include "media/base/video_frame.h"
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc index 5b53451..fc52017 100644 --- a/media/cast/test/end2end_unittest.cc +++ b/media/cast/test/end2end_unittest.cc
@@ -23,6 +23,7 @@ #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/audio_bus.h" #include "media/base/fake_single_thread_task_runner.h"
diff --git a/media/cast/test/fake_media_source.h b/media/cast/test/fake_media_source.h index 8d6c0dd..4194b037 100644 --- a/media/cast/test/fake_media_source.h +++ b/media/cast/test/fake_media_source.h
@@ -20,6 +20,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "media/base/audio_converter.h" #include "media/base/audio_parameters.h" #include "media/base/media_util.h"
diff --git a/media/cast/test/receiver/cast_message_builder.h b/media/cast/test/receiver/cast_message_builder.h index 1a4ed20..4d404b1 100644 --- a/media/cast/test/receiver/cast_message_builder.h +++ b/media/cast/test/receiver/cast_message_builder.h
@@ -14,6 +14,7 @@ #include "base/containers/circular_deque.h" #include "base/memory/raw_ptr.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "media/cast/net/rtp/rtp_defines.h" namespace media {
diff --git a/media/cast/test/receiver/cast_receiver_impl.cc b/media/cast/test/receiver/cast_receiver_impl.cc index c4a6393..46235ab 100644 --- a/media/cast/test/receiver/cast_receiver_impl.cc +++ b/media/cast/test/receiver/cast_receiver_impl.cc
@@ -13,6 +13,7 @@ #include "base/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "media/cast/net/rtcp/rtcp_utility.h" #include "media/cast/test/receiver/audio_decoder.h"
diff --git a/media/cast/test/receiver/frame_receiver_unittest.cc b/media/cast/test/receiver/frame_receiver_unittest.cc index a586092f..bf062aa 100644 --- a/media/cast/test/receiver/frame_receiver_unittest.cc +++ b/media/cast/test/receiver/frame_receiver_unittest.cc
@@ -14,6 +14,7 @@ #include "base/containers/circular_deque.h" #include "base/memory/ref_counted.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "media/base/fake_single_thread_task_runner.h" #include "media/cast/cast_environment.h" #include "media/cast/logging/simple_event_subscriber.h"
diff --git a/media/cast/test/simulator.cc b/media/cast/test/simulator.cc index e97af76..8c0a557 100644 --- a/media/cast/test/simulator.cc +++ b/media/cast/test/simulator.cc
@@ -61,6 +61,7 @@ #include "base/test/simple_test_tick_clock.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "media/base/audio_bus.h" #include "media/base/fake_single_thread_task_runner.h"
diff --git a/media/cast/test/utility/standalone_cast_environment.h b/media/cast/test/utility/standalone_cast_environment.h index 1a89540..f744c063 100644 --- a/media/cast/test/utility/standalone_cast_environment.h +++ b/media/cast/test/utility/standalone_cast_environment.h
@@ -7,6 +7,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/cast/cast_environment.h" namespace media {
diff --git a/media/cast/test/utility/tap_proxy.cc b/media/cast/test/utility/tap_proxy.cc index 1d10be9..de9f220 100644 --- a/media/cast/test/utility/tap_proxy.cc +++ b/media/cast/test/utility/tap_proxy.cc
@@ -35,6 +35,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "media/cast/test/utility/udp_proxy.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h"
diff --git a/media/cast/test/utility/udp_proxy.cc b/media/cast/test/utility/udp_proxy.cc index 4aa00fa..4e9c7f3 100644 --- a/media/cast/test/utility/udp_proxy.cc +++ b/media/cast/test/utility/udp_proxy.cc
@@ -22,6 +22,7 @@ #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/log/net_log_source.h"
diff --git a/media/cast/test/utility/udp_proxy_main.cc b/media/cast/test/utility/udp_proxy_main.cc index 91b4b62..b4219ea 100644 --- a/media/cast/test/utility/udp_proxy_main.cc +++ b/media/cast/test/utility/udp_proxy_main.cc
@@ -18,6 +18,7 @@ #include "base/task/single_thread_task_executor.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "media/cast/test/utility/udp_proxy.h" #include "net/base/ip_address.h"
diff --git a/media/device_monitors/device_monitor_udev.cc b/media/device_monitors/device_monitor_udev.cc index dd542dce..e9151c2 100644 --- a/media/device_monitors/device_monitor_udev.cc +++ b/media/device_monitors/device_monitor_udev.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/sequence_checker.h" #include "base/system/system_monitor.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "device/udev_linux/udev.h" #include "device/udev_linux/udev_watcher.h"
diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc index 74fb3ac..ca8db242 100644 --- a/media/ffmpeg/ffmpeg_regression_tests.cc +++ b/media/ffmpeg/ffmpeg_regression_tests.cc
@@ -22,6 +22,7 @@ #include <string> #include "base/bind.h" +#include "base/time/time.h" #include "media/test/pipeline_integration_test_base.h" namespace media {
diff --git a/media/filters/audio_clock_unittest.cc b/media/filters/audio_clock_unittest.cc index 8ecc468b..631d163 100644 --- a/media/filters/audio_clock_unittest.cc +++ b/media/filters/audio_clock_unittest.cc
@@ -6,6 +6,7 @@ #include <memory> +#include "base/time/time.h" #include "media/base/audio_timestamp_helper.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/filters/audio_decoder_stream_unittest.cc b/media/filters/audio_decoder_stream_unittest.cc index 55a38c3..474ac3f 100644 --- a/media/filters/audio_decoder_stream_unittest.cc +++ b/media/filters/audio_decoder_stream_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "media/base/media_util.h" #include "media/base/mock_filters.h" #include "media/filters/decoder_stream.h"
diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc index fb09aeaa..7a19ffa1 100644 --- a/media/filters/audio_decoder_unittest.cc +++ b/media/filters/audio_decoder_unittest.cc
@@ -18,6 +18,7 @@ #include "base/sys_byteorder.h" #include "base/test/task_environment.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/audio_buffer.h" #include "media/base/audio_bus.h"
diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc index dd94247..2aba792 100644 --- a/media/filters/audio_file_reader_unittest.cc +++ b/media/filters/audio_file_reader_unittest.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/hash/md5.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/audio_bus.h" #include "media/base/audio_hash.h"
diff --git a/media/filters/audio_renderer_algorithm.h b/media/filters/audio_renderer_algorithm.h index e1c6134..77cbed26 100644 --- a/media/filters/audio_renderer_algorithm.h +++ b/media/filters/audio_renderer_algorithm.h
@@ -28,6 +28,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "media/base/audio_buffer.h" #include "media/base/audio_buffer_queue.h" #include "media/base/audio_parameters.h"
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h index b31cbbd..e7d75d56c 100644 --- a/media/filters/chunk_demuxer.h +++ b/media/filters/chunk_demuxer.h
@@ -19,6 +19,7 @@ #include "base/memory/raw_ptr.h" #include "base/synchronization/lock.h" #include "base/thread_annotations.h" +#include "base/time/time.h" #include "media/base/byte_queue.h" #include "media/base/demuxer.h" #include "media/base/demuxer_stream.h"
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc index fb0dda4..0241962 100644 --- a/media/filters/chunk_demuxer_unittest.cc +++ b/media/filters/chunk_demuxer_unittest.cc
@@ -22,6 +22,7 @@ #include "base/strings/string_util.h" #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/audio_decoder_config.h" #include "media/base/decoder_buffer.h"
diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h index a754373b..8a39210 100644 --- a/media/filters/decoder_stream.h +++ b/media/filters/decoder_stream.h
@@ -14,6 +14,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/types/pass_key.h" #include "media/base/audio_decoder.h" #include "media/base/audio_timestamp_helper.h"
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index 775e5578..ab891e8 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc
@@ -20,7 +20,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/sys_byteorder.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h index 0c541159..45ab0f3 100644 --- a/media/filters/ffmpeg_demuxer.h +++ b/media/filters/ffmpeg_demuxer.h
@@ -34,6 +34,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "media/base/audio_decoder_config.h" #include "media/base/decoder_buffer.h" #include "media/base/decoder_buffer_queue.h"
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index 59ba864e..a24ec28 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -23,6 +23,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "media/base/decrypt_config.h"
diff --git a/media/filters/frame_buffer_pool.cc b/media/filters/frame_buffer_pool.cc index 275b8604..0d8c455 100644 --- a/media/filters/frame_buffer_pool.cc +++ b/media/filters/frame_buffer_pool.cc
@@ -14,6 +14,7 @@ #include "base/strings/stringprintf.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/memory_allocator_dump.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/process_memory_dump.h"
diff --git a/media/filters/offloading_video_decoder.cc b/media/filters/offloading_video_decoder.cc index daba407..c80b9756 100644 --- a/media/filters/offloading_video_decoder.cc +++ b/media/filters/offloading_video_decoder.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/synchronization/atomic_flag.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "media/base/bind_to_current_loop.h"
diff --git a/media/filters/source_buffer_range.h b/media/filters/source_buffer_range.h index 818e5446..485527f7 100644 --- a/media/filters/source_buffer_range.h +++ b/media/filters/source_buffer_range.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "media/base/media_export.h" #include "media/base/stream_parser_buffer.h"
diff --git a/media/filters/source_buffer_state.h b/media/filters/source_buffer_state.h index bd464053..eaf483b 100644 --- a/media/filters/source_buffer_state.h +++ b/media/filters/source_buffer_state.h
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "media/base/audio_codecs.h" #include "media/base/demuxer.h" #include "media/base/demuxer_stream.h"
diff --git a/media/filters/source_buffer_state_unittest.cc b/media/filters/source_buffer_state_unittest.cc index 10977054..df9b2ba1 100644 --- a/media/filters/source_buffer_state_unittest.cc +++ b/media/filters/source_buffer_state_unittest.cc
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/test/gmock_callback_support.h" +#include "base/time/time.h" #include "media/base/media_util.h" #include "media/base/mock_filters.h" #include "media/base/mock_media_log.h"
diff --git a/media/filters/source_buffer_stream.h b/media/filters/source_buffer_stream.h index 17d6858..2584c57e 100644 --- a/media/filters/source_buffer_stream.h +++ b/media/filters/source_buffer_stream.h
@@ -24,6 +24,7 @@ #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "media/base/audio_decoder_config.h" #include "media/base/media_export.h" #include "media/base/media_log.h"
diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc index 3e88c37c..54d3870 100644 --- a/media/filters/source_buffer_stream_unittest.cc +++ b/media/filters/source_buffer_stream_unittest.cc
@@ -19,6 +19,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "media/base/data_buffer.h" #include "media/base/decoder_buffer.h" #include "media/base/media_log.h"
diff --git a/media/filters/video_cadence_estimator_unittest.cc b/media/filters/video_cadence_estimator_unittest.cc index 7d1ce93..d2b7cc5 100644 --- a/media/filters/video_cadence_estimator_unittest.cc +++ b/media/filters/video_cadence_estimator_unittest.cc
@@ -14,6 +14,7 @@ #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "media/base/media_switches.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/filters/video_renderer_algorithm_unittest.cc b/media/filters/video_renderer_algorithm_unittest.cc index a113df9..50cf9b6 100644 --- a/media/filters/video_renderer_algorithm_unittest.cc +++ b/media/filters/video_renderer_algorithm_unittest.cc
@@ -15,6 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/strings/stringprintf.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/media_util.h" #include "media/base/timestamp_constants.h"
diff --git a/media/formats/mp4/box_definitions.h b/media/formats/mp4/box_definitions.h index 0de5475a..4630095 100644 --- a/media/formats/mp4/box_definitions.h +++ b/media/formats/mp4/box_definitions.h
@@ -12,6 +12,7 @@ #include <vector> #include "base/compiler_specific.h" +#include "base/time/time.h" #include "media/base/decrypt_config.h" #include "media/base/media_export.h" #include "media/base/media_log.h"
diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc index aea794e..e2cdd453 100644 --- a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc +++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
@@ -8,6 +8,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/time/time.h" #include "media/base/media_log.h" #include "media/base/media_tracks.h" #include "media/base/media_util.h"
diff --git a/media/formats/webm/webm_cluster_parser.h b/media/formats/webm/webm_cluster_parser.h index 1722382..c84196a 100644 --- a/media/formats/webm/webm_cluster_parser.h +++ b/media/formats/webm/webm_cluster_parser.h
@@ -14,6 +14,7 @@ #include "base/containers/circular_deque.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "media/base/audio_decoder_config.h" #include "media/base/media_export.h" #include "media/base/media_log.h"
diff --git a/media/formats/webm/webm_tracks_parser_unittest.cc b/media/formats/webm/webm_tracks_parser_unittest.cc index 985b3b9..f28a877 100644 --- a/media/formats/webm/webm_tracks_parser_unittest.cc +++ b/media/formats/webm/webm_tracks_parser_unittest.cc
@@ -10,6 +10,7 @@ #include <memory> #include "base/logging.h" +#include "base/time/time.h" #include "media/base/channel_layout.h" #include "media/base/mock_media_log.h" #include "media/base/timestamp_constants.h"
diff --git a/media/fuchsia/audio/fuchsia_audio_output_device_test.cc b/media/fuchsia/audio/fuchsia_audio_output_device_test.cc index 727c7133..66df5b17 100644 --- a/media/fuchsia/audio/fuchsia_audio_output_device_test.cc +++ b/media/fuchsia/audio/fuchsia_audio_output_device_test.cc
@@ -9,6 +9,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "media/base/audio_renderer_sink.h" #include "media/base/audio_timestamp_helper.h" #include "media/fuchsia/audio/fake_audio_consumer.h"
diff --git a/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc b/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc index fe8551ba..942c1fae 100644 --- a/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc +++ b/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc
@@ -22,6 +22,7 @@ #include "base/strings/string_number_conversions.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "media/fuchsia/cdm/service/provisioning_fetcher_impl.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/origin.h"
diff --git a/media/gpu/android/android_video_encode_accelerator.h b/media/gpu/android/android_video_encode_accelerator.h index c75f889..e416693 100644 --- a/media/gpu/android/android_video_encode_accelerator.h +++ b/media/gpu/android/android_video_encode_accelerator.h
@@ -16,6 +16,7 @@ #include "base/containers/queue.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "media/base/android/media_codec_bridge_impl.h" #include "media/base/bitrate.h"
diff --git a/media/gpu/android/codec_allocator.cc b/media/gpu/android/codec_allocator.cc index 06ff0a6d..1b2afd19 100644 --- a/media/gpu/android/codec_allocator.cc +++ b/media/gpu/android/codec_allocator.cc
@@ -12,7 +12,6 @@ #include "base/callback_helpers.h" #include "base/logging.h" #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/media/gpu/android/codec_allocator.h b/media/gpu/android/codec_allocator.h index 90a9414..1043198 100644 --- a/media/gpu/android/codec_allocator.h +++ b/media/gpu/android/codec_allocator.h
@@ -14,6 +14,7 @@ #include "base/memory/raw_ptr.h" #include "base/no_destructor.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "media/base/android/android_util.h" #include "media/base/android/media_codec_bridge.h" #include "media/base/android/media_codec_bridge_impl.h"
diff --git a/media/gpu/android/codec_allocator_unittest.cc b/media/gpu/android/codec_allocator_unittest.cc index 6e651fd2..12db2434 100644 --- a/media/gpu/android/codec_allocator_unittest.cc +++ b/media/gpu/android/codec_allocator_unittest.cc
@@ -19,6 +19,7 @@ #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "media/base/android/mock_media_codec_bridge.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/gpu/android/codec_wrapper_unittest.cc b/media/gpu/android/codec_wrapper_unittest.cc index 9bcbb38..a31019a 100644 --- a/media/gpu/android/codec_wrapper_unittest.cc +++ b/media/gpu/android/codec_wrapper_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/base/android/media_codec_bridge.h" #include "media/base/android/mock_media_codec_bridge.h" #include "media/base/encryption_scheme.h"
diff --git a/media/gpu/android/media_codec_video_decoder.cc b/media/gpu/android/media_codec_video_decoder.cc index b3604b3..404d5ed 100644 --- a/media/gpu/android/media_codec_video_decoder.cc +++ b/media/gpu/android/media_codec_video_decoder.cc
@@ -16,6 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "media/base/android/media_codec_bridge_impl.h" #include "media/base/android/media_codec_util.h"
diff --git a/media/gpu/android/promotion_hint_aggregator_impl.h b/media/gpu/android/promotion_hint_aggregator_impl.h index cc42ba4c..99ffe2a 100644 --- a/media/gpu/android/promotion_hint_aggregator_impl.h +++ b/media/gpu/android/promotion_hint_aggregator_impl.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "media/gpu/android/promotion_hint_aggregator.h" #include "media/gpu/media_gpu_export.h"
diff --git a/media/gpu/chromeos/dmabuf_video_frame_pool.h b/media/gpu/chromeos/dmabuf_video_frame_pool.h index 67f59bca7..87840b2 100644 --- a/media/gpu/chromeos/dmabuf_video_frame_pool.h +++ b/media/gpu/chromeos/dmabuf_video_frame_pool.h
@@ -7,6 +7,7 @@ #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "media/base/status.h" #include "media/base/video_frame.h" #include "media/gpu/chromeos/chromeos_status.h"
diff --git a/media/gpu/chromeos/image_processor.cc b/media/gpu/chromeos/image_processor.cc index 89e6acf8..4e45b219 100644 --- a/media/gpu/chromeos/image_processor.cc +++ b/media/gpu/chromeos/image_processor.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "media/base/video_types.h"
diff --git a/media/gpu/chromeos/image_processor_backend.cc b/media/gpu/chromeos/image_processor_backend.cc index 332e384..5bfa471 100644 --- a/media/gpu/chromeos/image_processor_backend.cc +++ b/media/gpu/chromeos/image_processor_backend.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "media/gpu/macros.h"
diff --git a/media/gpu/chromeos/mailbox_video_frame_converter.cc b/media/gpu/chromeos/mailbox_video_frame_converter.cc index 1aa78fc..d6a482e 100644 --- a/media/gpu/chromeos/mailbox_video_frame_converter.cc +++ b/media/gpu/chromeos/mailbox_video_frame_converter.cc
@@ -8,7 +8,6 @@ #include "base/containers/contains.h" #include "base/location.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner_util.h" #include "base/trace_event/trace_event.h"
diff --git a/media/gpu/chromeos/platform_video_frame_pool.cc b/media/gpu/chromeos/platform_video_frame_pool.cc index e0b19cb..019bf5a 100644 --- a/media/gpu/chromeos/platform_video_frame_pool.cc +++ b/media/gpu/chromeos/platform_video_frame_pool.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/logging.h" -#include "base/task/post_task.h" #include "media/base/video_util.h" #include "media/gpu/chromeos/gpu_buffer_layout.h" #include "media/gpu/chromeos/platform_video_frame_utils.h"
diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc index 5bf723f..3ec8199 100644 --- a/media/gpu/chromeos/video_decoder_pipeline.cc +++ b/media/gpu/chromeos/video_decoder_pipeline.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/containers/contains.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/media/gpu/mac/vt_video_encode_accelerator_mac.cc b/media/gpu/mac/vt_video_encode_accelerator_mac.cc index 093ee1f..cc9c5fe 100644 --- a/media/gpu/mac/vt_video_encode_accelerator_mac.cc +++ b/media/gpu/mac/vt_video_encode_accelerator_mac.cc
@@ -13,6 +13,7 @@ #include "base/memory/unsafe_shared_memory_region.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "media/base/bitrate.h" #include "media/base/mac/video_frame_mac.h" #include "media/base/media_log.h"
diff --git a/media/gpu/test/video.cc b/media/gpu/test/video.cc index 5a093a5..e771acc 100644 --- a/media/gpu/test/video.cc +++ b/media/gpu/test/video.cc
@@ -14,7 +14,6 @@ #include "base/json/json_reader.h" #include "base/numerics/safe_conversions.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/threading/thread.h" #include "base/values.h"
diff --git a/media/gpu/test/video_encoder/bitstream_file_writer.h b/media/gpu/test/video_encoder/bitstream_file_writer.h index 0de3056..6fcaff82 100644 --- a/media/gpu/test/video_encoder/bitstream_file_writer.h +++ b/media/gpu/test/video_encoder/bitstream_file_writer.h
@@ -13,6 +13,7 @@ #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/gpu/test/bitstream_helpers.h" namespace media {
diff --git a/media/gpu/test/video_encoder/bitstream_validator.h b/media/gpu/test/video_encoder/bitstream_validator.h index 500aff53..23e6f61 100644 --- a/media/gpu/test/video_encoder/bitstream_validator.h +++ b/media/gpu/test/video_encoder/bitstream_validator.h
@@ -16,6 +16,7 @@ #include "base/synchronization/lock.h" #include "base/thread_annotations.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/base/bitstream_buffer.h" #include "media/base/decoder_status.h" #include "media/base/video_decoder.h"
diff --git a/media/gpu/test/video_encoder/video_encoder_client.h b/media/gpu/test/video_encoder/video_encoder_client.h index c2d9923..a2bacaec 100644 --- a/media/gpu/test/video_encoder/video_encoder_client.h +++ b/media/gpu/test/video_encoder/video_encoder_client.h
@@ -14,6 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/base/video_bitrate_allocation.h" #include "media/gpu/test/bitstream_helpers.h" #include "media/gpu/test/video_encoder/video_encoder.h"
diff --git a/media/gpu/test/video_frame_file_writer.h b/media/gpu/test/video_frame_file_writer.h index 56add48..d84a955 100644 --- a/media/gpu/test/video_frame_file_writer.h +++ b/media/gpu/test/video_frame_file_writer.h
@@ -14,6 +14,7 @@ #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/gpu/test/video_frame_helpers.h" namespace media {
diff --git a/media/gpu/test/video_frame_validator.h b/media/gpu/test/video_frame_validator.h index 6be1f3e9..352a3ca 100644 --- a/media/gpu/test/video_frame_validator.h +++ b/media/gpu/test/video_frame_validator.h
@@ -18,6 +18,7 @@ #include "base/synchronization/lock.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/base/video_types.h" #include "media/gpu/test/video_frame_helpers.h" #include "ui/gfx/geometry/rect.h"
diff --git a/media/gpu/test/video_player/test_vda_video_decoder.cc b/media/gpu/test/video_player/test_vda_video_decoder.cc index 60cce08c..4da02fb 100644 --- a/media/gpu/test/video_player/test_vda_video_decoder.cc +++ b/media/gpu/test/video_player/test_vda_video_decoder.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "media/base/media_log.h"
diff --git a/media/gpu/test/video_player/test_vda_video_decoder.h b/media/gpu/test/video_player/test_vda_video_decoder.h index 791b037a..3c9ca39f 100644 --- a/media/gpu/test/video_player/test_vda_video_decoder.h +++ b/media/gpu/test/video_player/test_vda_video_decoder.h
@@ -11,6 +11,7 @@ #include "base/containers/lru_cache.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "gpu/ipc/service/gpu_memory_buffer_factory.h" #include "media/base/video_decoder.h" #include "media/gpu/test/video_player/video_decoder_client.h"
diff --git a/media/gpu/test/video_player/video_decoder_client.h b/media/gpu/test/video_player/video_decoder_client.h index c0ee013..264fe63 100644 --- a/media/gpu/test/video_player/video_decoder_client.h +++ b/media/gpu/test/video_player/video_decoder_client.h
@@ -13,6 +13,7 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "gpu/ipc/service/gpu_memory_buffer_factory.h" #include "media/base/decoder_status.h" #include "media/base/video_decoder.h"
diff --git a/media/gpu/test/video_player/video_player.h b/media/gpu/test/video_player/video_player.h index 0db147b3..1c47e90 100644 --- a/media/gpu/test/video_player/video_player.h +++ b/media/gpu/test/video_player/video_player.h
@@ -15,6 +15,7 @@ #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/thread_annotations.h" +#include "base/time/time.h" #include "media/gpu/test/video_frame_helpers.h" #include "media/gpu/test/video_player/frame_renderer.h"
diff --git a/media/gpu/test/video_test_helpers.h b/media/gpu/test/video_test_helpers.h index c508555..791ecd19 100644 --- a/media/gpu/test/video_test_helpers.h +++ b/media/gpu/test/video_test_helpers.h
@@ -15,6 +15,7 @@ #include "base/memory/scoped_refptr.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/decoder_buffer.h" #include "media/base/video_codecs.h"
diff --git a/media/gpu/v4l2/v4l2_device_poller.h b/media/gpu/v4l2/v4l2_device_poller.h index 9abe4416..2e5b38c 100644 --- a/media/gpu/v4l2/v4l2_device_poller.h +++ b/media/gpu/v4l2/v4l2_device_poller.h
@@ -11,6 +11,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" namespace media {
diff --git a/media/gpu/v4l2/v4l2_image_processor_backend.cc b/media/gpu/v4l2/v4l2_image_processor_backend.cc index 408bf641..368294c 100644 --- a/media/gpu/v4l2/v4l2_image_processor_backend.cc +++ b/media/gpu/v4l2/v4l2_image_processor_backend.cc
@@ -19,7 +19,6 @@ #include "base/bind.h" #include "base/callback.h" #include "base/numerics/safe_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h"
diff --git a/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.h b/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.h index 8a94b61..bc229c9 100644 --- a/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.h +++ b/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.h
@@ -16,6 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "components/chromeos_camera/jpeg_encode_accelerator.h" #include "gpu/ipc/common/gpu_memory_buffer_support.h" #include "media/base/bitstream_buffer.h"
diff --git a/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.h b/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.h index f13e529..f99c42d 100644 --- a/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.h +++ b/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.h
@@ -16,6 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "components/chromeos_camera/mjpeg_decode_accelerator.h" #include "media/gpu/media_gpu_export.h" #include "media/gpu/v4l2/v4l2_device.h"
diff --git a/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.h b/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.h index 6aad0f46..5fecaeaa 100644 --- a/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.h +++ b/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.h
@@ -19,6 +19,7 @@ #include "base/memory/weak_ptr.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_provider.h" #include "media/gpu/chromeos/fourcc.h" #include "media/gpu/decode_surface_handler.h"
diff --git a/media/gpu/v4l2/v4l2_video_decode_accelerator.h b/media/gpu/v4l2/v4l2_video_decode_accelerator.h index 1639071..96aea5e 100644 --- a/media/gpu/v4l2/v4l2_video_decode_accelerator.h +++ b/media/gpu/v4l2/v4l2_video_decode_accelerator.h
@@ -24,6 +24,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_provider.h" #include "media/base/limits.h" #include "media/base/video_decoder_config.h"
diff --git a/media/gpu/v4l2/v4l2_video_decoder.cc b/media/gpu/v4l2/v4l2_video_decoder.cc index 057b286..2b34a0c 100644 --- a/media/gpu/v4l2/v4l2_video_decoder.cc +++ b/media/gpu/v4l2/v4l2_video_decoder.cc
@@ -11,7 +11,6 @@ #include "base/containers/contains.h" #include "base/logging.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/trace_event/trace_event.h" #include "media/base/limits.h"
diff --git a/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.h b/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.h index 49b5857..19370d7a 100644 --- a/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.h +++ b/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.h
@@ -11,6 +11,7 @@ #include "base/containers/queue.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "media/base/video_codecs.h" #include "media/gpu/v4l2/v4l2_device.h" #include "media/gpu/v4l2/v4l2_framerate_control.h"
diff --git a/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.h b/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.h index e8d41ea..862cf6d 100644 --- a/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.h +++ b/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.h
@@ -11,6 +11,7 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "media/base/decoder_status.h" #include "media/base/video_decoder.h" #include "media/gpu/chromeos/dmabuf_video_frame_pool.h"
diff --git a/media/gpu/v4l2/v4l2_video_encode_accelerator.cc b/media/gpu/v4l2/v4l2_video_encode_accelerator.cc index f36abe9..89984af64 100644 --- a/media/gpu/v4l2/v4l2_video_encode_accelerator.cc +++ b/media/gpu/v4l2/v4l2_video_encode_accelerator.cc
@@ -22,7 +22,6 @@ #include "base/callback_helpers.h" #include "base/command_line.h" #include "base/numerics/safe_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc index db0f9d2..b49e8fc 100644 --- a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc +++ b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc
@@ -16,7 +16,6 @@ #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/trace_event/trace_event.h" #include "gpu/config/gpu_finch_features.h"
diff --git a/media/gpu/vaapi/vaapi_image_processor_backend.cc b/media/gpu/vaapi/vaapi_image_processor_backend.cc index 8647055..f5a346f 100644 --- a/media/gpu/vaapi/vaapi_image_processor_backend.cc +++ b/media/gpu/vaapi/vaapi_image_processor_backend.cc
@@ -15,7 +15,6 @@ #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h" #include "base/stl_util.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "media/gpu/chromeos/fourcc.h" #include "media/gpu/chromeos/platform_video_frame_utils.h"
diff --git a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc index d1cfbde..8c2788d 100644 --- a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc +++ b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc
@@ -17,7 +17,6 @@ #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h"
diff --git a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.h b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.h index 94c2af1..ee04164 100644 --- a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.h +++ b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.h
@@ -10,6 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "components/chromeos_camera/jpeg_encode_accelerator.h" #include "media/base/bitstream_buffer.h" #include "media/base/unaligned_shared_memory.h"
diff --git a/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.h b/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.h index 0821d5c..8ca5bcb 100644 --- a/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.h +++ b/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.h
@@ -13,6 +13,7 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "components/chromeos_camera/mjpeg_decode_accelerator.h" #include "media/gpu/chromeos/image_processor_backend.h" #include "media/gpu/media_gpu_export.h"
diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator.h b/media/gpu/vaapi/vaapi_video_decode_accelerator.h index bc5bc19..843fe64 100644 --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h
@@ -25,6 +25,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/thread_annotations.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_provider.h" #include "media/base/bitstream_buffer.h" #include "media/gpu/decode_surface_handler.h"
diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc index e22fd5b..4d229d6f 100644 --- a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
@@ -10,6 +10,7 @@ #include "base/run_loop.h" #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "media/gpu/accelerated_video_decoder.h" #include "media/gpu/vaapi/vaapi_picture.h" #include "media/gpu/vaapi/vaapi_picture_factory.h"
diff --git a/media/gpu/vaapi/vaapi_video_encode_accelerator.cc b/media/gpu/vaapi/vaapi_video_encode_accelerator.cc index 579f514e..23d9065 100644 --- a/media/gpu/vaapi/vaapi_video_encode_accelerator.cc +++ b/media/gpu/vaapi/vaapi_video_encode_accelerator.cc
@@ -24,7 +24,6 @@ #include "base/memory/ptr_util.h" #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/media/gpu/video_decode_accelerator_perf_tests.cc b/media/gpu/video_decode_accelerator_perf_tests.cc index 3a9975e9d..ea016ba 100644 --- a/media/gpu/video_decode_accelerator_perf_tests.cc +++ b/media/gpu/video_decode_accelerator_perf_tests.cc
@@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/json/json_writer.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/media_switches.h" #include "media/base/test_data_util.h"
diff --git a/media/gpu/video_encode_accelerator_perf_tests.cc b/media/gpu/video_encode_accelerator_perf_tests.cc index 8f262af7..fae0e6a 100644 --- a/media/gpu/video_encode_accelerator_perf_tests.cc +++ b/media/gpu/video_encode_accelerator_perf_tests.cc
@@ -11,6 +11,7 @@ #include "base/files/file_util.h" #include "base/json/json_writer.h" #include "base/strings/string_number_conversions.h" +#include "base/time/time.h" #include "media/base/bitstream_buffer.h" #include "media/base/media_switches.h" #include "media/base/media_util.h"
diff --git a/media/gpu/windows/d3d11_picture_buffer.h b/media/gpu/windows/d3d11_picture_buffer.h index 5e894a1..6aabb56 100644 --- a/media/gpu/windows/d3d11_picture_buffer.h +++ b/media/gpu/windows/d3d11_picture_buffer.h
@@ -12,6 +12,7 @@ #include <vector> #include "base/memory/ref_counted_delete_on_sequence.h" +#include "base/time/time.h" #include "gpu/command_buffer/service/mailbox_manager.h" #include "gpu/command_buffer/service/texture_manager.h" #include "gpu/ipc/service/command_buffer_stub.h"
diff --git a/media/gpu/windows/d3d11_video_decoder.h b/media/gpu/windows/d3d11_video_decoder.h index 85f435c..f1ee977 100644 --- a/media/gpu/windows/d3d11_video_decoder.h +++ b/media/gpu/windows/d3d11_video_decoder.h
@@ -15,6 +15,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/sequence_bound.h" +#include "base/time/time.h" #include "gpu/config/gpu_driver_bug_workarounds.h" #include "gpu/config/gpu_preferences.h" #include "media/base/callback_registry.h"
diff --git a/media/gpu/windows/dxva_video_decode_accelerator_win.h b/media/gpu/windows/dxva_video_decode_accelerator_win.h index 3bf7d99..6cb8a525 100644 --- a/media/gpu/windows/dxva_video_decode_accelerator_win.h +++ b/media/gpu/windows/dxva_video_decode_accelerator_win.h
@@ -23,6 +23,7 @@ #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "gpu/config/gpu_preferences.h" #include "media/base/video_color_space.h" #include "media/gpu/gpu_video_decode_accelerator_helpers.h"
diff --git a/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc b/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc index 1278a9ea..72bb399 100644 --- a/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc +++ b/media/gpu/windows/media_foundation_video_encode_accelerator_win.cc
@@ -23,6 +23,7 @@ #include "base/memory/unsafe_shared_memory_region.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "base/win/scoped_co_mem.h" #include "base/win/scoped_variant.h"
diff --git a/media/gpu/windows/mf_audio_encoder.cc b/media/gpu/windows/mf_audio_encoder.cc index 14c12cea..4db8293 100644 --- a/media/gpu/windows/mf_audio_encoder.cc +++ b/media/gpu/windows/mf_audio_encoder.cc
@@ -17,7 +17,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/time/time.h" @@ -895,4 +894,4 @@ } } -} // namespace media \ No newline at end of file +} // namespace media
diff --git a/media/midi/midi_manager_win.cc b/media/midi/midi_manager_win.cc index e2f0d2d..bc5cd0da 100644 --- a/media/midi/midi_manager_win.cc +++ b/media/midi/midi_manager_win.cc
@@ -28,6 +28,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "base/win/windows_version.h" #include "media/midi/message_util.h" #include "media/midi/midi_manager_winrt.h"
diff --git a/media/mojo/clients/mojo_audio_decoder_unittest.cc b/media/mojo/clients/mojo_audio_decoder_unittest.cc index 710f556..01b0fd42 100644 --- a/media/mojo/clients/mojo_audio_decoder_unittest.cc +++ b/media/mojo/clients/mojo_audio_decoder_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/base/audio_decoder_config.h" #include "media/base/audio_timestamp_helper.h" #include "media/base/decoder_buffer.h"
diff --git a/media/mojo/clients/mojo_audio_encoder_unittest.cc b/media/mojo/clients/mojo_audio_encoder_unittest.cc index c9ddb9f..5324730 100644 --- a/media/mojo/clients/mojo_audio_encoder_unittest.cc +++ b/media/mojo/clients/mojo_audio_encoder_unittest.cc
@@ -13,6 +13,7 @@ #include "base/test/gmock_callback_support.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/base/audio_encoder.h" #include "media/base/decoder_buffer.h" #include "media/base/media_util.h"
diff --git a/media/mojo/clients/mojo_video_decoder.h b/media/mojo/clients/mojo_video_decoder.h index 6f1df825..46277b9 100644 --- a/media/mojo/clients/mojo_video_decoder.h +++ b/media/mojo/clients/mojo_video_decoder.h
@@ -10,6 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "media/base/status.h" #include "media/base/video_decoder.h" #include "media/base/video_frame.h"
diff --git a/media/mojo/clients/win/media_foundation_renderer_client.h b/media/mojo/clients/win/media_foundation_renderer_client.h index 4f7fc48..01ac28e 100644 --- a/media/mojo/clients/win/media_foundation_renderer_client.h +++ b/media/mojo/clients/win/media_foundation_renderer_client.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "media/base/media_resource.h" #include "media/base/renderer.h" #include "media/base/renderer_client.h"
diff --git a/media/mojo/mojom/audio_decoder_config_mojom_traits.cc b/media/mojo/mojom/audio_decoder_config_mojom_traits.cc index ef02dd1..6692386 100644 --- a/media/mojo/mojom/audio_decoder_config_mojom_traits.cc +++ b/media/mojo/mojom/audio_decoder_config_mojom_traits.cc
@@ -4,6 +4,7 @@ #include "media/mojo/mojom/audio_decoder_config_mojom_traits.h" +#include "base/time/time.h" #include "mojo/public/cpp/base/time_mojom_traits.h" namespace mojo {
diff --git a/media/mojo/mojom/encoded_audio_buffer_traits.cc b/media/mojo/mojom/encoded_audio_buffer_traits.cc index e352a931..bcf6819 100644 --- a/media/mojo/mojom/encoded_audio_buffer_traits.cc +++ b/media/mojo/mojom/encoded_audio_buffer_traits.cc
@@ -4,6 +4,7 @@ #include "media/mojo/mojom/encoded_audio_buffer_traits.h" +#include "base/time/time.h" #include "mojo/public/cpp/base/time_mojom_traits.h" namespace mojo {
diff --git a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc b/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc index 00ad8b6..ce38bdc 100644 --- a/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc +++ b/media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
@@ -4,6 +4,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h" +#include "base/time/time.h" #include "gpu/ipc/common/gpu_memory_buffer_support.h" #include "media/base/format_utils.h" #include "media/gpu/buffer_validation.h"
diff --git a/media/mojo/mojom/video_frame_mojom_traits.cc b/media/mojo/mojom/video_frame_mojom_traits.cc index eaee627..a4ee74c 100644 --- a/media/mojo/mojom/video_frame_mojom_traits.cc +++ b/media/mojo/mojom/video_frame_mojom_traits.cc
@@ -10,6 +10,7 @@ #include "base/callback_helpers.h" #include "base/logging.h" #include "base/memory/unsafe_shared_memory_region.h" +#include "base/time/time.h" #include "build/build_config.h" #include "gpu/ipc/common/gpu_memory_buffer_support.h" #include "media/base/color_plane_layout.h"
diff --git a/media/mojo/services/media_metrics_provider.h b/media/mojo/services/media_metrics_provider.h index 7e5331b3..b97d9d2 100644 --- a/media/mojo/services/media_metrics_provider.h +++ b/media/mojo/services/media_metrics_provider.h
@@ -8,6 +8,7 @@ #include <stdint.h> #include <string> +#include "base/time/time.h" #include "media/base/container_names.h" #include "media/base/pipeline_status.h" #include "media/base/renderer_factory_selector.h"
diff --git a/media/mojo/services/mojo_cdm_file_io.cc b/media/mojo/services/mojo_cdm_file_io.cc index e88517e..89c1950 100644 --- a/media/mojo/services/mojo_cdm_file_io.cc +++ b/media/mojo/services/mojo_cdm_file_io.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h" #include "mojo/public/cpp/bindings/callback_helpers.h"
diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h index 27081de..8f1d29e 100644 --- a/media/mojo/services/mojo_renderer_service.h +++ b/media/mojo/services/mojo_renderer_service.h
@@ -13,6 +13,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/unguessable_token.h" #include "media/base/buffering_state.h"
diff --git a/media/mojo/services/playback_events_recorder.h b/media/mojo/services/playback_events_recorder.h index 36258a67..39c5a70 100644 --- a/media/mojo/services/playback_events_recorder.h +++ b/media/mojo/services/playback_events_recorder.h
@@ -5,6 +5,7 @@ #ifndef MEDIA_MOJO_SERVICES_PLAYBACK_EVENTS_RECORDER_H_ #define MEDIA_MOJO_SERVICES_PLAYBACK_EVENTS_RECORDER_H_ +#include "base/time/time.h" #include "media/mojo/mojom/playback_events_recorder.mojom.h" #include "media/mojo/services/media_mojo_export.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/media/mojo/services/playback_events_recorder_test.cc b/media/mojo/services/playback_events_recorder_test.cc index 3325aa8c..d4528bd6 100644 --- a/media/mojo/services/playback_events_recorder_test.cc +++ b/media/mojo/services/playback_events_recorder_test.cc
@@ -7,6 +7,7 @@ #include "base/metrics/user_metrics.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace media {
diff --git a/media/mojo/services/video_decode_perf_history_unittest.cc b/media/mojo/services/video_decode_perf_history_unittest.cc index 7d2bfc29..7f290f51 100644 --- a/media/mojo/services/video_decode_perf_history_unittest.cc +++ b/media/mojo/services/video_decode_perf_history_unittest.cc
@@ -10,7 +10,6 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h"
diff --git a/media/mojo/services/webrtc_video_perf_history_unittest.cc b/media/mojo/services/webrtc_video_perf_history_unittest.cc index c8f7d20..3ea5b0ec 100644 --- a/media/mojo/services/webrtc_video_perf_history_unittest.cc +++ b/media/mojo/services/webrtc_video_perf_history_unittest.cc
@@ -10,7 +10,6 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h"
diff --git a/media/remoting/courier_renderer.h b/media/remoting/courier_renderer.h index 7e07645..9fdf9c9 100644 --- a/media/remoting/courier_renderer.h +++ b/media/remoting/courier_renderer.h
@@ -16,6 +16,7 @@ #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "media/base/pipeline_status.h" #include "media/base/renderer.h"
diff --git a/media/renderers/audio_renderer_impl.h b/media/renderers/audio_renderer_impl.h index 62644a1..03750eb 100644 --- a/media/renderers/audio_renderer_impl.h +++ b/media/renderers/audio_renderer_impl.h
@@ -27,6 +27,7 @@ #include "base/memory/weak_ptr.h" #include "base/power_monitor/power_observer.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/audio_decoder.h" #include "media/base/audio_decoder_config.h"
diff --git a/media/renderers/audio_renderer_impl_unittest.cc b/media/renderers/audio_renderer_impl_unittest.cc index 160adf8..cc46128 100644 --- a/media/renderers/audio_renderer_impl_unittest.cc +++ b/media/renderers/audio_renderer_impl_unittest.cc
@@ -20,6 +20,7 @@ #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/audio_buffer_converter.h" #include "media/base/audio_bus.h"
diff --git a/media/renderers/renderer_impl_unittest.cc b/media/renderers/renderer_impl_unittest.cc index c2cdd1f..8e374ec 100644 --- a/media/renderers/renderer_impl_unittest.cc +++ b/media/renderers/renderer_impl_unittest.cc
@@ -16,6 +16,7 @@ #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "media/base/mock_filters.h" #include "media/base/test_helpers.h" #include "media/renderers/renderer_impl.h"
diff --git a/media/renderers/video_renderer_impl.h b/media/renderers/video_renderer_impl.h index 5f00d147..a101a2a 100644 --- a/media/renderers/video_renderer_impl.h +++ b/media/renderers/video_renderer_impl.h
@@ -15,6 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "media/base/decryptor.h" #include "media/base/demuxer_stream.h"
diff --git a/media/renderers/video_renderer_impl_unittest.cc b/media/renderers/video_renderer_impl_unittest.cc index 361bbc68..4cde8bac 100644 --- a/media/renderers/video_renderer_impl_unittest.cc +++ b/media/renderers/video_renderer_impl_unittest.cc
@@ -23,6 +23,7 @@ #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "media/base/data_buffer.h" #include "media/base/limits.h" #include "media/base/media_switches.h"
diff --git a/media/renderers/win/media_foundation_renderer.h b/media/renderers/win/media_foundation_renderer.h index 87afc1d..556c1fd 100644 --- a/media/renderers/win/media_foundation_renderer.h +++ b/media/renderers/win/media_foundation_renderer.h
@@ -15,6 +15,7 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/unguessable_token.h" #include "base/win/windows_types.h"
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc index efda5fdb..782b3669 100644 --- a/media/test/pipeline_integration_test.cc +++ b/media/test/pipeline_integration_test.cc
@@ -17,6 +17,7 @@ #include "base/strings/string_util.h" #include "base/test/bind.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/cdm_callback_promise.h" #include "media/base/cdm_key_information.h"
diff --git a/media/test/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h index 7c87252..c3a5004 100644 --- a/media/test/pipeline_integration_test_base.h +++ b/media/test/pipeline_integration_test_base.h
@@ -13,6 +13,7 @@ #include "base/run_loop.h" #include "base/test/scoped_run_loop_timeout.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "media/audio/clockless_audio_sink.h" #include "media/audio/null_audio_sink.h" #include "media/base/demuxer.h"
diff --git a/media/video/gpu_memory_buffer_video_frame_pool.cc b/media/video/gpu_memory_buffer_video_frame_pool.cc index d45f4b58..59e53a4 100644 --- a/media/video/gpu_memory_buffer_video_frame_pool.cc +++ b/media/video/gpu_memory_buffer_video_frame_pool.cc
@@ -28,6 +28,7 @@ #include "base/strings/stringprintf.h" #include "base/sys_byteorder.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/memory_dump_provider.h" #include "base/trace_event/trace_event.h"
diff --git a/media/video/video_encode_accelerator.h b/media/video/video_encode_accelerator.h index 90bb3e7..cb258d6 100644 --- a/media/video/video_encode_accelerator.h +++ b/media/video/video_encode_accelerator.h
@@ -15,6 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "media/base/bitrate.h" #include "media/base/bitstream_buffer.h" #include "media/base/media_export.h"
diff --git a/media/video/video_encode_accelerator_adapter.h b/media/video/video_encode_accelerator_adapter.h index e6edaef..25f3075 100644 --- a/media/video/video_encode_accelerator_adapter.h +++ b/media/video/video_encode_accelerator_adapter.h
@@ -14,6 +14,7 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/unsafe_shared_memory_pool.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "media/base/media_export.h" #include "media/base/video_encoder.h" #include "media/video/video_encode_accelerator.h"
diff --git a/mojo/core/channel_unittest.cc b/mojo/core/channel_unittest.cc index e9dee38..0ceebf0 100644 --- a/mojo/core/channel_unittest.cc +++ b/mojo/core/channel_unittest.cc
@@ -17,6 +17,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "mojo/core/platform_handle_utils.h" #include "mojo/public/cpp/platform/platform_channel.h"
diff --git a/mojo/core/ports/ports_unittest.cc b/mojo/core/ports/ports_unittest.cc index 8825a96..f0fee94 100644 --- a/mojo/core/ports/ports_unittest.cc +++ b/mojo/core/ports/ports_unittest.cc
@@ -23,6 +23,7 @@ #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "mojo/core/ports/event.h" #include "mojo/core/ports/node.h" #include "mojo/core/ports/node_delegate.h"
diff --git a/mojo/public/cpp/base/time_unittest.cc b/mojo/public/cpp/base/time_unittest.cc index f2ba5e8c..94ecbd2 100644 --- a/mojo/public/cpp/base/time_unittest.cc +++ b/mojo/public/cpp/base/time_unittest.cc
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/time/time.h" #include "mojo/public/cpp/base/time_mojom_traits.h" #include "mojo/public/cpp/test_support/test_utils.h" #include "mojo/public/mojom/base/time.mojom.h"
diff --git a/mojo/public/cpp/bindings/lib/message_dumper.cc b/mojo/public/cpp/bindings/lib/message_dumper.cc index 64237293..fbf6a78e 100644 --- a/mojo/public/cpp/bindings/lib/message_dumper.cc +++ b/mojo/public/cpp/bindings/lib/message_dumper.cc
@@ -13,7 +13,6 @@ #include "base/process/process.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "mojo/public/cpp/bindings/message.h"
diff --git a/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc b/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc index d69bc25b..ba09c28 100644 --- a/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc +++ b/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc
@@ -11,7 +11,6 @@ #include "base/rand_util.h" #include "base/sequence_checker.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc index e4d009b..438f05aa 100644 --- a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc +++ b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc
@@ -17,7 +17,6 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/binder_map_unittest.cc b/mojo/public/cpp/bindings/tests/binder_map_unittest.cc index f89b84da..6147ee8 100644 --- a/mojo/public/cpp/bindings/tests/binder_map_unittest.cc +++ b/mojo/public/cpp/bindings/tests/binder_map_unittest.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/flush_async_unittest.cc b/mojo/public/cpp/bindings/tests/flush_async_unittest.cc index 7550196..f2062c5 100644 --- a/mojo/public/cpp/bindings/tests/flush_async_unittest.cc +++ b/mojo/public/cpp/bindings/tests/flush_async_unittest.cc
@@ -13,7 +13,6 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "mojo/public/cpp/bindings/async_flusher.h"
diff --git a/mojo/public/cpp/bindings/tests/receiver_unittest.cc b/mojo/public/cpp/bindings/tests/receiver_unittest.cc index 17efb6be..338ef55a 100644 --- a/mojo/public/cpp/bindings/tests/receiver_unittest.cc +++ b/mojo/public/cpp/bindings/tests/receiver_unittest.cc
@@ -16,6 +16,7 @@ #include "base/synchronization/waitable_event.h" #include "base/test/bind.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/associated_remote.h" #include "mojo/public/cpp/bindings/lib/validation_errors.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/mojo/public/cpp/bindings/tests/remote_unittest.cc b/mojo/public/cpp/bindings/tests/remote_unittest.cc index bc26ebef..3f948bd68 100644 --- a/mojo/public/cpp/bindings/tests/remote_unittest.cc +++ b/mojo/public/cpp/bindings/tests/remote_unittest.cc
@@ -15,7 +15,6 @@ #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/mojo/public/cpp/bindings/tests/sync_method_unittest.cc b/mojo/public/cpp/bindings/tests/sync_method_unittest.cc index 3912bbd..cfac737 100644 --- a/mojo/public/cpp/bindings/tests/sync_method_unittest.cc +++ b/mojo/public/cpp/bindings/tests/sync_method_unittest.cc
@@ -9,7 +9,6 @@ #include "base/check.h" #include "base/run_loop.h" #include "base/sequence_token.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/system/data_pipe_producer.cc b/mojo/public/cpp/system/data_pipe_producer.cc index 6ff6d1fe..34608091a 100644 --- a/mojo/public/cpp/system/data_pipe_producer.cc +++ b/mojo/public/cpp/system/data_pipe_producer.cc
@@ -15,7 +15,6 @@ #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/numerics/safe_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/thread_annotations.h"
diff --git a/net/android/network_change_notifier_android.cc b/net/android/network_change_notifier_android.cc index 001f2ae2..d5d84aa 100644 --- a/net/android/network_change_notifier_android.cc +++ b/net/android/network_change_notifier_android.cc
@@ -66,7 +66,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/net/base/backoff_entry_serializer_unittest.cc b/net/base/backoff_entry_serializer_unittest.cc index 3ffe92b71..856c640 100644 --- a/net/base/backoff_entry_serializer_unittest.cc +++ b/net/base/backoff_entry_serializer_unittest.cc
@@ -9,6 +9,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "net/base/backoff_entry_serializer.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/base/backoff_entry_unittest.cc b/net/base/backoff_entry_unittest.cc index 89dbbf82..4cebdec 100644 --- a/net/base/backoff_entry_unittest.cc +++ b/net/base/backoff_entry_unittest.cc
@@ -5,6 +5,7 @@ #include "net/base/backoff_entry.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace net {
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc index 68363941..3f0dce8 100644 --- a/net/base/directory_lister.cc +++ b/net/base/directory_lister.cc
@@ -14,7 +14,6 @@ #include "base/i18n/file_util_icu.h" #include "base/location.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/net/base/network_activity_monitor_unittest.cc b/net/base/network_activity_monitor_unittest.cc index ae13296..90bd0fb0 100644 --- a/net/base/network_activity_monitor_unittest.cc +++ b/net/base/network_activity_monitor_unittest.cc
@@ -12,6 +12,7 @@ #include "base/bind.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace net {
diff --git a/net/base/network_change_notifier_fuchsia_unittest.cc b/net/base/network_change_notifier_fuchsia_unittest.cc index 893bfa7..bf8e9ac 100644 --- a/net/base/network_change_notifier_fuchsia_unittest.cc +++ b/net/base/network_change_notifier_fuchsia_unittest.cc
@@ -17,6 +17,7 @@ #include "base/test/task_environment.h" #include "base/threading/sequence_bound.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/base/ip_address.h" #include "net/dns/dns_config_service.h" #include "net/dns/system_dns_config_change_notifier.h"
diff --git a/net/base/network_change_notifier_linux.cc b/net/base/network_change_notifier_linux.cc index 7cc609d..096d57e6 100644 --- a/net/base/network_change_notifier_linux.cc +++ b/net/base/network_change_notifier_linux.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/compiler_specific.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/net/base/network_change_notifier_mac.mm b/net/base/network_change_notifier_mac.mm index 949c81a..0acd8008 100644 --- a/net/base/network_change_notifier_mac.mm +++ b/net/base/network_change_notifier_mac.mm
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "build/build_config.h"
diff --git a/net/base/network_change_notifier_posix.cc b/net/base/network_change_notifier_posix.cc index 53bd0f9..7718c570 100644 --- a/net/base/network_change_notifier_posix.cc +++ b/net/base/network_change_notifier_posix.cc
@@ -6,7 +6,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc index 02b8726b..b6eab1f 100644 --- a/net/base/network_change_notifier_win.cc +++ b/net/base/network_change_notifier_win.cc
@@ -13,7 +13,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner_util.h"
diff --git a/net/base/network_config_watcher_mac.h b/net/base/network_config_watcher_mac.h index 8c01b7a..2187d61 100644 --- a/net/base/network_config_watcher_mac.h +++ b/net/base/network_config_watcher_mac.h
@@ -10,6 +10,7 @@ #include <memory> #include "base/mac/scoped_cftyperef.h" +#include "base/time/time.h" namespace base { class Thread;
diff --git a/net/base/network_notification_thread_mac.cc b/net/base/network_notification_thread_mac.cc index 105c3bb3..922f0fd88 100644 --- a/net/base/network_notification_thread_mac.cc +++ b/net/base/network_notification_thread_mac.cc
@@ -7,6 +7,7 @@ #include "base/message_loop/message_pump_type.h" #include "base/no_destructor.h" #include "base/threading/thread.h" +#include "base/time/time.h" namespace net {
diff --git a/net/base/prioritized_task_runner_unittest.cc b/net/base/prioritized_task_runner_unittest.cc index abd30825..6f77f11 100644 --- a/net/base/prioritized_task_runner_unittest.cc +++ b/net/base/prioritized_task_runner_unittest.cc
@@ -18,7 +18,6 @@ #include "base/strings/string_util.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h"
diff --git a/net/cert/caching_cert_verifier.h b/net/cert/caching_cert_verifier.h index 72a46fc6..8fc1afa 100644 --- a/net/cert/caching_cert_verifier.h +++ b/net/cert/caching_cert_verifier.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "net/base/completion_once_callback.h" #include "net/base/expiring_cache.h" #include "net/base/net_export.h"
diff --git a/net/cert/cert_verify_proc_builtin_unittest.cc b/net/cert/cert_verify_proc_builtin_unittest.cc index a170ceb..74d4e600 100644 --- a/net/cert/cert_verify_proc_builtin_unittest.cc +++ b/net/cert/cert_verify_proc_builtin_unittest.cc
@@ -7,9 +7,9 @@ #include "base/numerics/safe_conversions.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "net/base/test_completion_callback.h" #include "net/cert/cert_verify_proc.h" #include "net/cert/crl_set.h"
diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc index c499d76..0247e18 100644 --- a/net/cert/cert_verify_proc_unittest.cc +++ b/net/cert/cert_verify_proc_unittest.cc
@@ -21,6 +21,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "crypto/sha2.h" #include "net/base/net_errors.h"
diff --git a/net/cert/internal/path_builder_pkits_unittest.cc b/net/cert/internal/path_builder_pkits_unittest.cc index 557365f..57680c76 100644 --- a/net/cert/internal/path_builder_pkits_unittest.cc +++ b/net/cert/internal/path_builder_pkits_unittest.cc
@@ -4,6 +4,7 @@ #include "net/cert/internal/path_builder.h" +#include "base/time/time.h" #include "net/base/net_errors.h" #include "net/cert/internal/cert_issuer_source_static.h" #include "net/cert/internal/common_cert_errors.h"
diff --git a/net/cert/internal/path_builder_unittest.cc b/net/cert/internal/path_builder_unittest.cc index 7e772bf..0b5231f8 100644 --- a/net/cert/internal/path_builder_unittest.cc +++ b/net/cert/internal/path_builder_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/cert/internal/cert_error_params.h" #include "net/cert/internal/cert_issuer_source_static.h"
diff --git a/net/cert/multi_threaded_cert_verifier.cc b/net/cert/multi_threaded_cert_verifier.cc index 205ae9da..dfc1da6c 100644 --- a/net/cert/multi_threaded_cert_verifier.cc +++ b/net/cert/multi_threaded_cert_verifier.cc
@@ -9,7 +9,6 @@ #include "base/check_op.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "base/trace_event/trace_event.h"
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc index a95bf84..135e0f1 100644 --- a/net/cert/nss_cert_database.cc +++ b/net/cert/nss_cert_database.cc
@@ -18,7 +18,6 @@ #include "base/callback.h" #include "base/logging.h" #include "base/observer_list_threadsafe.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "build/build_config.h"
diff --git a/net/cert/nss_cert_database_chromeos.cc b/net/cert/nss_cert_database_chromeos.cc index 7a6da26..11a3d93 100644 --- a/net/cert/nss_cert_database_chromeos.cc +++ b/net/cert/nss_cert_database_chromeos.cc
@@ -15,7 +15,6 @@ #include "base/callback.h" #include "base/containers/cxx20_erase.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "net/cert/nss_cert_database.h"
diff --git a/net/cert/trial_comparison_cert_verifier.cc b/net/cert/trial_comparison_cert_verifier.cc index 61f3967e..e148bb5 100644 --- a/net/cert/trial_comparison_cert_verifier.cc +++ b/net/cert/trial_comparison_cert_verifier.cc
@@ -11,7 +11,7 @@ #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "net/base/net_errors.h"
diff --git a/net/cert/x509_certificate_unittest.cc b/net/cert/x509_certificate_unittest.cc index ef2b133..50d55a8 100644 --- a/net/cert/x509_certificate_unittest.cc +++ b/net/cert/x509_certificate_unittest.cc
@@ -15,6 +15,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "crypto/rsa_private_key.h" #include "net/base/net_errors.h" #include "net/cert/asn1_util.h"
diff --git a/net/cert/x509_util_nss_unittest.cc b/net/cert/x509_util_nss_unittest.cc index 6bba21e..89816c24 100644 --- a/net/cert/x509_util_nss_unittest.cc +++ b/net/cert/x509_util_nss_unittest.cc
@@ -6,6 +6,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/time/time.h" #include "net/cert/scoped_nss_types.h" #include "net/cert/x509_certificate.h" #include "net/cert/x509_util.h"
diff --git a/net/cert_net/cert_net_fetcher_url_request.cc b/net/cert_net/cert_net_fetcher_url_request.cc index 3a3007d..8819618 100644 --- a/net/cert_net/cert_net_fetcher_url_request.cc +++ b/net/cert_net/cert_net_fetcher_url_request.cc
@@ -71,6 +71,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "net/base/io_buffer.h" #include "net/base/isolation_info.h"
diff --git a/net/cert_net/cert_net_fetcher_url_request_unittest.cc b/net/cert_net/cert_net_fetcher_url_request_unittest.cc index 3def9a1..34a3acb4 100644 --- a/net/cert_net/cert_net_fetcher_url_request_unittest.cc +++ b/net/cert_net/cert_net_fetcher_url_request_unittest.cc
@@ -13,6 +13,7 @@ #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "net/cert/cert_net_fetcher.h" #include "net/cert/ct_policy_enforcer.h" #include "net/cert/mock_cert_verifier.h"
diff --git a/net/cookies/canonical_cookie_unittest.cc b/net/cookies/canonical_cookie_unittest.cc index 144b7e1..4cce9f0 100644 --- a/net/cookies/canonical_cookie_unittest.cc +++ b/net/cookies/canonical_cookie_unittest.cc
@@ -10,6 +10,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/features.h" #include "net/cookies/canonical_cookie_test_helpers.h"
diff --git a/net/cookies/cookie_store_test_callbacks.h b/net/cookies/cookie_store_test_callbacks.h index e1dcf6b1..7830168 100644 --- a/net/cookies/cookie_store_test_callbacks.h +++ b/net/cookies/cookie_store_test_callbacks.h
@@ -12,6 +12,7 @@ #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_constants.h" #include "net/cookies/cookie_store.h"
diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h index bf3d9d6..d71e3721b 100644 --- a/net/cookies/cookie_store_unittest.h +++ b/net/cookies/cookie_store_unittest.h
@@ -20,6 +20,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_store.h"
diff --git a/net/disk_cache/backend_cleanup_tracker.cc b/net/disk_cache/backend_cleanup_tracker.cc index 0422e2e..f01ecec 100644 --- a/net/disk_cache/backend_cleanup_tracker.cc +++ b/net/disk_cache/backend_cleanup_tracker.cc
@@ -15,7 +15,6 @@ #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc index fdd4b0f..540f2cf 100644 --- a/net/disk_cache/backend_unittest.cc +++ b/net/disk_cache/backend_unittest.cc
@@ -19,7 +19,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/metrics/histogram_tester.h" @@ -29,6 +28,7 @@ #include "base/threading/platform_thread.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/memory_allocator_dump.h" #include "base/trace_event/process_memory_dump.h" #include "base/trace_event/traced_value.h" @@ -542,6 +542,21 @@ ASSERT_EQ(net::OK, CreateEntry(buffer2, &entry2)) << "key on external file"; entry2->Close(); entry1->Close(); + + // Create entries with null terminator(s), and check equality. Note we create + // the strings via the ctor instead of using literals because literals are + // implicitly C strings which will stop at the first null terminator. + std::string key1(4, '\0'); + key1[1] = 's'; + std::string key2(3, '\0'); + key2[1] = 's'; + ASSERT_THAT(CreateEntry(key1, &entry1), IsOk()); + ASSERT_THAT(CreateEntry(key2, &entry2), IsOk()); + EXPECT_TRUE(entry1 != entry2) << "Different lengths"; + EXPECT_EQ(entry1->GetKey(), key1); + EXPECT_EQ(entry2->GetKey(), key2); + entry1->Close(); + entry2->Close(); } TEST_F(DiskCacheBackendTest, Keying) {
diff --git a/net/disk_cache/blockfile/entry_impl.cc b/net/disk_cache/blockfile/entry_impl.cc index 4e20128..c56f324 100644 --- a/net/disk_cache/blockfile/entry_impl.cc +++ b/net/disk_cache/blockfile/entry_impl.cc
@@ -10,6 +10,7 @@ #include "base/hash/hash.h" #include "base/numerics/safe_math.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/disk_cache/blockfile/backend_impl.h"
diff --git a/net/disk_cache/blockfile/file_ios.cc b/net/disk_cache/blockfile/file_ios.cc index 62dcd0a..c325d17a 100644 --- a/net/disk_cache/blockfile/file_ios.cc +++ b/net/disk_cache/blockfile/file_ios.cc
@@ -13,7 +13,6 @@ #include "base/bind.h" #include "base/check.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "net/base/net_errors.h" #include "net/disk_cache/blockfile/in_flight_io.h"
diff --git a/net/disk_cache/blockfile/file_posix.cc b/net/disk_cache/blockfile/file_posix.cc index bfb5048..1d1de955 100644 --- a/net/disk_cache/blockfile/file_posix.cc +++ b/net/disk_cache/blockfile/file_posix.cc
@@ -12,7 +12,6 @@ #include "base/check.h" #include "base/location.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "net/base/net_errors.h"
diff --git a/net/disk_cache/blockfile/rankings.cc b/net/disk_cache/blockfile/rankings.cc index c316c2e..e2bc135 100644 --- a/net/disk_cache/blockfile/rankings.cc +++ b/net/disk_cache/blockfile/rankings.cc
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/process/process.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/net_export.h" #include "net/disk_cache/blockfile/backend_impl.h"
diff --git a/net/disk_cache/cache_util.cc b/net/disk_cache/cache_util.cc index 81cdd49..ce585406 100644 --- a/net/disk_cache/cache_util.cc +++ b/net/disk_cache/cache_util.cc
@@ -16,7 +16,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h"
diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc index 398b98c..5bdc1398 100644 --- a/net/disk_cache/disk_cache_perftest.cc +++ b/net/disk_cache/disk_cache_perftest.cc
@@ -21,6 +21,7 @@ #include "base/test/test_file_util.h" #include "base/test/test_timeouts.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "build/build_config.h" #include "net/base/cache_type.h"
diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc index 04d4a4d..e5cce82 100644 --- a/net/disk_cache/entry_unittest.cc +++ b/net/disk_cache/entry_unittest.cc
@@ -16,6 +16,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/completion_once_callback.h" #include "net/base/io_buffer.h"
diff --git a/net/disk_cache/memory/mem_backend_impl.cc b/net/disk_cache/memory/mem_backend_impl.cc index 7c30e70..63d62769 100644 --- a/net/disk_cache/memory/mem_backend_impl.cc +++ b/net/disk_cache/memory/mem_backend_impl.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/time/clock.h" #include "net/base/net_errors.h"
diff --git a/net/disk_cache/simple/simple_backend_impl.cc b/net/disk_cache/simple/simple_backend_impl.cc index 4b9d888..4890d0a 100644 --- a/net/disk_cache/simple/simple_backend_impl.cc +++ b/net/disk_cache/simple/simple_backend_impl.cc
@@ -27,7 +27,6 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/net/disk_cache/simple/simple_entry_impl.h b/net/disk_cache/simple/simple_entry_impl.h index 6a1e1198..8f31995a 100644 --- a/net/disk_cache/simple/simple_entry_impl.h +++ b/net/disk_cache/simple/simple_entry_impl.h
@@ -15,6 +15,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "net/base/cache_type.h" #include "net/base/net_export.h" #include "net/base/request_priority.h"
diff --git a/net/disk_cache/simple/simple_index_file.cc b/net/disk_cache/simple/simple_index_file.cc index eeb59d5..66e40614 100644 --- a/net/disk_cache/simple/simple_index_file.cc +++ b/net/disk_cache/simple/simple_index_file.cc
@@ -16,6 +16,7 @@ #include "base/strings/string_util.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/disk_cache/simple/simple_backend_impl.h" #include "net/disk_cache/simple/simple_entry_format.h"
diff --git a/net/dns/address_sorter_win.cc b/net/dns/address_sorter_win.cc index 56a3b6c..5220047 100644 --- a/net/dns/address_sorter_win.cc +++ b/net/dns/address_sorter_win.cc
@@ -14,7 +14,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/memory/free_deleter.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "net/base/ip_address.h" #include "net/base/ip_endpoint.h"
diff --git a/net/dns/dns_config_service_linux_unittest.cc b/net/dns/dns_config_service_linux_unittest.cc index 0f6096d..6fd1bda 100644 --- a/net/dns/dns_config_service_linux_unittest.cc +++ b/net/dns/dns_config_service_linux_unittest.cc
@@ -18,7 +18,6 @@ #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/sys_byteorder.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h"
diff --git a/net/dns/dns_config_service_posix_unittest.cc b/net/dns/dns_config_service_posix_unittest.cc index 02a314a..b254160c 100644 --- a/net/dns/dns_config_service_posix_unittest.cc +++ b/net/dns/dns_config_service_posix_unittest.cc
@@ -13,7 +13,6 @@ #include "base/files/file_util.h" #include "base/run_loop.h" #include "base/sys_byteorder.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/net/dns/host_cache_unittest.cc b/net/dns/host_cache_unittest.cc index 654dab0..ee8c983 100644 --- a/net/dns/host_cache_unittest.cc +++ b/net/dns/host_cache_unittest.cc
@@ -19,6 +19,7 @@ #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "base/values.h" #include "net/base/connection_endpoint_metadata.h" #include "net/base/network_isolation_key.h"
diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc index c7c077e..a324e5a 100644 --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc
@@ -51,7 +51,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/net/dns/host_resolver_manager_unittest.cc b/net/dns/host_resolver_manager_unittest.cc index 10b8b3f0..4741dbc5 100644 --- a/net/dns/host_resolver_manager_unittest.cc +++ b/net/dns/host_resolver_manager_unittest.cc
@@ -27,7 +27,6 @@ #include "base/strings/stringprintf.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/net/dns/mdns_cache_unittest.cc b/net/dns/mdns_cache_unittest.cc index 2daf8fe..18a89e0 100644 --- a/net/dns/mdns_cache_unittest.cc +++ b/net/dns/mdns_cache_unittest.cc
@@ -8,6 +8,7 @@ #include <utility> #include "base/bind.h" +#include "base/time/time.h" #include "net/dns/dns_response.h" #include "net/dns/dns_test_util.h" #include "net/dns/record_parsed.h"
diff --git a/net/dns/mdns_client_impl.h b/net/dns/mdns_client_impl.h index 7f2867f..2bca834d 100644 --- a/net/dns/mdns_client_impl.h +++ b/net/dns/mdns_client_impl.h
@@ -18,6 +18,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h" +#include "base/time/time.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" #include "net/base/net_export.h"
diff --git a/net/dns/mock_host_resolver.cc b/net/dns/mock_host_resolver.cc index 656f7c4e..75b7e7e 100644 --- a/net/dns/mock_host_resolver.cc +++ b/net/dns/mock_host_resolver.cc
@@ -31,6 +31,7 @@ #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/address_family.h" #include "net/base/address_list.h"
diff --git a/net/dns/public/resolv_reader_unittest.cc b/net/dns/public/resolv_reader_unittest.cc index 40c68bd..b7a3d6ba 100644 --- a/net/dns/public/resolv_reader_unittest.cc +++ b/net/dns/public/resolv_reader_unittest.cc
@@ -16,7 +16,6 @@ #include "base/check.h" #include "base/run_loop.h" #include "base/sys_byteorder.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/net/dns/serial_worker.cc b/net/dns/serial_worker.cc index 635a1a2..5a3444b7f 100644 --- a/net/dns/serial_worker.cc +++ b/net/dns/serial_worker.cc
@@ -12,7 +12,6 @@ #include "base/check_op.h" #include "base/location.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/net/dns/system_dns_config_change_notifier.cc b/net/dns/system_dns_config_change_notifier.cc index 1725cf97..20c460d 100644 --- a/net/dns/system_dns_config_change_notifier.cc +++ b/net/dns/system_dns_config_change_notifier.cc
@@ -14,7 +14,6 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/net/dns/system_dns_config_change_notifier_unittest.cc b/net/dns/system_dns_config_change_notifier_unittest.cc index 613f061..562efea 100644 --- a/net/dns/system_dns_config_change_notifier_unittest.cc +++ b/net/dns/system_dns_config_change_notifier_unittest.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "net/base/ip_address.h"
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc b/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc index 5356710..d2ace12 100644 --- a/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc +++ b/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc
@@ -12,10 +12,10 @@ #include "base/rand_util.h" #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "net/base/test_completion_callback.h" #include "net/cookies/canonical_cookie.h"
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc index f2b4772..5650650 100644 --- a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc +++ b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
@@ -21,7 +21,6 @@ #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc index 28d038c..787b194 100644 --- a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc +++ b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc
@@ -12,7 +12,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" @@ -21,6 +20,7 @@ #include "base/test/simple_test_clock.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "net/base/features.h" #include "net/base/network_isolation_key.h" #include "net/network_error_logging/network_error_logging_service.h"
diff --git a/net/http/broken_alternative_services_unittest.cc b/net/http/broken_alternative_services_unittest.cc index 22791cd..1f331ac 100644 --- a/net/http/broken_alternative_services_unittest.cc +++ b/net/http/broken_alternative_services_unittest.cc
@@ -10,6 +10,7 @@ #include "base/memory/raw_ptr.h" #include "base/test/test_mock_time_task_runner.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "net/base/network_isolation_key.h" #include "net/base/schemeful_site.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/http/http_auth_cache_unittest.cc b/net/http/http_auth_cache_unittest.cc index 600b3d91..c2f2ce7c 100644 --- a/net/http/http_auth_cache_unittest.cc +++ b/net/http/http_auth_cache_unittest.cc
@@ -9,6 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/simple_test_clock.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "net/base/net_errors.h" #include "net/base/network_isolation_key.h" #include "net/base/schemeful_site.h"
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc index a9e9f92d..acca8154 100644 --- a/net/http/http_cache_unittest.cc +++ b/net/http/http_cache_unittest.cc
@@ -27,6 +27,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" +#include "base/time/time.h" #include "base/trace_event/memory_allocator_dump.h" #include "base/trace_event/memory_dump_request_args.h" #include "base/trace_event/process_memory_dump.h"
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index e33d1422..3cade496 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc
@@ -36,6 +36,7 @@ #include "base/test/task_environment.h" #include "base/test/test_file_util.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/auth.h" #include "net/base/chunked_upload_data_stream.h"
diff --git a/net/http/http_proxy_connect_job_unittest.cc b/net/http/http_proxy_connect_job_unittest.cc index 3304ebde..e35978e 100644 --- a/net/http/http_proxy_connect_job_unittest.cc +++ b/net/http/http_proxy_connect_job_unittest.cc
@@ -18,6 +18,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/host_port_pair.h" #include "net/base/network_isolation_key.h"
diff --git a/net/http/http_security_headers_unittest.cc b/net/http/http_security_headers_unittest.cc index e31a116..4d4369c 100644 --- a/net/http/http_security_headers_unittest.cc +++ b/net/http/http_security_headers_unittest.cc
@@ -23,6 +23,7 @@ namespace { namespace test_default { +#include "base/time/time.h" #include "net/http/transport_security_state_static_unittest_default.h" }
diff --git a/net/http/http_server_properties_manager.cc b/net/http/http_server_properties_manager.cc index 3efbe4d..3e48678 100644 --- a/net/http/http_server_properties_manager.cc +++ b/net/http/http_server_properties_manager.cc
@@ -12,6 +12,7 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "net/base/features.h" #include "net/base/host_port_pair.h"
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc index 1daa508..598d9c9 100644 --- a/net/http/http_server_properties_manager_unittest.cc +++ b/net/http/http_server_properties_manager_unittest.cc
@@ -21,6 +21,7 @@ #include "base/test/scoped_feature_list.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "base/values.h" #include "net/base/features.h" #include "net/base/ip_address.h"
diff --git a/net/http/http_server_properties_unittest.cc b/net/http/http_server_properties_unittest.cc index e3c4b98..d933e6c 100644 --- a/net/http/http_server_properties_unittest.cc +++ b/net/http/http_server_properties_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "base/values.h" #include "net/base/features.h" #include "net/base/host_port_pair.h"
diff --git a/net/http/http_stream_factory_job_controller.h b/net/http/http_stream_factory_job_controller.h index 030b468..5b5cb2a 100644 --- a/net/http/http_stream_factory_job_controller.h +++ b/net/http/http_stream_factory_job_controller.h
@@ -10,6 +10,7 @@ #include "base/cancelable_callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "net/base/host_port_pair.h" #include "net/base/privacy_mode.h" #include "net/http/http_stream_factory_job.h"
diff --git a/net/http/http_stream_parser.h b/net/http/http_stream_parser.h index 0c0619b..16b5c49 100644 --- a/net/http/http_stream_parser.h +++ b/net/http/http_stream_parser.h
@@ -15,6 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece.h" +#include "base/time/time.h" #include "crypto/ec_private_key.h" #include "net/base/completion_once_callback.h" #include "net/base/completion_repeating_callback.h"
diff --git a/net/http/http_transaction_test_util.h b/net/http/http_transaction_test_util.h index c68a375b..6b317c0 100644 --- a/net/http/http_transaction_test_util.h +++ b/net/http/http_transaction_test_util.h
@@ -18,6 +18,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "net/base/completion_once_callback.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h"
diff --git a/net/http/http_util_unittest.cc b/net/http/http_util_unittest.cc index 396350d..5072a7c 100644 --- a/net/http/http_util_unittest.cc +++ b/net/http/http_util_unittest.cc
@@ -8,6 +8,7 @@ #include <limits> #include "base/strings/string_util.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace net {
diff --git a/net/http/transport_security_state_unittest.cc b/net/http/transport_security_state_unittest.cc index 94f03c80..ba3b4e3 100644 --- a/net/http/transport_security_state_unittest.cc +++ b/net/http/transport_security_state_unittest.cc
@@ -26,6 +26,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_entropy_provider.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "crypto/openssl_util.h"
diff --git a/net/log/file_net_log_observer.cc b/net/log/file_net_log_observer.cc index 5475c47f..c8e8da5 100644 --- a/net/log/file_net_log_observer.cc +++ b/net/log/file_net_log_observer.cc
@@ -19,7 +19,6 @@ #include "base/numerics/clamped_math.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/net/nqe/network_quality_estimator_params.h b/net/nqe/network_quality_estimator_params.h index 4b0de85b..6872f51 100644 --- a/net/nqe/network_quality_estimator_params.h +++ b/net/nqe/network_quality_estimator_params.h
@@ -9,6 +9,7 @@ #include <string> #include "base/sequence_checker.h" +#include "base/time/time.h" #include "net/base/net_export.h" #include "net/base/network_change_notifier.h" #include "net/nqe/effective_connection_type.h"
diff --git a/net/nqe/throughput_analyzer_unittest.cc b/net/nqe/throughput_analyzer_unittest.cc index f4b057c..b24ca93 100644 --- a/net/nqe/throughput_analyzer_unittest.cc +++ b/net/nqe/throughput_analyzer_unittest.cc
@@ -26,6 +26,7 @@ #include "base/threading/platform_thread.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/features.h" #include "net/base/isolation_info.h"
diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc index 753baa9..2c02537 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc
@@ -20,6 +20,7 @@ #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc index 46b1224..fe1e4d7 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
@@ -19,6 +19,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h" +#include "base/time/time.h" #include "net/base/mock_network_change_notifier.h" #include "net/base/net_errors.h" #include "net/base/network_change_notifier.h"
diff --git a/net/proxy_resolution/multi_threaded_proxy_resolver.cc b/net/proxy_resolution/multi_threaded_proxy_resolver.cc index f7dd6639..a3f11a24 100644 --- a/net/proxy_resolution/multi_threaded_proxy_resolver.cc +++ b/net/proxy_resolution/multi_threaded_proxy_resolver.cc
@@ -20,6 +20,7 @@ #include "base/threading/thread_checker.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "net/base/net_errors.h" #include "net/base/network_isolation_key.h" #include "net/log/net_log.h"
diff --git a/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc b/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc index c57f69e..c792a46 100644 --- a/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc +++ b/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc
@@ -18,6 +18,7 @@ #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_checker_impl.h" +#include "base/time/time.h" #include "net/base/net_errors.h" #include "net/base/network_isolation_key.h" #include "net/base/schemeful_site.h"
diff --git a/net/proxy_resolution/polling_proxy_config_service.cc b/net/proxy_resolution/polling_proxy_config_service.cc index 65f7c501..01d66b4 100644 --- a/net/proxy_resolution/polling_proxy_config_service.cc +++ b/net/proxy_resolution/polling_proxy_config_service.cc
@@ -10,7 +10,6 @@ #include "base/location.h" #include "base/observer_list.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/net/proxy_resolution/proxy_config_service_linux.cc b/net/proxy_resolution/proxy_config_service_linux.cc index 4406f2b0..16f3ca6 100644 --- a/net/proxy_resolution/proxy_config_service_linux.cc +++ b/net/proxy_resolution/proxy_config_service_linux.cc
@@ -25,7 +25,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h"
diff --git a/net/proxy_resolution/proxy_config_service_linux_unittest.cc b/net/proxy_resolution/proxy_config_service_linux_unittest.cc index 6ab7a1c..386028ed 100644 --- a/net/proxy_resolution/proxy_config_service_linux_unittest.cc +++ b/net/proxy_resolution/proxy_config_service_linux_unittest.cc
@@ -25,6 +25,7 @@ #include "base/task/thread_pool/thread_pool_instance.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_common_unittest.h" #include "net/test/test_with_task_environment.h"
diff --git a/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win_unittest.cc b/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win_unittest.cc index a97cbc3..afd1d6a6 100644 --- a/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win_unittest.cc +++ b/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win_unittest.cc
@@ -10,11 +10,11 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "base/timer/timer.h" #include "net/base/net_errors.h"
diff --git a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc index 49f2eba..af1d3ad5 100644 --- a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc +++ b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc
@@ -12,7 +12,6 @@ #include "base/containers/queue.h" #include "base/memory/free_deleter.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc index 1c54678..9657fe1 100644 --- a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc +++ b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "base/timer/timer.h" #include "net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.h"
diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_verifier_chromium.cc index d8ac4fb..1169b22 100644 --- a/net/quic/crypto/proof_verifier_chromium.cc +++ b/net/quic/crypto/proof_verifier_chromium.cc
@@ -14,6 +14,7 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "crypto/signature_verifier.h" #include "net/base/host_port_pair.h" #include "net/base/net_errors.h"
diff --git a/net/quic/quic_chromium_client_session.cc b/net/quic/quic_chromium_client_session.cc index 8d8eac09..7d6317da 100644 --- a/net/quic/quic_chromium_client_session.cc +++ b/net/quic/quic_chromium_client_session.cc
@@ -20,7 +20,6 @@ #include "base/observer_list.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/tick_clock.h"
diff --git a/net/quic/quic_clock_skew_detector_test.cc b/net/quic/quic_clock_skew_detector_test.cc index cb3fa82f..2bd15b2 100644 --- a/net/quic/quic_clock_skew_detector_test.cc +++ b/net/quic/quic_clock_skew_detector_test.cc
@@ -4,6 +4,7 @@ #include "net/quic/quic_clock_skew_detector.h" +#include "base/time/time.h" #include "net/third_party/quiche/src/quic/test_tools/mock_clock.h" #include "net/third_party/quiche/src/quic/test_tools/mock_random.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/quic/quic_http_stream.h b/net/quic/quic_http_stream.h index e265ce1..395f90a9 100644 --- a/net/quic/quic_http_stream.h +++ b/net/quic/quic_http_stream.h
@@ -14,6 +14,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece.h" +#include "base/time/time.h" #include "net/base/completion_once_callback.h" #include "net/base/idempotency.h" #include "net/base/io_buffer.h"
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc index 35337f1..0a1fca8 100644 --- a/net/quic/quic_stream_factory_test.cc +++ b/net/quic/quic_stream_factory_test.cc
@@ -20,6 +20,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_mock_time_task_runner.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/features.h" #include "net/base/load_flags.h"
diff --git a/net/quic/test_task_runner.cc b/net/quic/test_task_runner.cc index 5b2cc23..fe30042 100644 --- a/net/quic/test_task_runner.cc +++ b/net/quic/test_task_runner.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <utility> +#include "base/time/time.h" #include "net/third_party/quiche/src/quic/test_tools/mock_clock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc index 83d4df8..71da86b 100644 --- a/net/socket/client_socket_pool_base_unittest.cc +++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -23,6 +23,7 @@ #include "base/test/scoped_feature_list.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/values.h" #include "net/base/features.h" #include "net/base/host_port_pair.h"
diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h index 60a3464..44f99c0 100644 --- a/net/socket/ssl_client_socket_impl.h +++ b/net/socket/ssl_client_socket_impl.h
@@ -17,6 +17,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "net/base/completion_once_callback.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h"
diff --git a/net/socket/tcp_client_socket.h b/net/socket/tcp_client_socket.h index 312cb68..2fb220d 100644 --- a/net/socket/tcp_client_socket.h +++ b/net/socket/tcp_client_socket.h
@@ -13,6 +13,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/power_monitor/power_observer.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "build/build_config.h" #include "net/base/address_list.h"
diff --git a/net/socket/tcp_socket_posix.cc b/net/socket/tcp_socket_posix.cc index d270935..0280c9e1 100644 --- a/net/socket/tcp_socket_posix.cc +++ b/net/socket/tcp_socket_posix.cc
@@ -21,7 +21,6 @@ #include "base/posix/eintr_wrapper.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "base/trace_event/typed_macros.h" #include "build/build_config.h"
diff --git a/net/socket/udp_socket_posix.cc b/net/socket/udp_socket_posix.cc index d2e8e68..63ae427 100644 --- a/net/socket/udp_socket_posix.cc +++ b/net/socket/udp_socket_posix.cc
@@ -34,7 +34,6 @@ #include "base/posix/eintr_wrapper.h" #include "base/rand_util.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/trace_event/typed_macros.h"
diff --git a/net/socket/udp_socket_unittest.cc b/net/socket/udp_socket_unittest.cc index cd01b4e..00fd243 100644 --- a/net/socket/udp_socket_unittest.cc +++ b/net/socket/udp_socket_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/scoped_feature_list.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "net/base/features.h"
diff --git a/net/socket/udp_socket_win.cc b/net/socket/udp_socket_win.cc index 85f1e4e5..53364dd 100644 --- a/net/socket/udp_socket_win.cc +++ b/net/socket/udp_socket_win.cc
@@ -18,7 +18,6 @@ #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/rand_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "net/base/io_buffer.h" #include "net/base/ip_address.h"
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc index 524cb90c1..1472928d 100644 --- a/net/spdy/spdy_session_unittest.cc +++ b/net/spdy/spdy_session_unittest.cc
@@ -19,6 +19,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/features.h" #include "net/base/hex_utils.h"
diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h index 8adc679..ce641d3c 100644 --- a/net/spdy/spdy_stream.h +++ b/net/spdy/spdy_stream.h
@@ -15,6 +15,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "net/base/io_buffer.h" #include "net/base/net_export.h" #include "net/base/request_priority.h"
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc index 7f8280b..185b51c 100644 --- a/net/spdy/spdy_stream_unittest.cc +++ b/net/spdy/spdy_stream_unittest.cc
@@ -18,6 +18,7 @@ #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/string_piece.h" +#include "base/time/time.h" #include "net/base/request_priority.h" #include "net/dns/public/secure_dns_policy.h" #include "net/http/http_request_info.h"
diff --git a/net/ssl/client_cert_identity.h b/net/ssl/client_cert_identity.h index d7351943..e400b2c 100644 --- a/net/ssl/client_cert_identity.h +++ b/net/ssl/client_cert_identity.h
@@ -6,6 +6,7 @@ #define NET_SSL_CLIENT_CERT_IDENTITY_H_ #include "base/callback.h" +#include "base/time/time.h" #include "net/base/net_export.h" #include "net/cert/x509_certificate.h"
diff --git a/net/ssl/client_cert_store_nss.cc b/net/ssl/client_cert_store_nss.cc index 0999bd82..40d86c5a 100644 --- a/net/ssl/client_cert_store_nss.cc +++ b/net/ssl/client_cert_store_nss.cc
@@ -17,7 +17,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "crypto/nss_crypto_module_delegate.h"
diff --git a/net/ssl/ssl_key_logger_impl.cc b/net/ssl/ssl_key_logger_impl.cc index 1a8a331a..9d6dfaef 100644 --- a/net/ssl/ssl_key_logger_impl.cc +++ b/net/ssl/ssl_key_logger_impl.cc
@@ -17,7 +17,6 @@ #include "base/memory/ref_counted.h" #include "base/sequence_checker.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/net/ssl/ssl_platform_key_util.cc b/net/ssl/ssl_platform_key_util.cc index 38a8741..f78a378 100644 --- a/net/ssl/ssl_platform_key_util.cc +++ b/net/ssl/ssl_platform_key_util.cc
@@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/strings/string_piece.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "crypto/openssl_util.h" #include "net/cert/asn1_util.h" #include "net/cert/x509_certificate.h"
diff --git a/net/test/embedded_test_server/embedded_test_server.h b/net/test/embedded_test_server/embedded_test_server.h index 7c5fa125..68d86548 100644 --- a/net/test/embedded_test_server/embedded_test_server.h +++ b/net/test/embedded_test_server/embedded_test_server.h
@@ -20,6 +20,7 @@ #include "base/strings/string_piece.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "net/base/address_list.h" #include "net/base/host_port_pair.h" #include "net/base/ip_endpoint.h"
diff --git a/net/test/quic_simple_test_server.cc b/net/test/quic_simple_test_server.cc index 5c855e3..35741e2 100644 --- a/net/test/quic_simple_test_server.cc +++ b/net/test/quic_simple_test_server.cc
@@ -16,6 +16,7 @@ #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/base/ip_address.h" #include "net/base/ip_endpoint.h" #include "net/quic/crypto/proof_source_chromium.h"
diff --git a/net/test/spawned_test_server/remote_test_server.h b/net/test/spawned_test_server/remote_test_server.h index ab5c1c5..d835eeda 100644 --- a/net/test/spawned_test_server/remote_test_server.h +++ b/net/test/spawned_test_server/remote_test_server.h
@@ -8,6 +8,7 @@ #include <string> #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/test/spawned_test_server/base_test_server.h" namespace net {
diff --git a/net/test/url_request/url_request_mock_http_job.cc b/net/test/url_request/url_request_mock_http_job.cc index 5567e07..5fff646f 100644 --- a/net/test/url_request/url_request_mock_http_job.cc +++ b/net/test/url_request/url_request_mock_http_job.cc
@@ -9,7 +9,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "net/base/filename_util.h"
diff --git a/net/tools/cert_verify_tool/verify_using_path_builder.cc b/net/tools/cert_verify_tool/verify_using_path_builder.cc index 7765db5..70bb878 100644 --- a/net/tools/cert_verify_tool/verify_using_path_builder.cc +++ b/net/tools/cert_verify_tool/verify_using_path_builder.cc
@@ -9,6 +9,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" +#include "base/time/time.h" #include "crypto/sha2.h" #include "net/cert/cert_net_fetcher.h" #include "net/cert/internal/cert_issuer_source_aia.h"
diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc index 1fbcbbc..6aa41ae 100644 --- a/net/tools/crash_cache/crash_cache.cc +++ b/net/tools/crash_cache/crash_cache.cc
@@ -22,6 +22,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_executor.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/base/net_errors.h" #include "net/base/net_export.h" #include "net/base/test_completion_callback.h"
diff --git a/net/tools/dump_cache/dump_files.cc b/net/tools/dump_cache/dump_files.cc index 771ede45..009b0e8 100644 --- a/net/tools/dump_cache/dump_files.cc +++ b/net/tools/dump_cache/dump_files.cc
@@ -23,6 +23,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_executor.h" +#include "base/time/time.h" #include "net/disk_cache/blockfile/block_files.h" #include "net/disk_cache/blockfile/disk_format.h" #include "net/disk_cache/blockfile/mapped_file.h"
diff --git a/net/tools/quic/quic_http_proxy_backend.h b/net/tools/quic/quic_http_proxy_backend.h index 7e730e4..5a30e8be 100644 --- a/net/tools/quic/quic_http_proxy_backend.h +++ b/net/tools/quic/quic_http_proxy_backend.h
@@ -29,6 +29,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "net/third_party/quiche/src/quic/tools/quic_simple_server_backend.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_builder.h"
diff --git a/net/tools/stress_cache/stress_cache.cc b/net/tools/stress_cache/stress_cache.cc index 9062602..c6eb68a 100644 --- a/net/tools/stress_cache/stress_cache.cc +++ b/net/tools/stress_cache/stress_cache.cc
@@ -38,6 +38,7 @@ #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h"
diff --git a/net/url_request/url_fetcher_core.h b/net/url_request/url_fetcher_core.h index 33c634a..656537e 100644 --- a/net/url_request/url_fetcher_core.h +++ b/net/url_request/url_fetcher_core.h
@@ -17,6 +17,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "net/base/chunked_upload_data_stream.h" #include "net/base/ip_endpoint.h"
diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc index 9e4dbb08..e9c1cba 100644 --- a/net/url_request/url_fetcher_impl_unittest.cc +++ b/net/url_request/url_fetcher_impl_unittest.cc
@@ -25,7 +25,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/test_timeouts.h" @@ -33,6 +32,7 @@ #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/elements_upload_data_stream.h" #include "net/base/network_change_notifier.h"
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc index 7c24d9a..c816f5cf 100644 --- a/net/url_request/url_request_context_builder.cc +++ b/net/url_request/url_request_context_builder.cc
@@ -13,7 +13,6 @@ #include "base/compiler_specific.h" #include "base/notreached.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/net/url_request/url_request_context_builder_unittest.cc b/net/url_request/url_request_context_builder_unittest.cc index 7e417e4..950c1979 100644 --- a/net/url_request/url_request_context_builder_unittest.cc +++ b/net/url_request/url_request_context_builder_unittest.cc
@@ -39,7 +39,6 @@ #if BUILDFLAG(ENABLE_REPORTING) #include "base/files/scoped_temp_dir.h" -#include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" #include "net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.h" #include "net/reporting/reporting_context.h"
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc index 10700cf2..d4105a4c 100644 --- a/net/url_request/url_request_test_job.cc +++ b/net/url_request/url_request_test_job.cc
@@ -16,6 +16,7 @@ #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h"
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index f256da8..cddbfda9 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc
@@ -15,6 +15,7 @@ // This must be before Windows headers #include "base/callback_helpers.h" #include "base/memory/ptr_util.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/dns/public/secure_dns_policy.h" #include "net/log/net_log.h"
diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc index c8a1a9e..f797576 100644 --- a/net/websockets/websocket_channel_test.cc +++ b/net/websockets/websocket_channel_test.cc
@@ -26,6 +26,7 @@ #include "base/strings/string_piece.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "net/base/completion_once_callback.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h"
diff --git a/ppapi/proxy/plugin_globals.cc b/ppapi/proxy/plugin_globals.cc index 6cba804..32d584c 100644 --- a/ppapi/proxy/plugin_globals.cc +++ b/ppapi/proxy/plugin_globals.cc
@@ -11,6 +11,7 @@ #include "base/task/task_runner.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "ipc/ipc_message.h" #include "ipc/ipc_sender.h" #include "ppapi/proxy/plugin_dispatcher.h"
diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h index 6631e8f6..25b5633 100644 --- a/ppapi/proxy/plugin_globals.h +++ b/ppapi/proxy/plugin_globals.h
@@ -11,6 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_local_storage.h" +#include "base/time/time.h" #include "ppapi/proxy/connection.h" #include "ppapi/proxy/plugin_resource_tracker.h" #include "ppapi/proxy/plugin_var_tracker.h"
diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h index 47c8c22..87afca3 100644 --- a/ppapi/proxy/ppapi_proxy_test.h +++ b/ppapi/proxy/ppapi_proxy_test.h
@@ -17,6 +17,7 @@ #include "base/test/task_environment.h" #include "base/threading/simple_thread.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/plugin_dispatcher.h"
diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc index 8f656e3..30e64f6 100644 --- a/ppapi/proxy/ppb_image_data_proxy.cc +++ b/ppapi/proxy/ppb_image_data_proxy.cc
@@ -14,6 +14,7 @@ #include "base/memory/shared_memory_mapping.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h"
diff --git a/ppapi/shared_impl/time_conversion_unittest.cc b/ppapi/shared_impl/time_conversion_unittest.cc index f8ef135..46d9369 100644 --- a/ppapi/shared_impl/time_conversion_unittest.cc +++ b/ppapi/shared_impl/time_conversion_unittest.cc
@@ -5,6 +5,7 @@ #include <math.h> #include <stdlib.h> +#include "base/time/time.h" #include "ppapi/shared_impl/time_conversion.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/printing/printed_document.cc b/printing/printed_document.cc index 14d5691..0580884 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc
@@ -22,7 +22,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/remoting/base/oauth_token_getter_proxy_unittest.cc b/remoting/base/oauth_token_getter_proxy_unittest.cc index 7427ca0..b73170d 100644 --- a/remoting/base/oauth_token_getter_proxy_unittest.cc +++ b/remoting/base/oauth_token_getter_proxy_unittest.cc
@@ -13,6 +13,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_checker.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace remoting {
diff --git a/remoting/base/protobuf_http_stream_request.cc b/remoting/base/protobuf_http_stream_request.cc index eb0f49b..53dc95b8 100644 --- a/remoting/base/protobuf_http_stream_request.cc +++ b/remoting/base/protobuf_http_stream_request.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/time/time.h" #include "remoting/base/protobuf_http_client.h" #include "remoting/base/protobuf_http_request_config.h" #include "remoting/base/protobuf_http_status.h"
diff --git a/remoting/base/queued_task_poster_unittest.cc b/remoting/base/queued_task_poster_unittest.cc index 6f3b5dea..f6e6b84 100644 --- a/remoting/base/queued_task_poster_unittest.cc +++ b/remoting/base/queued_task_poster_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace remoting {
diff --git a/remoting/client/audio/audio_jitter_buffer_unittest.cc b/remoting/client/audio/audio_jitter_buffer_unittest.cc index c44c741..66c460e 100644 --- a/remoting/client/audio/audio_jitter_buffer_unittest.cc +++ b/remoting/client/audio/audio_jitter_buffer_unittest.cc
@@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "remoting/client/audio/audio_jitter_buffer.h" #include "remoting/client/audio/audio_stream_format.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/client/client_context.h b/remoting/client/client_context.h index 2f3cc8e..66e1be1 100644 --- a/remoting/client/client_context.h +++ b/remoting/client/client_context.h
@@ -6,6 +6,7 @@ #define REMOTING_CLIENT_CLIENT_CONTEXT_H_ #include "base/threading/thread.h" +#include "base/time/time.h" namespace base { class SingleThreadTaskRunner;
diff --git a/remoting/client/client_telemetry_logger.h b/remoting/client/client_telemetry_logger.h index 7e9f072..c458c4a3 100644 --- a/remoting/client/client_telemetry_logger.h +++ b/remoting/client/client_telemetry_logger.h
@@ -13,6 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "remoting/base/chromoting_event.h" #include "remoting/base/chromoting_event_log_writer.h" #include "remoting/base/url_request.h"
diff --git a/remoting/client/ui/fling_animation.h b/remoting/client/ui/fling_animation.h index 7692cd87..77458bf 100644 --- a/remoting/client/ui/fling_animation.h +++ b/remoting/client/ui/fling_animation.h
@@ -8,6 +8,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "remoting/client/ui/fling_tracker.h" namespace remoting {
diff --git a/remoting/codec/webrtc_video_encoder_gpu.cc b/remoting/codec/webrtc_video_encoder_gpu.cc index 3e4b35a..26bc01e 100644 --- a/remoting/codec/webrtc_video_encoder_gpu.cc +++ b/remoting/codec/webrtc_video_encoder_gpu.cc
@@ -21,6 +21,7 @@ #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "build/build_config.h" #include "gpu/config/gpu_driver_bug_workarounds.h" #include "gpu/config/gpu_preferences.h"
diff --git a/remoting/host/audio_capturer_win.h b/remoting/host/audio_capturer_win.h index b4365bc..33be818 100644 --- a/remoting/host/audio_capturer_win.h +++ b/remoting/host/audio_capturer_win.h
@@ -12,6 +12,7 @@ #include <memory> #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/win/scoped_co_mem.h" #include "remoting/host/audio_capturer.h"
diff --git a/remoting/host/chromeos/clipboard_aura.h b/remoting/host/chromeos/clipboard_aura.h index e56b9687..3afeca45 100644 --- a/remoting/host/chromeos/clipboard_aura.h +++ b/remoting/host/chromeos/clipboard_aura.h
@@ -10,6 +10,7 @@ #include <memory> #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "remoting/host/clipboard.h" #include "ui/base/clipboard/clipboard.h"
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h index 6987eab3..3debc652 100644 --- a/remoting/host/chromoting_host.h +++ b/remoting/host/chromoting_host.h
@@ -14,6 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "net/base/backoff_entry.h" #include "remoting/host/base/desktop_environment_options.h"
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc index 8eeeea0..d5f1cf7a 100644 --- a/remoting/host/client_session.cc +++ b/remoting/host/client_session.cc
@@ -105,11 +105,11 @@ extension_manager_ = std::make_unique<HostExtensionSessionManager>(extensions, this); -#if BUILDFLAG(IS_WIN) - // LocalInputMonitorWin filters out an echo of the injected input before it - // reaches |remote_input_filter_|. +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) + // LocalMouseInputMonitorWin and LocalPointerInputMonitorChromeos filter out + // an echo of the injected input before it reaches |remote_input_filter_|. remote_input_filter_.SetExpectLocalEcho(false); -#endif // BUILDFLAG(IS_WIN) +#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) } ClientSession::~ClientSession() {
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc index 0330e87..6b148a96 100644 --- a/remoting/host/client_session_unittest.cc +++ b/remoting/host/client_session_unittest.cc
@@ -600,7 +600,7 @@ connection_->input_stub()->InjectMouseEvent(MakeMouseMoveEvent(100, 101)); -#if !BUILDFLAG(IS_WIN) +#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_CHROMEOS) // The OS echoes the injected event back. client_session_->OnLocalPointerMoved(webrtc::DesktopVector(100, 101), ui::ET_MOUSE_MOVED); @@ -617,7 +617,7 @@ connection_->input_stub()->InjectMouseEvent(MakeMouseMoveEvent(300, 301)); // Verify that we've received correct set of mouse events. - EXPECT_EQ(2U, mouse_events.size()); + ASSERT_EQ(2U, mouse_events.size()); EXPECT_THAT(mouse_events[0], EqualsMouseMoveEvent(100, 101)); EXPECT_THAT(mouse_events[1], EqualsMouseMoveEvent(200, 201));
diff --git a/remoting/host/file_transfer/local_file_operations.cc b/remoting/host/file_transfer/local_file_operations.cc index 51bb90e4..dff9c462 100644 --- a/remoting/host/file_transfer/local_file_operations.cc +++ b/remoting/host/file_transfer/local_file_operations.cc
@@ -13,7 +13,6 @@ #include "base/memory/ptr_util.h" #include "base/path_service.h" #include "base/sequence_checker.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/remoting/host/host_power_save_blocker_unittest.cc b/remoting/host/host_power_save_blocker_unittest.cc index 09065b7..4066cd2 100644 --- a/remoting/host/host_power_save_blocker_unittest.cc +++ b/remoting/host/host_power_save_blocker_unittest.cc
@@ -9,6 +9,7 @@ #include "base/message_loop/message_pump_type.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "remoting/host/host_status_monitor.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/host/input_injector_chromeos.cc b/remoting/host/input_injector_chromeos.cc index a3e0895..e30fff3 100644 --- a/remoting/host/input_injector_chromeos.cc +++ b/remoting/host/input_injector_chromeos.cc
@@ -93,6 +93,7 @@ ~SystemInputInjectorStub() override = default; // SystemInputInjector implementation: + void SetDeviceId(int device_id) override {} void MoveCursorTo(const gfx::PointF& location) override {} void InjectMouseButton(ui::EventFlags button, bool down) override {} void InjectMouseWheel(int delta_x, int delta_y) override {} @@ -232,6 +233,8 @@ } DCHECK(delegate_); + delegate_->SetDeviceId(ui::ED_REMOTE_INPUT_DEVICE); + // Implemented by remoting::ClipboardAura. clipboard_ = Clipboard::Create(); clipboard_->Start(std::move(client_clipboard));
diff --git a/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.cc b/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.cc index 6ba4464..75a06bc 100644 --- a/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.cc +++ b/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.cc
@@ -22,6 +22,10 @@ namespace { +bool IsInjectedByCrd(const ui::PlatformEvent& event) { + return event->source_device_id() == ui::ED_REMOTE_INPUT_DEVICE; +} + class LocalKeyboardInputMonitorChromeos : public LocalKeyboardInputMonitor { public: LocalKeyboardInputMonitorChromeos( @@ -105,6 +109,11 @@ void LocalKeyboardInputMonitorChromeos::Core::DidProcessEvent( const ui::PlatformEvent& event) { + // Do not pass on events remotely injected by CRD, as we're supposed to + // monitor for local input only. + if (IsInjectedByCrd(event)) + return; + ui::EventType type = ui::EventTypeFromNative(event); if (type == ui::ET_KEY_PRESSED) { ui::DomCode dom_code = ui::CodeFromNative(event);
diff --git a/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc b/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc index bafae604..6f97f52 100644 --- a/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc +++ b/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc
@@ -14,6 +14,7 @@ #include "remoting/host/chromeos/point_transformer.h" #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" #include "ui/events/event.h" +#include "ui/events/event_constants.h" #include "ui/events/event_utils.h" #include "ui/events/platform/platform_event_observer.h" #include "ui/events/platform/platform_event_source.h" @@ -22,6 +23,10 @@ namespace { +bool IsInjectedByCrd(const ui::PlatformEvent& event) { + return event->source_device_id() == ui::ED_REMOTE_INPUT_DEVICE; +} + class LocalPointerInputMonitorChromeos : public LocalPointerInputMonitor { public: LocalPointerInputMonitorChromeos( @@ -113,6 +118,11 @@ void LocalPointerInputMonitorChromeos::Core::DidProcessEvent( const ui::PlatformEvent& event) { + // Do not pass on events remotely injected by CRD, as we're supposed to + // monitor for local input only. + if (IsInjectedByCrd(event)) + return; + ui::EventType type = ui::EventTypeFromNative(event); if (type == ui::ET_MOUSE_MOVED || type == ui::ET_TOUCH_MOVED) { HandlePointerMove(event, type);
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc index 5e2904e9..cd21ab9 100644 --- a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc +++ b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc
@@ -13,6 +13,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host.h b/remoting/host/it2me/it2me_native_messaging_host.h index e4dc459b..75390d1b 100644 --- a/remoting/host/it2me/it2me_native_messaging_host.h +++ b/remoting/host/it2me/it2me_native_messaging_host.h
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "extensions/browser/api/messaging/native_message_host.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host_chromeos.cc b/remoting/host/it2me/it2me_native_messaging_host_chromeos.cc index 261c3c5..eb240328 100644 --- a/remoting/host/it2me/it2me_native_messaging_host_chromeos.cc +++ b/remoting/host/it2me/it2me_native_messaging_host_chromeos.cc
@@ -7,7 +7,6 @@ #include <memory> #include "base/lazy_instance.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "remoting/base/auto_thread_task_runner.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc index 02f2b71..c672e74 100644 --- a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc +++ b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc
@@ -21,6 +21,7 @@ #include "base/strings/stringize_macros.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/values.h" #include "build/chromeos_buildflags.h" #include "components/policy/core/common/fake_async_policy_loader.h"
diff --git a/remoting/host/keyboard_layout_monitor_win.cc b/remoting/host/keyboard_layout_monitor_win.cc index 11dbadb..0c2b632 100644 --- a/remoting/host/keyboard_layout_monitor_win.cc +++ b/remoting/host/keyboard_layout_monitor_win.cc
@@ -17,7 +17,6 @@ #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_local.h"
diff --git a/remoting/host/linux/certificate_watcher.h b/remoting/host/linux/certificate_watcher.h index bbafa8c2..70df3e7 100644 --- a/remoting/host/linux/certificate_watcher.h +++ b/remoting/host/linux/certificate_watcher.h
@@ -11,6 +11,7 @@ #include "base/files/file_path_watcher.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "remoting/host/host_status_monitor.h" #include "remoting/host/host_status_observer.h"
diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux_me2me_host.py index d5d3125..f30426c 100755 --- a/remoting/host/linux/linux_me2me_host.py +++ b/remoting/host/linux/linux_me2me_host.py
@@ -1108,14 +1108,18 @@ self.server_supports_randr = True self.xorg_conf = config_file.name - logging.info("Starting Xorg on display :%d" % display) + xorg_binary = "/usr/lib/xorg/Xorg"; + if not os.access(xorg_binary, os.X_OK): + xorg_binary = "Xorg"; + + logging.info("Starting %s on display :%d" % (xorg_binary, display)) # We use the child environment so the Xorg server picks up the Mesa libGL # instead of any proprietary versions that may be installed, thanks to # LD_LIBRARY_PATH. # Note: This prevents any environment variable the user has set from # affecting the Xorg server. self.server_proc = subprocess.Popen( - ["Xorg", ":%d" % display, + [xorg_binary, ":%d" % display, "-auth", x_auth_file, "-nolisten", "tcp", "-noreset",
diff --git a/remoting/host/linux/x11_character_injector.cc b/remoting/host/linux/x11_character_injector.cc index fffe550..31a4fe44 100644 --- a/remoting/host/linux/x11_character_injector.cc +++ b/remoting/host/linux/x11_character_injector.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include "base/bind.h" +#include "base/time/time.h" #include "remoting/host/linux/x11_keyboard.h" namespace {
diff --git a/remoting/host/linux/x11_character_injector_unittest.cc b/remoting/host/linux/x11_character_injector_unittest.cc index 84cffc6..7da7048 100644 --- a/remoting/host/linux/x11_character_injector_unittest.cc +++ b/remoting/host/linux/x11_character_injector_unittest.cc
@@ -10,6 +10,7 @@ #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "remoting/host/linux/x11_keyboard.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/host/mac/permission_wizard.mm b/remoting/host/mac/permission_wizard.mm index 5a9a0d2..1704d7c 100644 --- a/remoting/host/mac/permission_wizard.mm +++ b/remoting/host/mac/permission_wizard.mm
@@ -11,7 +11,6 @@ #include "base/memory/weak_ptr.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/remoting/host/mouse_cursor_monitor_proxy_unittest.cc b/remoting/host/mouse_cursor_monitor_proxy_unittest.cc index 9b897cc..f586f2ec5 100644 --- a/remoting/host/mouse_cursor_monitor_proxy_unittest.cc +++ b/remoting/host/mouse_cursor_monitor_proxy_unittest.cc
@@ -13,6 +13,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "remoting/host/mouse_cursor_monitor_proxy.h" #include "remoting/protocol/protocol_mock_objects.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/remoting/host/native_messaging/native_messaging_reader.h b/remoting/host/native_messaging/native_messaging_reader.h index b3710463..eceb5501 100644 --- a/remoting/host/native_messaging/native_messaging_reader.h +++ b/remoting/host/native_messaging/native_messaging_reader.h
@@ -11,6 +11,7 @@ #include "base/files/file.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" namespace base { class SequencedTaskRunner;
diff --git a/remoting/host/security_key/security_key_auth_handler_posix.cc b/remoting/host/security_key/security_key_auth_handler_posix.cc index ca8ceaac..fdcb50a 100644 --- a/remoting/host/security_key/security_key_auth_handler_posix.cc +++ b/remoting/host/security_key/security_key_auth_handler_posix.cc
@@ -24,6 +24,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "net/base/net_errors.h" #include "net/socket/stream_socket.h" #include "net/socket/unix_domain_server_socket_posix.h"
diff --git a/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc b/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc index 9fcae1e..548e244 100644 --- a/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc +++ b/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc
@@ -15,6 +15,7 @@ #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/sockaddr_storage.h"
diff --git a/remoting/host/security_key/security_key_message_reader_impl.h b/remoting/host/security_key/security_key_message_reader_impl.h index 52d668a..413ed56 100644 --- a/remoting/host/security_key/security_key_message_reader_impl.h +++ b/remoting/host/security_key/security_key_message_reader_impl.h
@@ -11,6 +11,7 @@ #include "base/files/file.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "remoting/host/security_key/security_key_message.h" #include "remoting/host/security_key/security_key_message_reader.h"
diff --git a/remoting/host/setup/me2me_native_messaging_host_unittest.cc b/remoting/host/setup/me2me_native_messaging_host_unittest.cc index 2bce5ef..e74bd95 100644 --- a/remoting/host/setup/me2me_native_messaging_host_unittest.cc +++ b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
@@ -20,6 +20,7 @@ #include "base/run_loop.h" #include "base/strings/stringize_macros.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "base/values.h" #include "google_apis/gaia/gaia_oauth_client.h" #include "net/base/file_stream.h"
diff --git a/remoting/host/win/host_event_file_logger.cc b/remoting/host/win/host_event_file_logger.cc index 1a58156..5911df4 100644 --- a/remoting/host/win/host_event_file_logger.cc +++ b/remoting/host/win/host_event_file_logger.cc
@@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "remoting/host/win/event_trace_data.h" namespace remoting {
diff --git a/remoting/ios/audio/audio_playback_sink_ios_unittest.cc b/remoting/ios/audio/audio_playback_sink_ios_unittest.cc index ce78a7e..be1bd3cf 100644 --- a/remoting/ios/audio/audio_playback_sink_ios_unittest.cc +++ b/remoting/ios/audio/audio_playback_sink_ios_unittest.cc
@@ -8,6 +8,7 @@ #include "base/test/bind.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "remoting/client/audio/audio_stream_format.h" #include "remoting/client/audio/fake_async_audio_data_supplier.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/protocol/connection_unittest.cc b/remoting/protocol/connection_unittest.cc index f947720..41c0aef 100644 --- a/remoting/protocol/connection_unittest.cc +++ b/remoting/protocol/connection_unittest.cc
@@ -13,6 +13,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "build/build_config.h" #include "remoting/base/constants.h"
diff --git a/remoting/protocol/ice_transport_unittest.cc b/remoting/protocol/ice_transport_unittest.cc index bf8f9338..f89ee99 100644 --- a/remoting/protocol/ice_transport_unittest.cc +++ b/remoting/protocol/ice_transport_unittest.cc
@@ -14,6 +14,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/webrtc/thread_wrapper.h" #include "net/url_request/url_request_context_getter.h"
diff --git a/remoting/protocol/performance_tracker.cc b/remoting/protocol/performance_tracker.cc index d0a0bd4..c5ac5740 100644 --- a/remoting/protocol/performance_tracker.cc +++ b/remoting/protocol/performance_tracker.cc
@@ -5,6 +5,7 @@ #include "remoting/protocol/performance_tracker.h" #include "base/bind.h" +#include "base/time/time.h" #include "remoting/protocol/frame_stats.h" namespace {
diff --git a/remoting/protocol/pseudotcp_adapter_unittest.cc b/remoting/protocol/pseudotcp_adapter_unittest.cc index ecbcbbe..b51d24c8 100644 --- a/remoting/protocol/pseudotcp_adapter_unittest.cc +++ b/remoting/protocol/pseudotcp_adapter_unittest.cc
@@ -19,6 +19,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/webrtc/thread_wrapper.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h"
diff --git a/remoting/protocol/webrtc_frame_scheduler_constant_rate.cc b/remoting/protocol/webrtc_frame_scheduler_constant_rate.cc index 9cbacf0b..0f379a1 100644 --- a/remoting/protocol/webrtc_frame_scheduler_constant_rate.cc +++ b/remoting/protocol/webrtc_frame_scheduler_constant_rate.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include "base/logging.h" +#include "base/time/time.h" namespace remoting { namespace protocol {
diff --git a/remoting/protocol/webrtc_frame_scheduler_simple.h b/remoting/protocol/webrtc_frame_scheduler_simple.h index e9f86ba..3e56e8e9 100644 --- a/remoting/protocol/webrtc_frame_scheduler_simple.h +++ b/remoting/protocol/webrtc_frame_scheduler_simple.h
@@ -13,6 +13,7 @@ #include "base/containers/queue.h" #include "base/threading/thread_checker.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "remoting/base/leaky_bucket.h" #include "remoting/base/running_samples.h"
diff --git a/remoting/protocol/webrtc_video_renderer_adapter.cc b/remoting/protocol/webrtc_video_renderer_adapter.cc index 063fcd26..de5fd88 100644 --- a/remoting/protocol/webrtc_video_renderer_adapter.cc +++ b/remoting/protocol/webrtc_video_renderer_adapter.cc
@@ -13,7 +13,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/remoting/protocol/webrtc_video_stream.cc b/remoting/protocol/webrtc_video_stream.cc index 1c95c07..be91a70 100644 --- a/remoting/protocol/webrtc_video_stream.cc +++ b/remoting/protocol/webrtc_video_stream.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/logging.h" +#include "base/time/time.h" #include "remoting/base/constants.h" #include "remoting/protocol/frame_stats.h" #include "remoting/protocol/host_video_stats_dispatcher.h"
diff --git a/remoting/signaling/ftl_message_reception_channel_unittest.cc b/remoting/signaling/ftl_message_reception_channel_unittest.cc index 840b263b6..0a285a18 100644 --- a/remoting/signaling/ftl_message_reception_channel_unittest.cc +++ b/remoting/signaling/ftl_message_reception_channel_unittest.cc
@@ -19,6 +19,7 @@ #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "remoting/base/protobuf_http_status.h" #include "remoting/base/scoped_protobuf_http_request.h" #include "remoting/proto/ftl/v1/ftl_messages.pb.h"
diff --git a/remoting/signaling/ftl_messaging_client_unittest.cc b/remoting/signaling/ftl_messaging_client_unittest.cc index 7d5be41..c75d5e8 100644 --- a/remoting/signaling/ftl_messaging_client_unittest.cc +++ b/remoting/signaling/ftl_messaging_client_unittest.cc
@@ -16,7 +16,6 @@ #include "base/memory/raw_ptr.h" #include "base/notreached.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/remoting/test/cli_util.cc b/remoting/test/cli_util.cc index e37fe0e..ef01097 100644 --- a/remoting/test/cli_util.cc +++ b/remoting/test/cli_util.cc
@@ -9,7 +9,6 @@ #include "base/command_line.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" namespace {
diff --git a/remoting/test/codec_perftest.cc b/remoting/test/codec_perftest.cc index 32540df..c55cac1 100644 --- a/remoting/test/codec_perftest.cc +++ b/remoting/test/codec_perftest.cc
@@ -4,6 +4,7 @@ #include "base/logging.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "remoting/codec/video_encoder_vpx.h" #include "remoting/proto/video.pb.h" #include "remoting/test/cyclic_frame_generator.h"
diff --git a/remoting/test/cyclic_frame_generator.h b/remoting/test/cyclic_frame_generator.h index d0ff4cee..3b8c54d 100644 --- a/remoting/test/cyclic_frame_generator.h +++ b/remoting/test/cyclic_frame_generator.h
@@ -13,6 +13,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "remoting/protocol/input_event_timestamps.h" #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
diff --git a/remoting/test/ftl_services_playground.cc b/remoting/test/ftl_services_playground.cc index d40cf63..53badf63 100644 --- a/remoting/test/ftl_services_playground.cc +++ b/remoting/test/ftl_services_playground.cc
@@ -18,7 +18,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "remoting/base/oauth_token_getter_impl.h" #include "remoting/base/protobuf_http_status.h" #include "remoting/base/url_request_context_getter.h"
diff --git a/remoting/test/ftl_signaling_playground.cc b/remoting/test/ftl_signaling_playground.cc index 14e6258..5f42f28 100644 --- a/remoting/test/ftl_signaling_playground.cc +++ b/remoting/test/ftl_signaling_playground.cc
@@ -19,7 +19,6 @@ #include "base/memory/ptr_util.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "components/webrtc/thread_wrapper.h" #include "remoting/base/logging.h"
diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc index 32d24d15..79f35391 100644 --- a/remoting/test/protocol_perftest.cc +++ b/remoting/test/protocol_perftest.cc
@@ -20,6 +20,7 @@ #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/webrtc/thread_wrapper.h" #include "net/base/network_change_notifier.h" #include "net/test/test_data_directory.h"
diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc index f48b673..dd61a300 100644 --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc
@@ -19,7 +19,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/services/audio/input_controller.h b/services/audio/input_controller.h index 3d39addf..278ba3e 100644 --- a/services/audio/input_controller.h +++ b/services/audio/input_controller.h
@@ -15,6 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string_piece.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "build/build_config.h" #include "media/base/audio_parameters.h"
diff --git a/services/audio/loopback_stream_unittest.cc b/services/audio/loopback_stream_unittest.cc index ae50ef54..e8105576 100644 --- a/services/audio/loopback_stream_unittest.cc +++ b/services/audio/loopback_stream_unittest.cc
@@ -14,6 +14,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "media/base/audio_parameters.h" #include "media/base/audio_timestamp_helper.h"
diff --git a/services/audio/output_device_mixer_impl.cc b/services/audio/output_device_mixer_impl.cc index b75d1c8..c3b41d2 100644 --- a/services/audio/output_device_mixer_impl.cc +++ b/services/audio/output_device_mixer_impl.cc
@@ -11,6 +11,7 @@ #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "media/audio/audio_device_description.h" #include "media/audio/audio_io.h"
diff --git a/services/audio/owning_audio_manager_accessor.cc b/services/audio/owning_audio_manager_accessor.cc index 8dee0b7..653708c5 100644 --- a/services/audio/owning_audio_manager_accessor.cc +++ b/services/audio/owning_audio_manager_accessor.cc
@@ -16,6 +16,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "media/audio/audio_features.h" #include "media/audio/audio_manager.h" #include "media/audio/audio_thread.h"
diff --git a/services/audio/public/cpp/output_device_unittest.cc b/services/audio/public/cpp/output_device_unittest.cc index 15ce47a..2433168 100644 --- a/services/audio/public/cpp/output_device_unittest.cc +++ b/services/audio/public/cpp/output_device_unittest.cc
@@ -10,6 +10,7 @@ #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "media/audio/audio_output_device.h" @@ -84,11 +85,9 @@ void(media::AudioOutputIPCDelegate* delegate, const base::UnguessableToken& session_id, const std::string& device_id)); - MOCK_METHOD3( - CreateStream, - void(media::AudioOutputIPCDelegate* delegate, - const media::AudioParameters& params, - const absl::optional<base::UnguessableToken>& processing_id)); + MOCK_METHOD2(CreateStream, + void(media::AudioOutputIPCDelegate* delegate, + const media::AudioParameters& params)); MOCK_METHOD0(PlayStream, void()); MOCK_METHOD0(PauseStream, void()); MOCK_METHOD0(FlushStream, void()); @@ -275,7 +274,7 @@ EXPECT_CALL(*ipc, RequestDeviceAuthorization(audio_device.get(), base::UnguessableToken(), kNonDefaultDeviceId)); - EXPECT_CALL(*ipc, CreateStream(audio_device.get(), _, _)); + EXPECT_CALL(*ipc, CreateStream(audio_device.get(), _)); EXPECT_CALL(*ipc, PlayStream()); task_env_.RunUntilIdle(); Mock::VerifyAndClear(ipc); @@ -340,7 +339,7 @@ EXPECT_CALL(*ipc, RequestDeviceAuthorization(audio_device.get(), base::UnguessableToken(), kNonDefaultDeviceId)); - EXPECT_CALL(*ipc, CreateStream(audio_device.get(), _, _)); + EXPECT_CALL(*ipc, CreateStream(audio_device.get(), _)); EXPECT_CALL(*ipc, PlayStream()); task_env_.RunUntilIdle(); Mock::VerifyAndClear(ipc);
diff --git a/services/audio/public/cpp/sounds/audio_stream_handler.cc b/services/audio/public/cpp/sounds/audio_stream_handler.cc index 0d56efa..b4e0152e 100644 --- a/services/audio/public/cpp/sounds/audio_stream_handler.cc +++ b/services/audio/public/cpp/sounds/audio_stream_handler.cc
@@ -13,7 +13,6 @@ #include "base/cancelable_callback.h" #include "base/logging.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "media/audio/wav_audio_handler.h"
diff --git a/services/audio/snooper_node_unittest.cc b/services/audio/snooper_node_unittest.cc index af935e8..7b93e61 100644 --- a/services/audio/snooper_node_unittest.cc +++ b/services/audio/snooper_node_unittest.cc
@@ -15,6 +15,7 @@ #include "base/memory/scoped_refptr.h" #include "base/strings/string_piece.h" #include "base/test/test_mock_time_task_runner.h" +#include "base/time/time.h" #include "media/base/audio_bus.h" #include "media/base/audio_parameters.h" #include "media/base/channel_layout.h"
diff --git a/services/audio/stream_factory.h b/services/audio/stream_factory.h index df1f77d..72ef86a 100644 --- a/services/audio/stream_factory.h +++ b/services/audio/stream_factory.h
@@ -15,6 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/media_buildflags.h" #include "media/mojo/mojom/audio_logging.mojom.h" #include "media/mojo/mojom/audio_output_stream.mojom.h"
diff --git a/services/audio/test/audio_system_to_service_adapter_test.cc b/services/audio/test/audio_system_to_service_adapter_test.cc index 661dc8ad..f3cb4143 100644 --- a/services/audio/test/audio_system_to_service_adapter_test.cc +++ b/services/audio/test/audio_system_to_service_adapter_test.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "media/audio/audio_system_test_util.h" #include "media/audio/test_audio_thread.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/services/cert_verifier/cert_net_url_loader/cert_net_fetcher_url_loader.cc b/services/cert_verifier/cert_net_url_loader/cert_net_fetcher_url_loader.cc index f0d2810..9d1b702 100644 --- a/services/cert_verifier/cert_net_url_loader/cert_net_fetcher_url_loader.cc +++ b/services/cert_verifier/cert_net_url_loader/cert_net_fetcher_url_loader.cc
@@ -74,6 +74,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "net/base/load_flags.h"
diff --git a/services/cert_verifier/cert_net_url_loader/cert_net_fetcher_url_loader_unittest.cc b/services/cert_verifier/cert_net_url_loader/cert_net_fetcher_url_loader_unittest.cc index 866e93e4..12aa626e 100644 --- a/services/cert_verifier/cert_net_url_loader/cert_net_fetcher_url_loader_unittest.cc +++ b/services/cert_verifier/cert_net_url_loader/cert_net_fetcher_url_loader_unittest.cc
@@ -13,6 +13,7 @@ #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "net/cert/cert_net_fetcher.h" #include "net/cert/ct_policy_enforcer.h"
diff --git a/services/data_decoder/public/cpp/data_decoder.cc b/services/data_decoder/public/cpp/data_decoder.cc index eac10b1..606557e2 100644 --- a/services/data_decoder/public/cpp/data_decoder.cc +++ b/services/data_decoder/public/cpp/data_decoder.cc
@@ -21,7 +21,6 @@ #endif #if BUILDFLAG(IS_IOS) -#include "base/task/post_task.h" #include "services/data_decoder/data_decoder_service.h" // nogncheck #endif
diff --git a/services/data_decoder/public/cpp/data_decoder.h b/services/data_decoder/public/cpp/data_decoder.h index 10210ef..9a830ba 100644 --- a/services/data_decoder/public/cpp/data_decoder.h +++ b/services/data_decoder/public/cpp/data_decoder.h
@@ -8,6 +8,7 @@ #include <string> #include "base/callback_forward.h" +#include "base/time/time.h" #include "base/values.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/services/data_decoder/public/cpp/decode_image.cc b/services/data_decoder/public/cpp/decode_image.cc index 8657fc4..392ef4a4 100644 --- a/services/data_decoder/public/cpp/decode_image.cc +++ b/services/data_decoder/public/cpp/decode_image.cc
@@ -10,6 +10,7 @@ #include "base/callback_helpers.h" #include "base/debug/dump_without_crashing.h" #include "base/metrics/histogram_functions.h" +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "mojo/public/cpp/bindings/remote.h" #include "services/data_decoder/public/cpp/data_decoder.h"
diff --git a/services/device/device_service.cc b/services/device/device_service.cc index 11a7b29..1f18714d 100644 --- a/services/device/device_service.cc +++ b/services/device/device_service.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/services/device/device_service_test_base.cc b/services/device/device_service_test_base.cc index e799fdbb..8206c5d 100644 --- a/services/device/device_service_test_base.cc +++ b/services/device/device_service_test_base.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/services/device/generic_sensor/linux/sensor_device_manager.cc b/services/device/generic_sensor/linux/sensor_device_manager.cc index a753f955..02d16127 100644 --- a/services/device/generic_sensor/linux/sensor_device_manager.cc +++ b/services/device/generic_sensor/linux/sensor_device_manager.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/containers/contains.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/threading/scoped_blocking_call.h" #include "base/threading/sequenced_task_runner_handle.h" #include "services/device/generic_sensor/linux/sensor_data_linux.h"
diff --git a/services/device/generic_sensor/platform_sensor_provider_chromeos.cc b/services/device/generic_sensor/platform_sensor_provider_chromeos.cc index 6ada6cfd..53d89ea 100644 --- a/services/device/generic_sensor/platform_sensor_provider_chromeos.cc +++ b/services/device/generic_sensor/platform_sensor_provider_chromeos.cc
@@ -14,7 +14,6 @@ #include "base/memory/scoped_refptr.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chromeos/components/sensors/sensor_util.h" #include "services/device/generic_sensor/platform_sensor_chromeos.h"
diff --git a/services/device/generic_sensor/platform_sensor_provider_linux.cc b/services/device/generic_sensor/platform_sensor_provider_linux.cc index b6ef776..accaf71 100644 --- a/services/device/generic_sensor/platform_sensor_provider_linux.cc +++ b/services/device/generic_sensor/platform_sensor_provider_linux.cc
@@ -11,7 +11,6 @@ #include "base/compiler_specific.h" #include "base/containers/contains.h" #include "base/memory/scoped_refptr.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "services/device/generic_sensor/linux/sensor_data_linux.h"
diff --git a/services/device/generic_sensor/platform_sensor_provider_win.cc b/services/device/generic_sensor/platform_sensor_provider_win.cc index 38494a5..d3f52ba 100644 --- a/services/device/generic_sensor/platform_sensor_provider_win.cc +++ b/services/device/generic_sensor/platform_sensor_provider_win.cc
@@ -10,7 +10,6 @@ #include <iomanip> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/services/device/generic_sensor/platform_sensor_provider_winrt.cc b/services/device/generic_sensor/platform_sensor_provider_winrt.cc index aab37b0..c02af08 100644 --- a/services/device/generic_sensor/platform_sensor_provider_winrt.cc +++ b/services/device/generic_sensor/platform_sensor_provider_winrt.cc
@@ -6,7 +6,6 @@ #include <comdef.h> -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "services/device/generic_sensor/gravity_fusion_algorithm_using_accelerometer.h"
diff --git a/services/device/generic_sensor/platform_sensor_reader_linux.cc b/services/device/generic_sensor/platform_sensor_reader_linux.cc index 5cc05451..a43c706 100644 --- a/services/device/generic_sensor/platform_sensor_reader_linux.cc +++ b/services/device/generic_sensor/platform_sensor_reader_linux.cc
@@ -11,7 +11,6 @@ #include "base/sequence_checker.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/timer/timer.h"
diff --git a/services/device/geolocation/geolocation_provider_impl.cc b/services/device/geolocation/geolocation_provider_impl.cc index 3ad39d7..677f90ab 100644 --- a/services/device/geolocation/geolocation_provider_impl.cc +++ b/services/device/geolocation/geolocation_provider_impl.cc
@@ -18,6 +18,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "net/base/network_change_notifier.h" #include "services/device/geolocation/location_arbitrator.h"
diff --git a/services/device/geolocation/network_location_provider.h b/services/device/geolocation/network_location_provider.h index 828108f..d508beb 100644 --- a/services/device/geolocation/network_location_provider.h +++ b/services/device/geolocation/network_location_provider.h
@@ -17,6 +17,7 @@ #include "base/scoped_observation.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "build/build_config.h" #include "services/device/geolocation/network_location_request.h" #include "services/device/geolocation/wifi_data_provider_manager.h"
diff --git a/services/device/geolocation/network_location_request.h b/services/device/geolocation/network_location_request.h index 48479a2..1c8e40225 100644 --- a/services/device/geolocation/network_location_request.h +++ b/services/device/geolocation/network_location_request.h
@@ -10,6 +10,7 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "services/device/geolocation/wifi_data_provider.h" #include "services/device/public/mojom/geoposition.mojom.h" #include "url/gurl.h"
diff --git a/services/device/geolocation/win/location_provider_winrt.h b/services/device/geolocation/win/location_provider_winrt.h index 788fc47..cbde230 100644 --- a/services/device/geolocation/win/location_provider_winrt.h +++ b/services/device/geolocation/win/location_provider_winrt.h
@@ -9,6 +9,7 @@ #include <wrl/client.h> #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "services/device/public/cpp/geolocation/location_provider.h" #include "services/device/public/mojom/geoposition.mojom.h"
diff --git a/services/device/serial/serial_io_handler.cc b/services/device/serial/serial_io_handler.cc index de736ed..2410ead 100644 --- a/services/device/serial/serial_io_handler.cc +++ b/services/device/serial/serial_io_handler.cc
@@ -12,7 +12,6 @@ #include "base/files/file_path.h" #include "base/location.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/services/device/serial/serial_port_manager_impl_unittest.cc b/services/device/serial/serial_port_manager_impl_unittest.cc index bedbae79d..5544c42 100644 --- a/services/device/serial/serial_port_manager_impl_unittest.cc +++ b/services/device/serial/serial_port_manager_impl_unittest.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/memory/raw_ptr.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/threading/thread.h"
diff --git a/services/device/usb/usb_device_handle_win.cc b/services/device/usb/usb_device_handle_win.cc index 458bd494..ba24381 100644 --- a/services/device/usb/usb_device_handle_win.cc +++ b/services/device/usb/usb_device_handle_win.cc
@@ -24,7 +24,6 @@ #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted_memory.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/services/device/wake_lock/power_save_blocker/power_save_blocker_mac.cc b/services/device/wake_lock/power_save_blocker/power_save_blocker_mac.cc index 82fee71..de3c87b4 100644 --- a/services/device/wake_lock/power_save_blocker/power_save_blocker_mac.cc +++ b/services/device/wake_lock/power_save_blocker/power_save_blocker_mac.cc
@@ -14,6 +14,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" +#include "base/time/time.h" namespace device { namespace {
diff --git a/services/image_annotation/public/cpp/image_processor.cc b/services/image_annotation/public/cpp/image_processor.cc index 64643d4..4e0855e1 100644 --- a/services/image_annotation/public/cpp/image_processor.cc +++ b/services/image_annotation/public/cpp/image_processor.cc
@@ -5,7 +5,6 @@ #include "services/image_annotation/public/cpp/image_processor.h" #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "services/image_annotation/image_annotation_metrics.h"
diff --git a/services/media_session/public/cpp/test/test_media_controller.h b/services/media_session/public/cpp/test/test_media_controller.h index 425c46bc0..8776a2a 100644 --- a/services/media_session/public/cpp/test/test_media_controller.h +++ b/services/media_session/public/cpp/test/test_media_controller.h
@@ -9,6 +9,7 @@ #include "base/component_export.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote_set.h" #include "services/media_session/public/mojom/media_controller.mojom.h"
diff --git a/services/network/cookie_manager_unittest.cc b/services/network/cookie_manager_unittest.cc index e653ac8..b39d785 100644 --- a/services/network/cookie_manager_unittest.cc +++ b/services/network/cookie_manager_unittest.cc
@@ -11,7 +11,6 @@ #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/strcat.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/bind.h"
diff --git a/services/network/cors/cors_url_loader_unittest.cc b/services/network/cors/cors_url_loader_unittest.cc index d9d6a59..4fb3121f 100644 --- a/services/network/cors/cors_url_loader_unittest.cc +++ b/services/network/cors/cors_url_loader_unittest.cc
@@ -3476,7 +3476,7 @@ EXPECT_EQ(client().completion_status().error_code, net::OK); } -TEST_F(CorsURLLoaderTest, PrivateNetworkAccessIgnoresCache) { +TEST_F(CorsURLLoaderTest, PrivateNetworkAccessCache) { ResourceRequest request; request.method = "GET"; request.mode = mojom::RequestMode::kCors; @@ -3504,7 +3504,7 @@ EXPECT_EQ(client().completion_status().error_code, net::OK); - // Make a second request, observe that it does not use the preflight cache. + // Make a second request, observe that it does use the preflight cache. CreateLoaderAndStart(request); RunUntilCreateLoaderAndStartCalled(); @@ -3514,7 +3514,28 @@ RunUntilCreateLoaderAndStartCalled(); - // Second preflight request. + // Second request is not preflight because it is found in the cache. + EXPECT_EQ(GetRequest().method, "GET"); + + NotifyLoaderClientOnReceiveResponse(); + NotifyLoaderClientOnComplete(net::OK); + RunUntilComplete(); + + // Send the same request again. This time the initial connection observes a + // private network access to a different IP address space: `kLocal`. + // A preflight request should be sent with its `target_ip_address_space` set + // to `kLocal`. CreateLoaderAndStart(request); + CreateLoaderAndStart(request); + RunUntilCreateLoaderAndStartCalled(); + NotifyLoaderClientOnComplete(CorsErrorStatus( + mojom::CorsError::kUnexpectedPrivateNetworkAccess, + mojom::IPAddressSpace::kUnknown, mojom::IPAddressSpace::kLocal)); + + RunUntilCreateLoaderAndStartCalled(); + + // Third request should be a preflight, because preflight cache entries are + // keyed by `target_ip_address_space`, so the previously cached preflight + // result cannot be reused for this request. EXPECT_EQ(GetRequest().method, "OPTIONS"); }
diff --git a/services/network/cors/preflight_cache.cc b/services/network/cors/preflight_cache.cc index 9743744..c09b8c1 100644 --- a/services/network/cors/preflight_cache.cc +++ b/services/network/cors/preflight_cache.cc
@@ -73,6 +73,7 @@ const url::Origin& origin, const GURL& url, const net::NetworkIsolationKey& network_isolation_key, + mojom::IPAddressSpace target_ip_address_space, std::unique_ptr<PreflightResult> preflight_result) { DCHECK(preflight_result); @@ -81,7 +82,8 @@ if (url_spec.length() >= kMaxKeyLength) return; - auto key = std::make_tuple(origin, url_spec, network_isolation_key); + auto key = std::make_tuple(origin, url_spec, network_isolation_key, + target_ip_address_space); const auto existing_entry = cache_.find(key); if (existing_entry == cache_.end()) { // Since one new entry is always added below, let's purge one cache entry @@ -99,13 +101,15 @@ const url::Origin& origin, const GURL& url, const net::NetworkIsolationKey& network_isolation_key, + mojom::IPAddressSpace target_ip_address_space, mojom::CredentialsMode credentials_mode, const std::string& method, const net::HttpRequestHeaders& request_headers, bool is_revalidating, const net::NetLogWithSource& net_log) { // Check if the entry exists in the cache. - auto key = std::make_tuple(origin, url.spec(), network_isolation_key); + auto key = std::make_tuple(origin, url.spec(), network_isolation_key, + target_ip_address_space); auto cache_entry = cache_.find(key); if (cache_entry == cache_.end()) { ReportCacheMetricAndRecordNetLog(CacheMetric::kMiss, net_log);
diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/preflight_cache.h index 3f56c6d..43cff15 100644 --- a/services/network/cors/preflight_cache.h +++ b/services/network/cors/preflight_cache.h
@@ -45,6 +45,7 @@ void AppendEntry(const url::Origin& origin, const GURL& url, const net::NetworkIsolationKey& network_isolation_key, + mojom::IPAddressSpace target_ip_address_space, std::unique_ptr<PreflightResult> preflight_result); // Consults with cached results, and decides if we can skip CORS-preflight or @@ -53,6 +54,7 @@ const url::Origin& origin, const GURL& url, const net::NetworkIsolationKey& network_isolation_key, + mojom::IPAddressSpace target_ip_address_space, mojom::CredentialsMode credentials_mode, const std::string& method, const net::HttpRequestHeaders& headers, @@ -73,7 +75,8 @@ // url string, and NetworkIsolationKey to find a cached entry. std::map<std::tuple<url::Origin /* origin */, std::string /* url */, - net::NetworkIsolationKey /* NIK */>, + net::NetworkIsolationKey /* NIK */, + mojom::IPAddressSpace /* target_ip_address_space */>, std::unique_ptr<PreflightResult>> cache_; };
diff --git a/services/network/cors/preflight_cache_unittest.cc b/services/network/cors/preflight_cache_unittest.cc index 7f2024a..6c6177a 100644 --- a/services/network/cors/preflight_cache_unittest.cc +++ b/services/network/cors/preflight_cache_unittest.cc
@@ -47,16 +47,21 @@ void AppendEntry(const url::Origin& origin, const GURL& url, - const net::NetworkIsolationKey& network_isolation_key) { - cache_.AppendEntry(origin, url, network_isolation_key, CreateEntry()); + const net::NetworkIsolationKey& network_isolation_key, + mojom::IPAddressSpace target_ip_address_space = + mojom::IPAddressSpace::kUnknown) { + cache_.AppendEntry(origin, url, network_isolation_key, + target_ip_address_space, CreateEntry()); } bool CheckEntryAndRefreshCache( const url::Origin& origin, const GURL& url, - const net::NetworkIsolationKey& network_isolation_key) { + const net::NetworkIsolationKey& network_isolation_key, + mojom::IPAddressSpace target_ip_address_space = + mojom::IPAddressSpace::kUnknown) { return cache_.CheckIfRequestCanSkipPreflight( - origin, url, network_isolation_key, + origin, url, network_isolation_key, target_ip_address_space, network::mojom::CredentialsMode::kInclude, /*method=*/"POST", net::HttpRequestHeaders(), /*is_revalidating=*/false, net_log_); } @@ -66,7 +71,7 @@ const GURL& url, const net::NetworkIsolationKey& network_isolation_key) { return cache_.CheckIfRequestCanSkipPreflight( - origin, url, network_isolation_key, + origin, url, network_isolation_key, mojom::IPAddressSpace::kUnknown, network::mojom::CredentialsMode::kInclude, /*method=*/"OPTION", net::HttpRequestHeaders(), /*is_revalidating=*/false, net_log_); } @@ -214,6 +219,32 @@ kOrigin1, kUrl, net::NetworkIsolationKey(url::Origin(), url::Origin()))); } +TEST_F(PreflightCacheTest, PrivateNetworkAccess) { + const url::Origin origin; + const GURL url("http://www.test.com/A"); + const net::NetworkIsolationKey nik(origin, origin); + + // The cache starts empty. + EXPECT_EQ(0u, CountEntries()); + + AppendEntry(origin, url, nik, mojom::IPAddressSpace::kUnknown); + EXPECT_EQ(1u, CountEntries()); + EXPECT_TRUE(CheckEntryAndRefreshCache(origin, url, nik, + mojom::IPAddressSpace::kUnknown)); + + AppendEntry(origin, url, nik, mojom::IPAddressSpace::kPrivate); + AppendEntry(origin, url, nik, mojom::IPAddressSpace::kLocal); + EXPECT_EQ(3u, CountEntries()); + EXPECT_TRUE(CheckEntryAndRefreshCache(origin, url, nik, + mojom::IPAddressSpace::kPrivate)); + EXPECT_TRUE(CheckEntryAndRefreshCache(origin, url, nik, + mojom::IPAddressSpace::kLocal)); + + // Check that an entry we never inserted is not found in the cache. + EXPECT_FALSE(CheckEntryAndRefreshCache(origin, url, nik, + mojom::IPAddressSpace::kPublic)); +} + TEST_F(PreflightCacheTest, NetLogCheckCacheExist) { const url::Origin kOrigin; const GURL kUrl("http://www.test.com/A");
diff --git a/services/network/cors/preflight_controller.cc b/services/network/cors/preflight_controller.cc index 6d33d22..b036012 100644 --- a/services/network/cors/preflight_controller.cc +++ b/services/network/cors/preflight_controller.cc
@@ -489,13 +489,10 @@ } if (!(original_request_.load_flags & net::LOAD_DISABLE_CACHE) && - // TODO(https://crbug.com/1268312): Key the cache by target address - // space and remove this guard. - original_request_.target_ip_address_space == - mojom::IPAddressSpace::kUnknown && !detected_error_status) { controller_->AppendToCache(*original_request_.request_initiator, original_request_.url, network_isolation_key_, + original_request_.target_ip_address_space, std::move(result)); } @@ -622,13 +619,10 @@ ? request.trusted_params->isolation_info.network_isolation_key() : net::NetworkIsolationKey(); if (!RetrieveCacheFlags(request.load_flags) && - // TODO(https://crbug.com/1268312): Key the cache by target address space - // and remove this guard. - request.target_ip_address_space == mojom::IPAddressSpace::kUnknown && cache_.CheckIfRequestCanSkipPreflight( request.request_initiator.value(), request.url, network_isolation_key, - request.credentials_mode, request.method, request.headers, - request.is_revalidating, net_log)) { + request.target_ip_address_space, request.credentials_mode, + request.method, request.headers, request.is_revalidating, net_log)) { std::move(callback).Run(net::OK, absl::nullopt, false); return; } @@ -652,8 +646,10 @@ const url::Origin& origin, const GURL& url, const net::NetworkIsolationKey& network_isolation_key, + mojom::IPAddressSpace target_ip_address_space, std::unique_ptr<PreflightResult> result) { - cache_.AppendEntry(origin, url, network_isolation_key, std::move(result)); + cache_.AppendEntry(origin, url, network_isolation_key, + target_ip_address_space, std::move(result)); } } // namespace cors
diff --git a/services/network/cors/preflight_controller.h b/services/network/cors/preflight_controller.h index c7d2e8d9..d0adfbd 100644 --- a/services/network/cors/preflight_controller.h +++ b/services/network/cors/preflight_controller.h
@@ -108,6 +108,7 @@ void AppendToCache(const url::Origin& origin, const GURL& url, const net::NetworkIsolationKey& network_isolation_key, + mojom::IPAddressSpace target_ip_address_space, std::unique_ptr<PreflightResult> result); NetworkService* network_service() { return network_service_; }
diff --git a/services/network/cors/preflight_result.h b/services/network/cors/preflight_result.h index fedb8bf..80886488 100644 --- a/services/network/cors/preflight_result.h +++ b/services/network/cors/preflight_result.h
@@ -10,6 +10,7 @@ #include "base/component_export.h" #include "base/containers/flat_set.h" +#include "base/time/time.h" #include "base/types/strong_alias.h" #include "services/network/public/cpp/cors/cors_error_status.h" #include "services/network/public/mojom/cors.mojom-shared.h"
diff --git a/services/network/crl_set_distributor.cc b/services/network/crl_set_distributor.cc index 301317e..5800af8 100644 --- a/services/network/crl_set_distributor.cc +++ b/services/network/crl_set_distributor.cc
@@ -12,7 +12,6 @@ #include "base/location.h" #include "base/observer_list.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "services/network/public/cpp/features.h"
diff --git a/services/network/expect_ct_reporter_unittest.cc b/services/network/expect_ct_reporter_unittest.cc index 3cce5b5..a2a2dd1 100644 --- a/services/network/expect_ct_reporter_unittest.cc +++ b/services/network/expect_ct_reporter_unittest.cc
@@ -17,6 +17,7 @@ #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "base/values.h" #include "net/base/network_isolation_key.h" #include "net/cert/ct_serialization.h"
diff --git a/services/network/http_cache_data_counter_unittest.cc b/services/network/http_cache_data_counter_unittest.cc index 6408355..ffac684 100644 --- a/services/network/http_cache_data_counter_unittest.cc +++ b/services/network/http_cache_data_counter_unittest.cc
@@ -16,6 +16,7 @@ #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/remote.h" #include "net/base/cache_type.h" #include "net/base/net_errors.h"
diff --git a/services/network/http_cache_data_remover_unittest.cc b/services/network/http_cache_data_remover_unittest.cc index f9568a8..e10dc09 100644 --- a/services/network/http_cache_data_remover_unittest.cc +++ b/services/network/http_cache_data_remover_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/remote.h" #include "net/base/cache_type.h" #include "net/base/features.h"
diff --git a/services/network/net_log_exporter.cc b/services/network/net_log_exporter.cc index 32ffd1a..6310aa3b 100644 --- a/services/network/net_log_exporter.cc +++ b/services/network/net_log_exporter.cc
@@ -10,7 +10,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/services/network/network_context.cc b/services/network/network_context.cc index ad863b3d..e9a56db 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc
@@ -24,7 +24,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/services/network/network_service.cc b/services/network/network_service.cc index 07fa37a7..f8429b6 100644 --- a/services/network/network_service.cc +++ b/services/network/network_service.cc
@@ -24,7 +24,6 @@ #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/timer/timer.h" #include "base/values.h"
diff --git a/services/network/p2p/socket_manager.cc b/services/network/p2p/socket_manager.cc index d98e75f..5c3c790 100644 --- a/services/network/p2p/socket_manager.cc +++ b/services/network/p2p/socket_manager.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/memory/raw_ptr.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "net/base/address_list.h"
diff --git a/services/network/proxy_resolver_factory_mojo.cc b/services/network/proxy_resolver_factory_mojo.cc index d4d6182..fb4967e 100644 --- a/services/network/proxy_resolver_factory_mojo.cc +++ b/services/network/proxy_resolver_factory_mojo.cc
@@ -15,7 +15,6 @@ #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/services/network/public/cpp/cert_verifier/mojo_cert_verifier_unittest.cc b/services/network/public/cpp/cert_verifier/mojo_cert_verifier_unittest.cc index cdd0cf4..ed2de33d 100644 --- a/services/network/public/cpp/cert_verifier/mojo_cert_verifier_unittest.cc +++ b/services/network/public/cpp/cert_verifier/mojo_cert_verifier_unittest.cc
@@ -13,6 +13,7 @@ #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "net/base/test_completion_callback.h" #include "net/cert/cert_status_flags.h"
diff --git a/services/network/public/cpp/cookie_manager_mojom_traits.cc b/services/network/public/cpp/cookie_manager_mojom_traits.cc index a9dcda1..8353bc5 100644 --- a/services/network/public/cpp/cookie_manager_mojom_traits.cc +++ b/services/network/public/cpp/cookie_manager_mojom_traits.cc
@@ -4,6 +4,7 @@ #include "services/network/public/cpp/cookie_manager_mojom_traits.h" +#include "base/time/time.h" #include "mojo/public/cpp/base/time_mojom_traits.h" #include "net/cookies/cookie_constants.h" #include "net/cookies/cookie_options.h"
diff --git a/services/network/public/cpp/cross_thread_pending_shared_url_loader_factory_unittest.cc b/services/network/public/cpp/cross_thread_pending_shared_url_loader_factory_unittest.cc index e4277d8e..ea501f3 100644 --- a/services/network/public/cpp/cross_thread_pending_shared_url_loader_factory_unittest.cc +++ b/services/network/public/cpp/cross_thread_pending_shared_url_loader_factory_unittest.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h index 298c52ed..339a54c 100644 --- a/services/network/public/cpp/features.h +++ b/services/network/public/cpp/features.h
@@ -8,6 +8,7 @@ #include "base/component_export.h" #include "base/feature_list.h" #include "base/metrics/field_trial_params.h" +#include "base/time/time.h" namespace network { namespace features {
diff --git a/services/network/public/cpp/network_connection_tracker_unittest.cc b/services/network/public/cpp/network_connection_tracker_unittest.cc index cfc2a73..4eef6cf 100644 --- a/services/network/public/cpp/network_connection_tracker_unittest.cc +++ b/services/network/public/cpp/network_connection_tracker_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/services/network/public/cpp/network_quality_tracker.h b/services/network/public/cpp/network_quality_tracker.h index 340559b..a97041d05 100644 --- a/services/network/public/cpp/network_quality_tracker.h +++ b/services/network/public/cpp/network_quality_tracker.h
@@ -9,6 +9,7 @@ #include "base/component_export.h" #include "base/observer_list.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/receiver.h" #include "net/nqe/effective_connection_type.h" #include "services/network/public/mojom/network_quality_estimator_manager.mojom.h"
diff --git a/services/network/public/cpp/network_quality_tracker_unittest.cc b/services/network/public/cpp/network_quality_tracker_unittest.cc index 8bdb3ea..3988eab 100644 --- a/services/network/public/cpp/network_quality_tracker_unittest.cc +++ b/services/network/public/cpp/network_quality_tracker_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "net/nqe/effective_connection_type.h" #include "net/nqe/network_quality_estimator.h"
diff --git a/services/network/public/cpp/simple_url_loader.cc b/services/network/public/cpp/simple_url_loader.cc index f7e820c..bea2803 100644 --- a/services/network/public/cpp/simple_url_loader.cc +++ b/services/network/public/cpp/simple_url_loader.cc
@@ -21,7 +21,6 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/strings/string_piece.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/services/network/resource_scheduler/resource_scheduler_unittest.cc b/services/network/resource_scheduler/resource_scheduler_unittest.cc index 0a608a3f..1c2742648 100644 --- a/services/network/resource_scheduler/resource_scheduler_unittest.cc +++ b/services/network/resource_scheduler/resource_scheduler_unittest.cc
@@ -22,6 +22,7 @@ #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" #include "base/test/test_mock_time_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "net/base/features.h" #include "net/base/host_port_pair.h"
diff --git a/services/network/sct_auditing/sct_auditing_handler.cc b/services/network/sct_auditing/sct_auditing_handler.cc index 42b8afd..adb85cd 100644 --- a/services/network/sct_auditing/sct_auditing_handler.cc +++ b/services/network/sct_auditing/sct_auditing_handler.cc
@@ -17,7 +17,6 @@ #include "base/metrics/histogram_functions.h" #include "base/rand_util.h" #include "base/task/bind_post_task.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/services/network/session_cleanup_cookie_store.cc b/services/network/session_cleanup_cookie_store.cc index a876da00..f7c56a40 100644 --- a/services/network/session_cleanup_cookie_store.cc +++ b/services/network/session_cleanup_cookie_store.cc
@@ -12,7 +12,6 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/memory/ref_counted.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h" #include "net/cookies/canonical_cookie.h"
diff --git a/services/network/session_cleanup_cookie_store_unittest.cc b/services/network/session_cleanup_cookie_store_unittest.cc index b28c8fa..c9c4afe 100644 --- a/services/network/session_cleanup_cookie_store_unittest.cc +++ b/services/network/session_cleanup_cookie_store_unittest.cc
@@ -9,7 +9,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/services/network/test/test_network_context_client.cc b/services/network/test/test_network_context_client.cc index 87abe13..b4db9c7 100644 --- a/services/network/test/test_network_context_client.cc +++ b/services/network/test/test_network_context_client.cc
@@ -6,7 +6,6 @@ #include <utility> -#include "base/task/post_task.h" #include "base/threading/thread_restrictions.h" #include "net/base/net_errors.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/services/network/throttling/throttling_network_transaction.cc b/services/network/throttling/throttling_network_transaction.cc index 4fc38fe..c287a47 100644 --- a/services/network/throttling/throttling_network_transaction.cc +++ b/services/network/throttling/throttling_network_transaction.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" +#include "base/time/time.h" #include "net/base/load_timing_info.h" #include "net/base/net_errors.h" #include "net/http/http_network_transaction.h"
diff --git a/services/network/transitional_url_loader_factory_owner_unittest.cc b/services/network/transitional_url_loader_factory_owner_unittest.cc index 3de85c5..25bd6b61 100644 --- a/services/network/transitional_url_loader_factory_owner_unittest.cc +++ b/services/network/transitional_url_loader_factory_owner_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/test/embedded_test_server/default_handlers.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
diff --git a/services/network/trust_tokens/sqlite_trust_token_persister_unittest.cc b/services/network/trust_tokens/sqlite_trust_token_persister_unittest.cc index 7a8e18d..9f0f53c 100644 --- a/services/network/trust_tokens/sqlite_trust_token_persister_unittest.cc +++ b/services/network/trust_tokens/sqlite_trust_token_persister_unittest.cc
@@ -11,7 +11,6 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/services/network/trust_tokens/trust_token_database_owner_unittest.cc b/services/network/trust_tokens/trust_token_database_owner_unittest.cc index 9dbf0336..c25a466 100644 --- a/services/network/trust_tokens/trust_token_database_owner_unittest.cc +++ b/services/network/trust_tokens/trust_token_database_owner_unittest.cc
@@ -3,7 +3,6 @@ // found in the LICENSE file. #include "services/network/trust_tokens/trust_token_database_owner.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/services/network/upload_progress_tracker_unittest.cc b/services/network/upload_progress_tracker_unittest.cc index 7922e46b..a49c47c 100644 --- a/services/network/upload_progress_tracker_unittest.cc +++ b/services/network/upload_progress_tracker_unittest.cc
@@ -9,6 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "net/base/upload_progress.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc index 1530c51f..74365833 100644 --- a/services/network/url_loader.cc +++ b/services/network/url_loader.cc
@@ -23,7 +23,6 @@ #include "base/ranges/algorithm.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/services/network/web_bundle/web_bundle_manager.cc b/services/network/web_bundle/web_bundle_manager.cc index 9d301110..09dfba95 100644 --- a/services/network/web_bundle/web_bundle_manager.cc +++ b/services/network/web_bundle/web_bundle_manager.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/metrics/histogram_functions.h" +#include "base/time/time.h" #include "components/web_package/web_bundle_utils.h" #include "mojo/public/cpp/bindings/remote.h" #include "services/network/network_context.h"
diff --git a/services/network/web_bundle/web_bundle_url_loader_factory.cc b/services/network/web_bundle/web_bundle_url_loader_factory.cc index 6c7c443..aad45e1 100644 --- a/services/network/web_bundle/web_bundle_url_loader_factory.cc +++ b/services/network/web_bundle/web_bundle_url_loader_factory.cc
@@ -6,6 +6,7 @@ #include "base/metrics/histogram_functions.h" #include "base/threading/sequenced_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "components/web_package/web_bundle_parser.h" #include "components/web_package/web_bundle_utils.h"
diff --git a/services/proxy_resolver/proxy_resolver_v8_tracing.cc b/services/proxy_resolver/proxy_resolver_v8_tracing.cc index 4390e878..63fc2ae 100644 --- a/services/proxy_resolver/proxy_resolver_v8_tracing.cc +++ b/services/proxy_resolver/proxy_resolver_v8_tracing.cc
@@ -21,6 +21,7 @@ #include "base/threading/thread_checker.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "net/base/ip_address.h" #include "net/base/net_errors.h"
diff --git a/services/resource_coordinator/memory_instrumentation/queued_request.h b/services/resource_coordinator/memory_instrumentation/queued_request.h index b3ecb75..013e73d 100644 --- a/services/resource_coordinator/memory_instrumentation/queued_request.h +++ b/services/resource_coordinator/memory_instrumentation/queued_request.h
@@ -11,6 +11,7 @@ #include <string> #include "base/containers/flat_map.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_request_args.h" #include "services/resource_coordinator/public/mojom/memory_instrumentation/memory_instrumentation.mojom.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/services/service_manager/background_service_manager.h b/services/service_manager/background_service_manager.h index 438791d..b7df2b3 100644 --- a/services/service_manager/background_service_manager.h +++ b/services/service_manager/background_service_manager.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "services/service_manager/public/cpp/manifest.h" #include "services/service_manager/public/mojom/connector.mojom.h"
diff --git a/services/service_manager/public/cpp/service_executable/service_executable_environment.h b/services/service_manager/public/cpp/service_executable/service_executable_environment.h index 4c32cc68..5a3aeb0 100644 --- a/services/service_manager/public/cpp/service_executable/service_executable_environment.h +++ b/services/service_manager/public/cpp/service_executable/service_executable_environment.h
@@ -6,6 +6,7 @@ #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_EXECUTABLE_SERVICE_EXECUTABLE_ENVIRONMENT_H_ #include "base/threading/thread.h" +#include "base/time/time.h" #include "mojo/core/embedder/scoped_ipc_support.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "services/service_manager/public/mojom/service.mojom.h"
diff --git a/services/service_manager/public/cpp/service_keepalive.cc b/services/service_manager/public/cpp/service_keepalive.cc index 7930c80843..6c0e0298 100644 --- a/services/service_manager/public/cpp/service_keepalive.cc +++ b/services/service_manager/public/cpp/service_keepalive.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/observer_list.h" -#include "base/task/post_task.h" #include "services/service_manager/public/cpp/service_receiver.h" namespace service_manager {
diff --git a/services/service_manager/public/cpp/service_keepalive.h b/services/service_manager/public/cpp/service_keepalive.h index 71416c4..4e5c58a8 100644 --- a/services/service_manager/public/cpp/service_keepalive.h +++ b/services/service_manager/public/cpp/service_keepalive.h
@@ -10,6 +10,7 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/observer_list_types.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/services/service_manager/service_process_launcher.cc b/services/service_manager/service_process_launcher.cc index 975482d..d26daacc 100644 --- a/services/service_manager/service_process_launcher.cc +++ b/services/service_manager/service_process_launcher.cc
@@ -22,7 +22,6 @@ #include "base/sequence_checker.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h"
diff --git a/services/tracing/perfetto/consumer_host.cc b/services/tracing/perfetto/consumer_host.cc index 6746da2a..3047934 100644 --- a/services/tracing/perfetto/consumer_host.cc +++ b/services/tracing/perfetto/consumer_host.cc
@@ -16,7 +16,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_log.h" #include "base/values.h"
diff --git a/services/tracing/perfetto/consumer_host_unittest.cc b/services/tracing/perfetto/consumer_host_unittest.cc index c3a321a7..5f658ea7 100644 --- a/services/tracing/perfetto/consumer_host_unittest.cc +++ b/services/tracing/perfetto/consumer_host_unittest.cc
@@ -15,7 +15,6 @@ #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/services/tracing/perfetto/perfetto_service.cc b/services/tracing/perfetto/perfetto_service.cc index f5fc293..2110c87 100644 --- a/services/tracing/perfetto/perfetto_service.cc +++ b/services/tracing/perfetto/perfetto_service.cc
@@ -13,7 +13,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/task/post_task.h" #include "build/build_config.h" #include "mojo/public/cpp/bindings/message.h" #include "services/tracing/perfetto/consumer_host.h"
diff --git a/services/tracing/public/cpp/perfetto/perfetto_traced_process.cc b/services/tracing/public/cpp/perfetto/perfetto_traced_process.cc index 7804551..f7eebd67 100644 --- a/services/tracing/public/cpp/perfetto/perfetto_traced_process.cc +++ b/services/tracing/public/cpp/perfetto/perfetto_traced_process.cc
@@ -8,7 +8,6 @@ #include "base/command_line.h" #include "base/no_destructor.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread_id_name_manager.h" #include "base/trace_event/trace_config.h"
diff --git a/services/tracing/public/cpp/perfetto/perfetto_tracing_backend.cc b/services/tracing/public/cpp/perfetto/perfetto_tracing_backend.cc index 558b90f8..92d9fd4d 100644 --- a/services/tracing/public/cpp/perfetto/perfetto_tracing_backend.cc +++ b/services/tracing/public/cpp/perfetto/perfetto_tracing_backend.cc
@@ -8,7 +8,6 @@ #include "base/containers/flat_set.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task/post_task.h" #include "base/tracing/tracing_tls.h" #include "build/build_config.h" #include "mojo/public/cpp/system/data_pipe_drainer.h"
diff --git a/services/tracing/public/cpp/perfetto/producer_client.cc b/services/tracing/public/cpp/perfetto/producer_client.cc index 0069ac0f..53a59334 100644 --- a/services/tracing/public/cpp/perfetto/producer_client.cc +++ b/services/tracing/public/cpp/perfetto/producer_client.cc
@@ -10,7 +10,6 @@ #include "base/containers/adapters.h" #include "base/metrics/histogram_functions.h" #include "base/process/process.h" -#include "base/task/post_task.h" #include "base/tracing/tracing_tls.h" #include "build/build_config.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/services/tracing/public/cpp/perfetto/trace_event_data_source_unittest.cc b/services/tracing/public/cpp/perfetto/trace_event_data_source_unittest.cc index 50b9a725..fbe1651 100644 --- a/services/tracing/public/cpp/perfetto/trace_event_data_source_unittest.cc +++ b/services/tracing/public/cpp/perfetto/trace_event_data_source_unittest.cc
@@ -21,7 +21,6 @@ #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/task/common/task_annotator.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/threading/thread_id_name_manager.h"
diff --git a/services/tracing/public/cpp/stack_sampling/stack_unwinder_android_unittest.cc b/services/tracing/public/cpp/stack_sampling/stack_unwinder_android_unittest.cc index f088b4d..efcf347c 100644 --- a/services/tracing/public/cpp/stack_sampling/stack_unwinder_android_unittest.cc +++ b/services/tracing/public/cpp/stack_sampling/stack_unwinder_android_unittest.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/profiler/stack_buffer.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h" #include "base/trace_event/cfi_backtrace_android.h"
diff --git a/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.h b/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.h index 224630e..9cc6bf1c 100644 --- a/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.h +++ b/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.h
@@ -20,6 +20,7 @@ #include "base/profiler/unwinder.h" #include "base/sequence_checker.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "services/tracing/public/cpp/buildflags.h" #include "services/tracing/public/cpp/perfetto/interning_index.h"
diff --git a/services/video_capture/video_capture_service_impl.cc b/services/video_capture/video_capture_service_impl.cc index fb9bba9..264a3197 100644 --- a/services/video_capture/video_capture_service_impl.cc +++ b/services/video_capture/video_capture_service_impl.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/feature_list.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/services/viz/public/cpp/compositing/frame_deadline_mojom_traits.cc b/services/viz/public/cpp/compositing/frame_deadline_mojom_traits.cc index 16c04910..65a9d2f 100644 --- a/services/viz/public/cpp/compositing/frame_deadline_mojom_traits.cc +++ b/services/viz/public/cpp/compositing/frame_deadline_mojom_traits.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "services/viz/public/cpp/compositing/frame_deadline_mojom_traits.h" +#include "base/time/time.h" namespace mojo {
diff --git a/services/viz/public/cpp/compositing/mojom_traits_perftest.cc b/services/viz/public/cpp/compositing/mojom_traits_perftest.cc index 21a8f0e7..d9931e4b 100644 --- a/services/viz/public/cpp/compositing/mojom_traits_perftest.cc +++ b/services/viz/public/cpp/compositing/mojom_traits_perftest.cc
@@ -6,6 +6,7 @@ #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" +#include "base/time/time.h" #include "components/viz/common/quads/compositor_frame.h" #include "components/viz/common/quads/solid_color_draw_quad.h" #include "components/viz/common/quads/texture_draw_quad.h"
diff --git a/services/viz/public/cpp/gpu/client_gpu_memory_buffer_manager.h b/services/viz/public/cpp/gpu/client_gpu_memory_buffer_manager.h index 22847985..018c3215 100644 --- a/services/viz/public/cpp/gpu/client_gpu_memory_buffer_manager.h +++ b/services/viz/public/cpp/gpu/client_gpu_memory_buffer_manager.h
@@ -14,6 +14,7 @@ #include "base/memory/unsafe_shared_memory_pool.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/services/viz/public/cpp/gpu/gpu_unittest.cc b/services/viz/public/cpp/gpu/gpu_unittest.cc index 2973522..39082d3 100644 --- a/services/viz/public/cpp/gpu/gpu_unittest.cc +++ b/services/viz/public/cpp/gpu/gpu_unittest.cc
@@ -14,6 +14,7 @@ #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "gpu/config/gpu_feature_info.h"
diff --git a/sql/sandboxed_vfs.h b/sql/sandboxed_vfs.h index fd787b1..b074659 100644 --- a/sql/sandboxed_vfs.h +++ b/sql/sandboxed_vfs.h
@@ -12,6 +12,7 @@ #include "base/component_export.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/sqlite/sqlite3.h"
diff --git a/storage/browser/blob/blob_builder_from_stream.cc b/storage/browser/blob/blob_builder_from_stream.cc index a39af4e..8abde34 100644 --- a/storage/browser/blob/blob_builder_from_stream.cc +++ b/storage/browser/blob/blob_builder_from_stream.cc
@@ -8,8 +8,8 @@ #include "base/containers/span.h" #include "base/guid.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "mojo/public/c/system/types.h" #include "mojo/public/cpp/bindings/associated_remote.h" #include "storage/browser/blob/blob_data_item.h"
diff --git a/storage/browser/blob/blob_builder_from_stream_unittest.cc b/storage/browser/blob/blob_builder_from_stream_unittest.cc index 050db95..134a614 100644 --- a/storage/browser/blob/blob_builder_from_stream_unittest.cc +++ b/storage/browser/blob/blob_builder_from_stream_unittest.cc
@@ -12,7 +12,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/rand_util.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/bind.h"
diff --git a/storage/browser/blob/blob_data_item.h b/storage/browser/blob/blob_data_item.h index aa681ac..138a038 100644 --- a/storage/browser/blob/blob_data_item.h +++ b/storage/browser/blob/blob_data_item.h
@@ -15,6 +15,7 @@ #include "base/containers/span.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" +#include "base/time/time.h" #include "components/services/storage/public/mojom/blob_storage_context.mojom.h" #include "net/base/io_buffer.h" #include "storage/browser/blob/shareable_file_reference.h"
diff --git a/storage/browser/blob/blob_impl.cc b/storage/browser/blob/blob_impl.cc index d46565a..6b65904 100644 --- a/storage/browser/blob/blob_impl.cc +++ b/storage/browser/blob/blob_impl.cc
@@ -12,8 +12,8 @@ #include "base/bind.h" #include "base/containers/span.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/remote.h" #include "net/base/io_buffer.h" #include "storage/browser/blob/blob_data_handle.h"
diff --git a/storage/browser/blob/blob_impl_unittest.cc b/storage/browser/blob/blob_impl_unittest.cc index 3b88a92..b67b6cf 100644 --- a/storage/browser/blob/blob_impl_unittest.cc +++ b/storage/browser/blob/blob_impl_unittest.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/storage/browser/blob/blob_reader.cc b/storage/browser/blob/blob_reader.cc index 78a6fbd..9a801c2 100644 --- a/storage/browser/blob/blob_reader.cc +++ b/storage/browser/blob/blob_reader.cc
@@ -15,7 +15,6 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/memory/ptr_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h"
diff --git a/storage/browser/blob/blob_registry_impl_unittest.cc b/storage/browser/blob/blob_registry_impl_unittest.cc index 8136834..6d84af4 100644 --- a/storage/browser/blob/blob_registry_impl_unittest.cc +++ b/storage/browser/blob/blob_registry_impl_unittest.cc
@@ -17,7 +17,6 @@ #include "base/memory/raw_ptr.h" #include "base/rand_util.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/storage/browser/blob/blob_storage_context.cc b/storage/browser/blob/blob_storage_context.cc index f6957653..147e2adc 100644 --- a/storage/browser/blob/blob_storage_context.cc +++ b/storage/browser/blob/blob_storage_context.cc
@@ -21,10 +21,10 @@ #include "base/numerics/safe_conversions.h" #include "base/numerics/safe_math.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/trace_event.h" #include "mojo/public/cpp/bindings/callback_helpers.h"
diff --git a/storage/browser/blob/blob_storage_context_mojo_unittest.cc b/storage/browser/blob/blob_storage_context_mojo_unittest.cc index f2b5409..589378ff 100644 --- a/storage/browser/blob/blob_storage_context_mojo_unittest.cc +++ b/storage/browser/blob/blob_storage_context_mojo_unittest.cc
@@ -12,13 +12,13 @@ #include "base/containers/span.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "components/services/storage/public/mojom/blob_storage_context.mojom.h" #include "mojo/public/cpp/base/big_buffer.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/storage/browser/blob/blob_transport_strategy_unittest.cc b/storage/browser/blob/blob_transport_strategy_unittest.cc index 0f24c79b..ffda454 100644 --- a/storage/browser/blob/blob_transport_strategy_unittest.cc +++ b/storage/browser/blob/blob_transport_strategy_unittest.cc
@@ -16,11 +16,11 @@ #include "base/files/scoped_temp_dir.h" #include "base/rand_util.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h" #include "base/threading/thread_restrictions.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "mojo/public/cpp/system/functions.h" #include "storage/browser/blob/blob_data_builder.h"
diff --git a/storage/browser/blob/write_blob_to_file.cc b/storage/browser/blob/write_blob_to_file.cc index 4fd0c3d3..758c964 100644 --- a/storage/browser/blob/write_blob_to_file.cc +++ b/storage/browser/blob/write_blob_to_file.cc
@@ -16,7 +16,6 @@ #include "base/files/file_util.h" #include "base/numerics/checked_math.h" #include "base/numerics/safe_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "storage/browser/blob/blob_data_handle.h"
diff --git a/storage/browser/database/database_tracker.cc b/storage/browser/database/database_tracker.cc index 1b4edd6..8abec7e 100644 --- a/storage/browser/database/database_tracker.cc +++ b/storage/browser/database/database_tracker.cc
@@ -23,7 +23,6 @@ #include "base/observer_list.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/time/time.h" #include "base/types/pass_key.h"
diff --git a/storage/browser/file_system/copy_or_move_operation_delegate_unittest.cc b/storage/browser/file_system/copy_or_move_operation_delegate_unittest.cc index b1efbca..feac816 100644 --- a/storage/browser/file_system/copy_or_move_operation_delegate_unittest.cc +++ b/storage/browser/file_system/copy_or_move_operation_delegate_unittest.cc
@@ -24,6 +24,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/services/filesystem/public/mojom/types.mojom.h" #include "storage/browser/file_system/copy_or_move_file_validator.h" #include "storage/browser/file_system/copy_or_move_operation_delegate.h"
diff --git a/storage/browser/file_system/file_stream_reader_test.h b/storage/browser/file_system/file_stream_reader_test.h index 745c49d..0bb8057 100644 --- a/storage/browser/file_system/file_stream_reader_test.h +++ b/storage/browser/file_system/file_stream_reader_test.h
@@ -10,6 +10,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h"
diff --git a/storage/browser/file_system/file_system_operation_impl_unittest.cc b/storage/browser/file_system/file_system_operation_impl_unittest.cc index ad64ef9..3d0405de 100644 --- a/storage/browser/file_system/file_system_operation_impl_unittest.cc +++ b/storage/browser/file_system/file_system_operation_impl_unittest.cc
@@ -21,6 +21,7 @@ #include "base/strings/stringprintf.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/services/filesystem/public/mojom/types.mojom.h" #include "storage/browser/blob/shareable_file_reference.h" #include "storage/browser/file_system/file_system_context.h"
diff --git a/storage/browser/file_system/filesystem_proxy_file_stream_reader_unittest.cc b/storage/browser/file_system/filesystem_proxy_file_stream_reader_unittest.cc index 417b141..8d953bbf 100644 --- a/storage/browser/file_system/filesystem_proxy_file_stream_reader_unittest.cc +++ b/storage/browser/file_system/filesystem_proxy_file_stream_reader_unittest.cc
@@ -21,6 +21,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h"
diff --git a/storage/browser/file_system/local_file_stream_reader_unittest.cc b/storage/browser/file_system/local_file_stream_reader_unittest.cc index 2e2ff8ea..c7396bd 100644 --- a/storage/browser/file_system/local_file_stream_reader_unittest.cc +++ b/storage/browser/file_system/local_file_stream_reader_unittest.cc
@@ -21,6 +21,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h"
diff --git a/storage/browser/file_system/local_file_stream_writer_unittest.cc b/storage/browser/file_system/local_file_stream_writer_unittest.cc index 1648557..53fc9bb 100644 --- a/storage/browser/file_system/local_file_stream_writer_unittest.cc +++ b/storage/browser/file_system/local_file_stream_writer_unittest.cc
@@ -15,6 +15,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h"
diff --git a/storage/browser/file_system/native_file_util.cc b/storage/browser/file_system/native_file_util.cc index 4d0f7df..d2ea763 100644 --- a/storage/browser/file_system/native_file_util.cc +++ b/storage/browser/file_system/native_file_util.cc
@@ -10,6 +10,7 @@ #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "storage/browser/file_system/file_system_operation_context.h"
diff --git a/storage/browser/file_system/plugin_private_file_system_backend.cc b/storage/browser/file_system/plugin_private_file_system_backend.cc index 735ecc19..f64ae7f 100644 --- a/storage/browser/file_system/plugin_private_file_system_backend.cc +++ b/storage/browser/file_system/plugin_private_file_system_backend.cc
@@ -19,6 +19,7 @@ #include "base/synchronization/lock.h" #include "base/task/task_runner_util.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "storage/browser/file_system/async_file_util_adapter.h" #include "storage/browser/file_system/file_system_context.h" #include "storage/browser/file_system/file_system_operation.h"
diff --git a/storage/browser/quota/quota_manager_impl.cc b/storage/browser/quota/quota_manager_impl.cc index 9ebc295c..b42cafc 100644 --- a/storage/browser/quota/quota_manager_impl.cc +++ b/storage/browser/quota/quota_manager_impl.cc
@@ -33,7 +33,6 @@ #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner_util.h"
diff --git a/storage/browser/quota/quota_settings.cc b/storage/browser/quota/quota_settings.cc index 3a55be13..c2a5a20 100644 --- a/storage/browser/quota/quota_settings.cc +++ b/storage/browser/quota/quota_settings.cc
@@ -13,7 +13,6 @@ #include "base/no_destructor.h" #include "base/rand_util.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" #include "build/build_config.h"
diff --git a/storage/browser/quota/quota_temporary_storage_evictor.h b/storage/browser/quota/quota_temporary_storage_evictor.h index b130c16..c07ffd7 100644 --- a/storage/browser/quota/quota_temporary_storage_evictor.h +++ b/storage/browser/quota/quota_temporary_storage_evictor.h
@@ -15,6 +15,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "components/services/storage/public/cpp/buckets/bucket_locator.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/storage/browser/quota/storage_policy_observer.cc b/storage/browser/quota/storage_policy_observer.cc index 884ade79..73dde9d 100644 --- a/storage/browser/quota/storage_policy_observer.cc +++ b/storage/browser/quota/storage_policy_observer.cc
@@ -7,7 +7,6 @@ #include <utility> #include "base/feature_list.h" -#include "base/task/post_task.h" #include "storage/browser/quota/quota_features.h" #include "url/origin.h"
diff --git a/storage/browser/test/mock_bytes_provider.h b/storage/browser/test/mock_bytes_provider.h index b678bbf..b5f0a2a 100644 --- a/storage/browser/test/mock_bytes_provider.h +++ b/storage/browser/test/mock_bytes_provider.h
@@ -6,6 +6,7 @@ #define STORAGE_BROWSER_TEST_MOCK_BYTES_PROVIDER_H_ #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "third_party/blink/public/mojom/blob/blob_registry.mojom.h" #include "third_party/blink/public/mojom/blob/data_element.mojom.h"
diff --git a/storage/browser/test/mock_quota_manager.h b/storage/browser/test/mock_quota_manager.h index 3eebf6c..fb51003 100644 --- a/storage/browser/test/mock_quota_manager.h +++ b/storage/browser/test/mock_quota_manager.h
@@ -13,6 +13,7 @@ #include <utility> #include <vector> +#include "base/time/time.h" #include "components/services/storage/public/mojom/quota_client.mojom.h" #include "storage/browser/quota/quota_client_type.h" #include "storage/browser/quota/quota_manager.h"
diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json index 1976030f..8008c7e 100644 --- a/testing/buildbot/chromium.android.fyi.json +++ b/testing/buildbot/chromium.android.fyi.json
@@ -9581,7 +9581,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M100", - "revision": "version:100.0.4896.65" + "revision": "version:100.0.4896.66" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -9665,7 +9665,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M101", - "revision": "version:101.0.4951.16" + "revision": "version:101.0.4951.18" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -10085,7 +10085,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M100", - "revision": "version:100.0.4896.65" + "revision": "version:100.0.4896.66" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -10169,7 +10169,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M101", - "revision": "version:101.0.4951.16" + "revision": "version:101.0.4951.18" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json index 90c98d56..6e5a30cc 100644 --- a/testing/buildbot/chromium.android.json +++ b/testing/buildbot/chromium.android.json
@@ -44881,7 +44881,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M100", - "revision": "version:100.0.4896.65" + "revision": "version:100.0.4896.66" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -44965,7 +44965,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M101", - "revision": "version:101.0.4951.16" + "revision": "version:101.0.4951.18" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -45385,7 +45385,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M100", - "revision": "version:100.0.4896.65" + "revision": "version:100.0.4896.66" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -45469,7 +45469,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M101", - "revision": "version:101.0.4951.16" + "revision": "version:101.0.4951.18" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -45893,7 +45893,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M100", - "revision": "version:100.0.4896.65" + "revision": "version:100.0.4896.66" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -45977,7 +45977,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M101", - "revision": "version:101.0.4951.16" + "revision": "version:101.0.4951.18" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -46397,7 +46397,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M100", - "revision": "version:100.0.4896.65" + "revision": "version:100.0.4896.66" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -46481,7 +46481,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M101", - "revision": "version:101.0.4951.16" + "revision": "version:101.0.4951.18" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -46972,7 +46972,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M100", - "revision": "version:100.0.4896.65" + "revision": "version:100.0.4896.66" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -47056,7 +47056,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M101", - "revision": "version:101.0.4951.16" + "revision": "version:101.0.4951.18" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -47476,7 +47476,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M100", - "revision": "version:100.0.4896.65" + "revision": "version:100.0.4896.66" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -47560,7 +47560,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M101", - "revision": "version:101.0.4951.16" + "revision": "version:101.0.4951.18" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -48051,7 +48051,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M100", - "revision": "version:100.0.4896.65" + "revision": "version:100.0.4896.66" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -48135,7 +48135,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M101", - "revision": "version:101.0.4951.16" + "revision": "version:101.0.4951.18" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -48555,7 +48555,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M100", - "revision": "version:100.0.4896.65" + "revision": "version:100.0.4896.66" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}", @@ -48639,7 +48639,7 @@ { "cipd_package": "chromium/testing/weblayer-x86", "location": "weblayer_instrumentation_test_M101", - "revision": "version:101.0.4951.16" + "revision": "version:101.0.4951.18" }, { "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 198535a..f6209c6 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json
@@ -5795,7 +5795,7 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4974.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4975.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "isolate_profile_data": true, @@ -5803,14 +5803,14 @@ "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_Lacros version skew testing ash 102.0.4974.0", + "name": "lacros_chrome_browsertests_Lacros version skew testing ash 102.0.4975.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v102.0.4974.0", - "revision": "version:102.0.4974.0" + "location": "lacros_version_skew_tests_v102.0.4975.0", + "revision": "version:102.0.4975.0" } ], "dimension_sets": [ @@ -5937,7 +5937,7 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4974.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4975.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "isolate_profile_data": true, @@ -5945,14 +5945,14 @@ "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 102.0.4974.0", + "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 102.0.4975.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v102.0.4974.0", - "revision": "version:102.0.4974.0" + "location": "lacros_version_skew_tests_v102.0.4975.0", + "revision": "version:102.0.4975.0" } ], "dimension_sets": [
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index 3a9f622..d926a50 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json
@@ -86115,7 +86115,7 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4974.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4975.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "isolate_profile_data": true, @@ -86123,14 +86123,14 @@ "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_Lacros version skew testing ash 102.0.4974.0", + "name": "lacros_chrome_browsertests_Lacros version skew testing ash 102.0.4975.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v102.0.4974.0", - "revision": "version:102.0.4974.0" + "location": "lacros_version_skew_tests_v102.0.4975.0", + "revision": "version:102.0.4975.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -86232,7 +86232,7 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4974.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4975.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "isolate_profile_data": true, @@ -86240,14 +86240,14 @@ "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 102.0.4974.0", + "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 102.0.4975.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v102.0.4974.0", - "revision": "version:102.0.4974.0" + "location": "lacros_version_skew_tests_v102.0.4975.0", + "revision": "version:102.0.4975.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -87614,21 +87614,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4974.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4975.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_Lacros version skew testing ash 102.0.4974.0", + "name": "lacros_chrome_browsertests_Lacros version skew testing ash 102.0.4975.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v102.0.4974.0", - "revision": "version:102.0.4974.0" + "location": "lacros_version_skew_tests_v102.0.4975.0", + "revision": "version:102.0.4975.0" } ], "dimension_sets": [ @@ -87756,21 +87756,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4974.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4975.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 102.0.4974.0", + "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 102.0.4975.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v102.0.4974.0", - "revision": "version:102.0.4974.0" + "location": "lacros_version_skew_tests_v102.0.4975.0", + "revision": "version:102.0.4975.0" } ], "dimension_sets": [ @@ -89311,21 +89311,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4974.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4975.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_Lacros version skew testing ash 102.0.4974.0", + "name": "lacros_chrome_browsertests_Lacros version skew testing ash 102.0.4975.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v102.0.4974.0", - "revision": "version:102.0.4974.0" + "location": "lacros_version_skew_tests_v102.0.4975.0", + "revision": "version:102.0.4975.0" } ], "dimension_sets": [ @@ -89453,21 +89453,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4974.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4975.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 102.0.4974.0", + "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 102.0.4975.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v102.0.4974.0", - "revision": "version:102.0.4974.0" + "location": "lacros_version_skew_tests_v102.0.4975.0", + "revision": "version:102.0.4975.0" } ], "dimension_sets": [ @@ -90204,21 +90204,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4974.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4975.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_Lacros version skew testing ash 102.0.4974.0", + "name": "lacros_chrome_browsertests_Lacros version skew testing ash 102.0.4975.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v102.0.4974.0", - "revision": "version:102.0.4974.0" + "location": "lacros_version_skew_tests_v102.0.4975.0", + "revision": "version:102.0.4975.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -90300,21 +90300,21 @@ }, { "args": [ - "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4974.0/test_ash_chrome", + "--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4975.0/test_ash_chrome", "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter" ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py" }, - "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 102.0.4974.0", + "name": "lacros_chrome_browsertests_run_in_series_Lacros version skew testing ash 102.0.4975.0", "swarming": { "can_use_on_swarming_builders": true, "cipd_packages": [ { "cipd_package": "chromium/testing/linux-ash-chromium/x86_64/ash.zip", - "location": "lacros_version_skew_tests_v102.0.4974.0", - "revision": "version:102.0.4974.0" + "location": "lacros_version_skew_tests_v102.0.4975.0", + "revision": "version:102.0.4975.0" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
diff --git a/testing/buildbot/internal.chromeos.fyi.json b/testing/buildbot/internal.chromeos.fyi.json index cc069f0..a96060f 100644 --- a/testing/buildbot/internal.chromeos.fyi.json +++ b/testing/buildbot/internal.chromeos.fyi.json
@@ -1218,7 +1218,7 @@ { "args": [], "cros_board": "strongbad", - "cros_img": "strongbad-release/R101-14583.0.0", + "cros_img": "strongbad-release/R102-14637.0.0", "name": "lacros_all_tast_tests_STRONGBAD_RELEASE_LKGM", "swarming": {}, "tast_expr": "(\"group:mainline\" && \"dep:lacros\" && !informational)", @@ -1229,7 +1229,7 @@ { "args": [], "cros_board": "strongbad", - "cros_img": "strongbad-release/R101-14588.11.0", + "cros_img": "strongbad-release/R101-14588.23.0", "name": "lacros_all_tast_tests_strongbad_RELEASE_DEV", "swarming": {}, "tast_expr": "(\"group:mainline\" && \"dep:lacros\" && !informational)", @@ -1251,7 +1251,7 @@ { "args": [], "cros_board": "strongbad", - "cros_img": "strongbad-release/R99-14469.58.0", + "cros_img": "strongbad-release/R99-14469.59.0", "name": "lacros_all_tast_tests_STRONGBAD_RELEASE_STABLE", "swarming": {}, "tast_expr": "(\"group:mainline\" && \"dep:lacros\" && !informational)", @@ -1262,7 +1262,7 @@ { "args": [], "cros_board": "strongbad", - "cros_img": "strongbad-release/R101-14583.0.0", + "cros_img": "strongbad-release/R102-14637.0.0", "name": "ozone_unittests_STRONGBAD_RELEASE_LKGM", "swarming": {}, "test": "ozone_unittests", @@ -1272,7 +1272,7 @@ { "args": [], "cros_board": "strongbad", - "cros_img": "strongbad-release/R101-14588.11.0", + "cros_img": "strongbad-release/R101-14588.23.0", "name": "ozone_unittests_strongbad_RELEASE_DEV", "swarming": {}, "test": "ozone_unittests", @@ -1292,7 +1292,7 @@ { "args": [], "cros_board": "strongbad", - "cros_img": "strongbad-release/R99-14469.58.0", + "cros_img": "strongbad-release/R99-14469.59.0", "name": "ozone_unittests_STRONGBAD_RELEASE_STABLE", "swarming": {}, "test": "ozone_unittests", @@ -1302,7 +1302,7 @@ { "args": [], "cros_board": "strongbad", - "cros_img": "strongbad-release/R101-14583.0.0", + "cros_img": "strongbad-release/R102-14637.0.0", "name": "viz_unittests_STRONGBAD_RELEASE_LKGM", "swarming": {}, "test": "viz_unittests", @@ -1312,7 +1312,7 @@ { "args": [], "cros_board": "strongbad", - "cros_img": "strongbad-release/R101-14588.11.0", + "cros_img": "strongbad-release/R101-14588.23.0", "name": "viz_unittests_strongbad_RELEASE_DEV", "swarming": {}, "test": "viz_unittests", @@ -1332,7 +1332,7 @@ { "args": [], "cros_board": "strongbad", - "cros_img": "strongbad-release/R99-14469.58.0", + "cros_img": "strongbad-release/R99-14469.59.0", "name": "viz_unittests_STRONGBAD_RELEASE_STABLE", "swarming": {}, "test": "viz_unittests",
diff --git a/testing/buildbot/variants.pyl b/testing/buildbot/variants.pyl index 55e6777..17a6cfb7 100644 --- a/testing/buildbot/variants.pyl +++ b/testing/buildbot/variants.pyl
@@ -28,16 +28,16 @@ }, 'LACROS_VERSION_SKEW_CANARY': { 'args': [ - '--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4974.0/test_ash_chrome', + '--ash-chrome-path-override=../../lacros_version_skew_tests_v102.0.4975.0/test_ash_chrome', '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.lacros_chrome_browsertests.skew.filter', ], - 'identifier': 'Lacros version skew testing ash 102.0.4974.0', + 'identifier': 'Lacros version skew testing ash 102.0.4975.0', 'swarming': { 'cipd_packages': [ { 'cipd_package': 'chromium/testing/linux-ash-chromium/x86_64/ash.zip', - 'location': 'lacros_version_skew_tests_v102.0.4974.0', - 'revision': 'version:102.0.4974.0', + 'location': 'lacros_version_skew_tests_v102.0.4975.0', + 'revision': 'version:102.0.4975.0', }, ], }, @@ -459,7 +459,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M101', - 'revision': 'version:101.0.4951.16', + 'revision': 'version:101.0.4951.18', } ], }, @@ -483,7 +483,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M100', - 'revision': 'version:100.0.4896.65', + 'revision': 'version:100.0.4896.66', } ], }, @@ -603,7 +603,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M101', - 'revision': 'version:101.0.4951.16', + 'revision': 'version:101.0.4951.18', } ], }, @@ -627,7 +627,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M100', - 'revision': 'version:100.0.4896.65', + 'revision': 'version:100.0.4896.66', } ], }, @@ -747,7 +747,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M101', - 'revision': 'version:101.0.4951.16', + 'revision': 'version:101.0.4951.18', } ], }, @@ -771,7 +771,7 @@ { 'cipd_package': 'chromium/testing/weblayer-x86', 'location': 'weblayer_instrumentation_test_M100', - 'revision': 'version:100.0.4896.65', + 'revision': 'version:100.0.4896.66', } ], }, @@ -1073,8 +1073,8 @@ 'CROS_STRONGBAD_RELEASE_LKGM': { 'skylab': { 'cros_board': 'strongbad', - 'cros_chrome_version': '101.0.4943.0', - 'cros_img': 'strongbad-release/R101-14583.0.0', + 'cros_chrome_version': '102.0.4964.0', + 'cros_img': 'strongbad-release/R102-14637.0.0', }, 'enabled': True, 'identifier': 'STRONGBAD_RELEASE_LKGM', @@ -1082,8 +1082,8 @@ 'CROS_STRONGBAD_RELEASE_DEV': { 'skylab': { 'cros_board': 'strongbad', - 'cros_chrome_version': '101.0.4951.6', - 'cros_img': 'strongbad-release/R101-14588.11.0', + 'cros_chrome_version': '101.0.4951.13', + 'cros_img': 'strongbad-release/R101-14588.23.0', }, 'enabled': True, 'identifier': 'strongbad_RELEASE_DEV', @@ -1100,8 +1100,8 @@ 'CROS_STRONGBAD_RELEASE_STABLE': { 'skylab': { 'cros_board': 'strongbad', - 'cros_chrome_version': '99.0.4844.86', - 'cros_img': 'strongbad-release/R99-14469.58.0', + 'cros_chrome_version': '99.0.4844.94', + 'cros_img': 'strongbad-release/R99-14469.59.0', }, 'enabled': True, 'identifier': 'STRONGBAD_RELEASE_STABLE',
diff --git a/testing/scripts/variations_smoke_test_data/http_server/images/logo_chrome_color_1x_web_32dp.png b/testing/scripts/variations_smoke_test_data/http_server/images/logo_chrome_color_1x_web_32dp.png new file mode 100644 index 0000000..9ccb148 --- /dev/null +++ b/testing/scripts/variations_smoke_test_data/http_server/images/logo_chrome_color_1x_web_32dp.png Binary files differ
diff --git a/testing/scripts/variations_smoke_test_data/http_server/index.html b/testing/scripts/variations_smoke_test_data/http_server/index.html index 81683dc0..35e34b69 100644 --- a/testing/scripts/variations_smoke_test_data/http_server/index.html +++ b/testing/scripts/variations_smoke_test_data/http_server/index.html
@@ -118,7 +118,7 @@ <table border="0" cellspacing="0" style="border-width:0px;border-collapse:collapse"> <tbody> <tr> -<td><a href="https://www.google.com/chrome" imageanchor="1" style="font-size:13.3333px;background-color:rgb(255,255,255)"><img alt="https://www.google.com/chrome" border="0" src="https://www.chromium.org/_/rsrc/1438811752264/chromium-projects/logo_chrome_color_1x_web_32dp.png" /></a></td> +<td><a href="https://www.google.com/chrome" imageanchor="1" style="font-size:13.3333px;background-color:rgb(255,255,255)"><img alt="https://www.google.com/chrome" border="0" src="images/logo_chrome_color_1x_web_32dp.png" /></a></td> <td style="padding:5px"><div style="display:block;text-align:left"><span style="font-size:10pt;background-color:transparent">Looking for Google Chrome?</span></div> <br /> <a href="https://www.google.com/chrome">Download Google Chrome</a></td> @@ -145,7 +145,7 @@ <table border="0" cellspacing="0" style="border-width:0px;border-collapse:collapse"> <tbody> <tr> -<td><div style="display:block;text-align:left"><a href="https://www.google.com/chromeos" imageanchor="1"><img alt="https://www.google.com/chromeos" border="0" src="https://www.chromium.org/_/rsrc/1438811752264/chromium-projects/logo_chrome_color_1x_web_32dp.png" /></a></div> +<td><div style="display:block;text-align:left"><a href="https://www.google.com/chromeos" imageanchor="1"><img alt="https://www.google.com/chromeos" border="0" src="images/logo_chrome_color_1x_web_32dp.png" /></a></div> </td> <td style="padding:5px">Looking for Google Chrome OS devices?<br /> <br />
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc index 6b82016..125bacd 100644 --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc
@@ -241,10 +241,6 @@ &kSharedStorageAPI, "MaxSharedStorageCacheSize", 1024}; const base::FeatureParam<int> kMaxSharedStorageInitTries = { &kSharedStorageAPI, "MaxSharedStorageInitTries", 2}; -const base::FeatureParam<int> - kMaxSharedStorageConsecutiveOperationErrorsAllowed = { - &kSharedStorageAPI, "MaxSharedStorageConsecutiveOperationErrorsAllowed", - 8}; const base::FeatureParam<base::TimeDelta> kSharedStorageStaleOriginPurgeInitialInterval = { &kSharedStorageAPI, "SharedStorageStaleOriginPurgeInitialInterval",
diff --git a/third_party/blink/common/frame/user_activation_state_unittest.cc b/third_party/blink/common/frame/user_activation_state_unittest.cc index a0e10d99..1e3d4df 100644 --- a/third_party/blink/common/frame/user_activation_state_unittest.cc +++ b/third_party/blink/common/frame/user_activation_state_unittest.cc
@@ -5,6 +5,7 @@ #include "third_party/blink/public/common/frame/user_activation_state.h" #include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace blink {
diff --git a/third_party/blink/common/input/web_coalesced_input_event_mojom_traits.cc b/third_party/blink/common/input/web_coalesced_input_event_mojom_traits.cc index 416933be..d761c02 100644 --- a/third_party/blink/common/input/web_coalesced_input_event_mojom_traits.cc +++ b/third_party/blink/common/input/web_coalesced_input_event_mojom_traits.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/i18n/char_iterator.h" +#include "base/time/time.h" #include "mojo/public/cpp/base/time_mojom_traits.h" #include "third_party/blink/public/common/input/web_gesture_event.h" #include "third_party/blink/public/common/input/web_keyboard_event.h"
diff --git a/third_party/blink/common/media/watch_time_component.cc b/third_party/blink/common/media/watch_time_component.cc index 2091652..94c80e8 100644 --- a/third_party/blink/common/media/watch_time_component.cc +++ b/third_party/blink/common/media/watch_time_component.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/public/common/media/watch_time_component.h" +#include "base/time/time.h" #include "third_party/blink/public/common/common_export.h" #include "third_party/blink/public/common/media/display_type.h"
diff --git a/third_party/blink/common/page/content_to_visible_time_reporter.cc b/third_party/blink/common/page/content_to_visible_time_reporter.cc index b64224e..caa5289 100644 --- a/third_party/blink/common/page/content_to_visible_time_reporter.cc +++ b/third_party/blink/common/page/content_to_visible_time_reporter.cc
@@ -13,6 +13,7 @@ #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/mojom/widget/record_content_to_visible_time_request.mojom.h"
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h index aaef3ea..f0b6f7e 100644 --- a/third_party/blink/public/common/features.h +++ b/third_party/blink/public/common/features.h
@@ -7,6 +7,7 @@ #include "base/feature_list.h" #include "base/metrics/field_trial_params.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/media_buildflags.h" #include "third_party/blink/public/common/buildflags.h" @@ -96,13 +97,6 @@ // Maximum number of tries to initialize the database. BLINK_COMMON_EXPORT extern const base::FeatureParam<int> kMaxSharedStorageInitTries; -// Maximum number of consecutive database errors allowed before the database is -// razed. Consecutive errors are tallied, and if the next database operation -// returns successfully, the consecutive error count is reset back to zero. If -// the consecutive error count exceeds the threshold, then the database is -// destroyed and recreated. -BLINK_COMMON_EXPORT extern const base::FeatureParam<int> - kMaxSharedStorageConsecutiveOperationErrorsAllowed; // The length of the initial interval from service startup after which // SharedStorageManager first checks for any stale origins, purging any that it // finds.
diff --git a/third_party/blink/public/common/frame/user_activation_state.h b/third_party/blink/public/common/frame/user_activation_state.h index 380165d2..259c1a5 100644 --- a/third_party/blink/public/common/frame/user_activation_state.h +++ b/third_party/blink/public/common/frame/user_activation_state.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_FRAME_USER_ACTIVATION_STATE_H_ #define THIRD_PARTY_BLINK_PUBLIC_COMMON_FRAME_USER_ACTIVATION_STATE_H_ +#include "base/time/time.h" #include "base/time/time_override.h" #include "third_party/blink/public/common/common_export.h" #include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-forward.h"
diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl index f482f75..b9f4424 100644 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
@@ -8262,6 +8262,19 @@ # Tree structure of reasons why the page could not be cached for each frame. optional BackForwardCacheNotRestoredExplanationTree notRestoredExplanationsTree + # List of FinalStatus reasons for Prerender2. + type PrerenderFinalStatus extends string + enum + Activated + + # Fired when a prerender attempt is completed. + event prerenderAttemptCompleted + parameters + # The frame id of the frame initiating prerendering. + FrameId initiatingFrameId + string prerenderingUrl + PrerenderFinalStatus finalStatus + event loadEventFired parameters Network.MonotonicTime timestamp
diff --git a/third_party/blink/public/platform/media/url_index.h b/third_party/blink/public/platform/media/url_index.h index e5aad8b..77ec652 100644 --- a/third_party/blink/public/platform/media/url_index.h +++ b/third_party/blink/public/platform/media/url_index.h
@@ -19,6 +19,7 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "third_party/blink/public/platform/media/multi_buffer.h" #include "third_party/blink/public/platform/web_common.h" #include "url/gurl.h"
diff --git a/third_party/blink/public/platform/web_blob_info.h b/third_party/blink/public/platform/web_blob_info.h index d15f3f3d..c61fd20 100644 --- a/third_party/blink/public/platform/web_blob_info.h +++ b/third_party/blink/public/platform/web_blob_info.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_BLOB_INFO_H_ #define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_BLOB_INFO_H_ +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/mojom/blob/blob.mojom-shared.h" #include "third_party/blink/public/platform/cross_variant_mojo_util.h"
diff --git a/third_party/blink/public/web/modules/mediastream/webmediaplayer_ms.h b/third_party/blink/public/web/modules/mediastream/webmediaplayer_ms.h index ccd7a757..4995567 100644 --- a/third_party/blink/public/web/modules/mediastream/webmediaplayer_ms.h +++ b/third_party/blink/public/web/modules/mediastream/webmediaplayer_ms.h
@@ -12,6 +12,7 @@ #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/renderers/paint_canvas_video_renderer.h" #include "media/video/gpu_video_accelerator_factories.h"
diff --git a/third_party/blink/renderer/bindings/core/v8/to_v8_traits_test.cc b/third_party/blink/renderer/bindings/core/v8/to_v8_traits_test.cc index 7181782..422ae29 100644 --- a/third_party/blink/renderer/bindings/core/v8/to_v8_traits_test.cc +++ b/third_party/blink/renderer/bindings/core/v8/to_v8_traits_test.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/bindings/core/v8/to_v8_traits.h" +#include "base/time/time.h" #include "third_party/blink/renderer/bindings/core/v8/v8_align_setting.h" #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_testing.h" #include "third_party/blink/renderer/bindings/core/v8/v8_create_html_callback.h"
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_wasm_response_extensions.cc b/third_party/blink/renderer/bindings/core/v8/v8_wasm_response_extensions.cc index 4cb540c..24d0689 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_wasm_response_extensions.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_wasm_response_extensions.cc
@@ -6,6 +6,7 @@ #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_macros.h" +#include "base/time/time.h" #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
diff --git a/third_party/blink/renderer/controller/highest_pmf_reporter.h b/third_party/blink/renderer/controller/highest_pmf_reporter.h index d5e2ff10..279de35c 100644 --- a/third_party/blink/renderer/controller/highest_pmf_reporter.h +++ b/third_party/blink/renderer/controller/highest_pmf_reporter.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CONTROLLER_HIGHEST_PMF_REPORTER_H_ #define THIRD_PARTY_BLINK_RENDERER_CONTROLLER_HIGHEST_PMF_REPORTER_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/controller/controller_export.h" #include "third_party/blink/renderer/controller/memory_usage_monitor.h" #include "third_party/blink/renderer/platform/timer.h"
diff --git a/third_party/blink/renderer/controller/highest_pmf_reporter_test.cc b/third_party/blink/renderer/controller/highest_pmf_reporter_test.cc index 90a3927..0b9b655 100644 --- a/third_party/blink/renderer/controller/highest_pmf_reporter_test.cc +++ b/third_party/blink/renderer/controller/highest_pmf_reporter_test.cc
@@ -8,6 +8,7 @@ #include "base/memory/ptr_util.h" #include "base/test/test_mock_time_task_runner.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/common/features.h"
diff --git a/third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h b/third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h index 3bd0176..51001a22 100644 --- a/third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h +++ b/third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CONTROLLER_USER_LEVEL_MEMORY_PRESSURE_SIGNAL_GENERATOR_H_ #define THIRD_PARTY_BLINK_RENDERER_CONTROLLER_USER_LEVEL_MEMORY_PRESSURE_SIGNAL_GENERATOR_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/controller/controller_export.h" #include "third_party/blink/renderer/controller/memory_usage_monitor.h" #include "third_party/blink/renderer/platform/scheduler/public/rail_mode_observer.h"
diff --git a/third_party/blink/renderer/core/animation/animation_clock.h b/third_party/blink/renderer/core/animation/animation_clock.h index abf6727..0fc98b6 100644 --- a/third_party/blink/renderer/core/animation/animation_clock.h +++ b/third_party/blink/renderer/core/animation/animation_clock.h
@@ -34,6 +34,7 @@ #include <limits> #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
diff --git a/third_party/blink/renderer/core/animation/animation_timeline.h b/third_party/blink/renderer/core/animation/animation_timeline.h index d3cd9ce..68d88d7f 100644 --- a/third_party/blink/renderer/core/animation/animation_timeline.h +++ b/third_party/blink/renderer/core/animation/animation_timeline.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_ANIMATION_ANIMATION_TIMELINE_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_ANIMATION_ANIMATION_TIMELINE_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/core/animation/animation.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/css/cssom/css_numeric_value.h"
diff --git a/third_party/blink/renderer/core/animation/compositor_animations.h b/third_party/blink/renderer/core/animation/compositor_animations.h index ea225fd..405e837 100644 --- a/third_party/blink/renderer/core/animation/compositor_animations.h +++ b/third_party/blink/renderer/core/animation/compositor_animations.h
@@ -32,6 +32,7 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_ANIMATION_COMPOSITOR_ANIMATIONS_H_ #include <memory> +#include "base/time/time.h" #include "cc/animation/keyframe_model.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/core/animation/effect_model.h"
diff --git a/third_party/blink/renderer/core/animation/document_timeline.h b/third_party/blink/renderer/core/animation/document_timeline.h index 251758f..a1c5ef8 100644 --- a/third_party/blink/renderer/core/animation/document_timeline.h +++ b/third_party/blink/renderer/core/animation/document_timeline.h
@@ -32,6 +32,7 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_ANIMATION_DOCUMENT_TIMELINE_H_ #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "third_party/blink/public/platform/task_type.h" #include "third_party/blink/renderer/core/animation/animation_timeline.h" #include "third_party/blink/renderer/core/core_export.h"
diff --git a/third_party/blink/renderer/core/animation/scroll_timeline.h b/third_party/blink/renderer/core/animation/scroll_timeline.h index 88805ead..ac5def5 100644 --- a/third_party/blink/renderer/core/animation/scroll_timeline.h +++ b/third_party/blink/renderer/core/animation/scroll_timeline.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_ANIMATION_SCROLL_TIMELINE_H_ #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "third_party/blink/renderer/bindings/core/v8/v8_typedefs.h" #include "third_party/blink/renderer/core/animation/animation_timeline.h" #include "third_party/blink/renderer/core/animation/scroll_timeline_offset.h"
diff --git a/third_party/blink/renderer/core/content_capture/content_capture_manager.h b/third_party/blink/renderer/core/content_capture/content_capture_manager.h index 1ef7d2f..16ec034 100644 --- a/third_party/blink/renderer/core/content_capture/content_capture_manager.h +++ b/third_party/blink/renderer/core/content_capture/content_capture_manager.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_CONTENT_CAPTURE_CONTENT_CAPTURE_MANAGER_H_ #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "third_party/blink/public/common/input/web_input_event.h" #include "third_party/blink/renderer/core/content_capture/content_capture_task.h" #include "third_party/blink/renderer/core/core_export.h"
diff --git a/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.h b/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.h index d8c74da5..d24afce 100644 --- a/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.h +++ b/third_party/blink/renderer/core/content_capture/content_capture_task_histogram_reporter.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CONTENT_CAPTURE_CONTENT_CAPTURE_TASK_HISTOGRAM_REPORTER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_CONTENT_CAPTURE_CONTENT_CAPTURE_TASK_HISTOGRAM_REPORTER_H_ +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/instrumentation/histogram.h"
diff --git a/third_party/blink/renderer/core/css/remote_font_face_source.h b/third_party/blink/renderer/core/css/remote_font_face_source.h index 2b8c87b1..7744db3 100644 --- a/third_party/blink/renderer/core/css/remote_font_face_source.h +++ b/third_party/blink/renderer/core/css/remote_font_face_source.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_CSS_REMOTE_FONT_FACE_SOURCE_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_CSS_REMOTE_FONT_FACE_SOURCE_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/core/css/css_font_face_source.h" #include "third_party/blink/renderer/core/execution_context/security_context.h" #include "third_party/blink/renderer/core/loader/resource/font_resource.h"
diff --git a/third_party/blink/renderer/core/dom/document_parser_timing.h b/third_party/blink/renderer/core/dom/document_parser_timing.h index 1e764004..44f53eb9 100644 --- a/third_party/blink/renderer/core/dom/document_parser_timing.h +++ b/third_party/blink/renderer/core/dom/document_parser_timing.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_DOM_DOCUMENT_PARSER_TIMING_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_DOM_DOCUMENT_PARSER_TIMING_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/supplementable.h"
diff --git a/third_party/blink/renderer/core/dom/document_test.cc b/third_party/blink/renderer/core/dom/document_test.cc index 00cb075..443c8c8 100644 --- a/third_party/blink/renderer/core/dom/document_test.cc +++ b/third_party/blink/renderer/core/dom/document_test.cc
@@ -32,6 +32,7 @@ #include <memory> +#include "base/time/time.h" #include "build/build_config.h" #include "components/ukm/test_ukm_recorder.h" #include "services/network/public/mojom/referrer_policy.mojom-blink.h"
diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_party/blink/renderer/core/dom/events/event_target.cc index 24d968b..d0c1c80 100644 --- a/third_party/blink/renderer/core/dom/events/event_target.cc +++ b/third_party/blink/renderer/core/dom/events/event_target.cc
@@ -34,6 +34,7 @@ #include <memory> #include "base/format_macros.h" +#include "base/time/time.h" #include "third_party/blink/public/web/web_settings.h" #include "third_party/blink/renderer/bindings/core/v8/js_based_event_listener.h" #include "third_party/blink/renderer/bindings/core/v8/js_event_listener.h"
diff --git a/third_party/blink/renderer/core/editing/editing_strategy.cc b/third_party/blink/renderer/core/editing/editing_strategy.cc index dba3577..06788262 100644 --- a/third_party/blink/renderer/core/editing/editing_strategy.cc +++ b/third_party/blink/renderer/core/editing/editing_strategy.cc
@@ -41,15 +41,15 @@ LayoutText* layout_object = To<Text>(node).GetLayoutObject(); // ::first-letter - if (IsA<LayoutTextFragment>(layout_object)) { - LayoutTextFragment* layout_text_fragment = - To<LayoutTextFragment>(layout_object); - return layout_text_fragment->Start() + - layout_text_fragment->CaretMaxOffset(); + if (auto* first_letter_remaining_part = + DynamicTo<LayoutTextFragment>(layout_object)) { + return first_letter_remaining_part->Start() + + first_letter_remaining_part->CaretMaxOffset(); } return layout_object->CaretMaxOffset(); } + // For containers return the number of children. For others do the same as // above. return LastOffsetForEditing(&node);
diff --git a/third_party/blink/renderer/core/editing/finder/async_find_buffer.h b/third_party/blink/renderer/core/editing/finder/async_find_buffer.h index 9a8bc48..a744b28 100644 --- a/third_party/blink/renderer/core/editing/finder/async_find_buffer.h +++ b/third_party/blink/renderer/core/editing/finder/async_find_buffer.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_EDITING_FINDER_ASYNC_FIND_BUFFER_H_ #include "base/callback.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/editing/finder/find_buffer_runner.h" #include "third_party/blink/renderer/core/editing/finder/find_options.h" #include "third_party/blink/renderer/core/editing/forward.h"
diff --git a/third_party/blink/renderer/core/editing/finder/find_buffer.cc b/third_party/blink/renderer/core/editing/finder/find_buffer.cc index d3e26b2..840d1c47 100644 --- a/third_party/blink/renderer/core/editing/finder/find_buffer.cc +++ b/third_party/blink/renderer/core/editing/finder/find_buffer.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/core/editing/finder/find_buffer.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/css/style_change_reason.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/dom/node_computed_style.h"
diff --git a/third_party/blink/renderer/core/editing/finder/find_task_controller.h b/third_party/blink/renderer/core/editing/finder/find_task_controller.h index 511db2a..92306d3 100644 --- a/third_party/blink/renderer/core/editing/finder/find_task_controller.h +++ b/third_party/blink/renderer/core/editing/finder/find_task_controller.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_EDITING_FINDER_FIND_TASK_CONTROLLER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_EDITING_FINDER_FIND_TASK_CONTROLLER_H_ +#include "base/time/time.h" #include "third_party/blink/public/mojom/frame/find_in_page.mojom-blink-forward.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/editing/position.h"
diff --git a/third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.cc b/third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.cc index 174cf536..1618331 100644 --- a/third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.cc +++ b/third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.h" +#include "base/time/time.h" #include "third_party/blink/public/platform/task_type.h" #include "third_party/blink/renderer/bindings/core/v8/v8_idle_request_options.h" #include "third_party/blink/renderer/core/editing/commands/undo_stack.h"
diff --git a/third_party/blink/renderer/core/exported/web_media_player_impl_unittest.cc b/third_party/blink/renderer/core/exported/web_media_player_impl_unittest.cc index aca23cfc..a4eef19 100644 --- a/third_party/blink/renderer/core/exported/web_media_player_impl_unittest.cc +++ b/third_party/blink/renderer/core/exported/web_media_player_impl_unittest.cc
@@ -27,6 +27,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/trace_event/memory_dump_manager.h" #include "build/build_config.h" #include "cc/layers/layer.h"
diff --git a/third_party/blink/renderer/core/exported/web_page_popup_impl.h b/third_party/blink/renderer/core/exported/web_page_popup_impl.h index 2edfe52..2c93a52 100644 --- a/third_party/blink/renderer/core/exported/web_page_popup_impl.h +++ b/third_party/blink/renderer/core/exported/web_page_popup_impl.h
@@ -31,6 +31,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_EXPORTED_WEB_PAGE_POPUP_IMPL_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_EXPORTED_WEB_PAGE_POPUP_IMPL_H_ +#include "base/time/time.h" #include "build/build_config.h" #include "mojo/public/cpp/bindings/associated_remote.h" #include "third_party/blink/public/mojom/input/pointer_lock_context.mojom-blink-forward.h"
diff --git a/third_party/blink/renderer/core/fetch/fetch_response_data.h b/third_party/blink/renderer/core/fetch/fetch_response_data.h index f28bdca..890fd0b8 100644 --- a/third_party/blink/renderer/core/fetch/fetch_response_data.h +++ b/third_party/blink/renderer/core/fetch/fetch_response_data.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "net/http/http_response_info.h" #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink-forward.h"
diff --git a/third_party/blink/renderer/core/fileapi/file_test.cc b/third_party/blink/renderer/core/fileapi/file_test.cc index ca5f310..853f16cf 100644 --- a/third_party/blink/renderer/core/fileapi/file_test.cc +++ b/third_party/blink/renderer/core/fileapi/file_test.cc
@@ -5,9 +5,9 @@ #include "third_party/blink/renderer/core/fileapi/file.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/receiver_set.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/core/fragment_directive/text_fragment_anchor_metrics.h b/third_party/blink/renderer/core/fragment_directive/text_fragment_anchor_metrics.h index c1228045..e5927ca 100644 --- a/third_party/blink/renderer/core/fragment_directive/text_fragment_anchor_metrics.h +++ b/third_party/blink/renderer/core/fragment_directive/text_fragment_anchor_metrics.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAGMENT_DIRECTIVE_TEXT_FRAGMENT_ANCHOR_METRICS_H_ #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/fragment_directive/text_fragment_selector.h"
diff --git a/third_party/blink/renderer/core/fragment_directive/text_fragment_selector_generator.h b/third_party/blink/renderer/core/fragment_directive/text_fragment_selector_generator.h index a6e85ba1..b01eb4e0 100644 --- a/third_party/blink/renderer/core/fragment_directive/text_fragment_selector_generator.h +++ b/third_party/blink/renderer/core/fragment_directive/text_fragment_selector_generator.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAGMENT_DIRECTIVE_TEXT_FRAGMENT_SELECTOR_GENERATOR_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAGMENT_DIRECTIVE_TEXT_FRAGMENT_SELECTOR_GENERATOR_H_ +#include "base/time/time.h" #include "components/shared_highlighting/core/common/shared_highlighting_metrics.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/core/core_export.h"
diff --git a/third_party/blink/renderer/core/frame/frame_serializer.cc b/third_party/blink/renderer/core/frame/frame_serializer.cc index 542bfc1..b7ce837 100644 --- a/third_party/blink/renderer/core/frame/frame_serializer.cc +++ b/third_party/blink/renderer/core/frame/frame_serializer.cc
@@ -32,6 +32,7 @@ #include "base/metrics/histogram.h" #include "base/metrics/histogram_functions.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/css/css_font_face_rule.h" #include "third_party/blink/renderer/core/css/css_font_face_src_value.h" #include "third_party/blink/renderer/core/css/css_image_value.h"
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h index e2a7640..224194b 100644 --- a/third_party/blink/renderer/core/frame/local_frame.h +++ b/third_party/blink/renderer/core/frame/local_frame.h
@@ -33,6 +33,7 @@ #include "base/gtest_prod_util.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "build/build_config.h" #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h index 6658e44e..420d82e 100644 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
@@ -36,6 +36,7 @@ #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/receiver_set.h"
diff --git a/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.h b/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.h index bec7258..cc020cb5 100644 --- a/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.h +++ b/third_party/blink/renderer/core/frame/local_frame_ukm_aggregator.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_LOCAL_FRAME_UKM_AGGREGATOR_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_LOCAL_FRAME_UKM_AGGREGATOR_H_ +#include "base/time/time.h" #include "cc/metrics/frame_sequence_tracker_collection.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/instrumentation/histogram.h"
diff --git a/third_party/blink/renderer/core/frame/local_frame_view.h b/third_party/blink/renderer/core/frame/local_frame_view.h index d26edd28..cbf91e0 100644 --- a/third_party/blink/renderer/core/frame/local_frame_view.h +++ b/third_party/blink/renderer/core/frame/local_frame_view.h
@@ -31,6 +31,7 @@ #include "base/callback_forward.h" #include "base/dcheck_is_on.h" #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "third_party/blink/public/common/metrics/document_update_reason.h" #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink-forward.h" #include "third_party/blink/public/mojom/frame/viewport_intersection_state.mojom-blink-forward.h"
diff --git a/third_party/blink/renderer/core/frame/mhtml_archive_test.cc b/third_party/blink/renderer/core/frame/mhtml_archive_test.cc index 6788797..1ae4c4bc 100644 --- a/third_party/blink/renderer/core/frame/mhtml_archive_test.cc +++ b/third_party/blink/renderer/core/frame/mhtml_archive_test.cc
@@ -31,6 +31,7 @@ #include "third_party/blink/renderer/platform/mhtml/mhtml_archive.h" #include "base/test/metrics/histogram_tester.h" +#include "base/time/time.h" #include "build/build_config.h" #include "services/network/public/cpp/is_potentially_trustworthy.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/core/frame/performance_monitor.h b/third_party/blink/renderer/core/frame/performance_monitor.h index cc1a287e..e7a5e3b 100644 --- a/third_party/blink/renderer/core/frame/performance_monitor.h +++ b/third_party/blink/renderer/core/frame/performance_monitor.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_PERFORMANCE_MONITOR_H_ #include "base/task/sequence_manager/task_time_observer.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/platform/heap/collection_support/heap_hash_map.h"
diff --git a/third_party/blink/renderer/core/frame/reporting_context_test.cc b/third_party/blink/renderer/core/frame/reporting_context_test.cc index a356df6ab..f4af2b6 100644 --- a/third_party/blink/renderer/core/frame/reporting_context_test.cc +++ b/third_party/blink/renderer/core/frame/reporting_context_test.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/core/frame/reporting_context.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/common/browser_interface_broker_proxy.h" #include "third_party/blink/renderer/core/frame/deprecation/deprecation_report_body.h"
diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.h b/third_party/blink/renderer/core/frame/web_frame_widget_impl.h index aeb08fd..788708961 100644 --- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.h +++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.h
@@ -33,6 +33,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "base/types/pass_key.h" #include "build/build_config.h" #include "cc/input/event_listener_properties.h"
diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h index b54e89c..f4679a3 100644 --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.h
@@ -9,6 +9,7 @@ #include "base/location.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "services/metrics/public/cpp/ukm_source_id.h" #include "third_party/blink/public/common/privacy_budget/identifiable_token.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
diff --git a/third_party/blink/renderer/core/html/html_element.cc b/third_party/blink/renderer/core/html/html_element.cc index 9a1c0869..16fff22 100644 --- a/third_party/blink/renderer/core/html/html_element.cc +++ b/third_party/blink/renderer/core/html/html_element.cc
@@ -1901,7 +1901,17 @@ node = FlatTreeTraversal::NextSkippingChildren(*node, this); continue; } + node->SetCachedDirectionality(direction); + if (auto* slot = ToHTMLSlotElementIfSupportsAssignmentOrNull(node)) { + ShadowRoot* root = slot->ContainingShadowRoot(); + // Defer to update the directionality of slot's descendant to avoid + // recalcuating slot assignment in FlatTreeTraversal when updating slot. + if (root->NeedsSlotAssignmentRecalc()) { + node = FlatTreeTraversal::NextSkippingChildren(*node, this); + continue; + } + } } node = FlatTreeTraversal::Next(*node, this); }
diff --git a/third_party/blink/renderer/core/html/media/autoplay_uma_helper.h b/third_party/blink/renderer/core/html/media/autoplay_uma_helper.h index 39ec88e..7d8c8f04 100644 --- a/third_party/blink/renderer/core/html/media/autoplay_uma_helper.h +++ b/third_party/blink/renderer/core/html/media/autoplay_uma_helper.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_HTML_MEDIA_AUTOPLAY_UMA_HELPER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_HTML_MEDIA_AUTOPLAY_UMA_HELPER_H_ +#include "base/time/time.h" #include "third_party/blink/public/platform/web_media_player_client.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/dom/events/native_event_listener.h"
diff --git a/third_party/blink/renderer/core/html/media/html_media_element_event_listeners_test.cc b/third_party/blink/renderer/core/html/media/html_media_element_event_listeners_test.cc index 584fd51..5fbdcb5 100644 --- a/third_party/blink/renderer/core/html/media/html_media_element_event_listeners_test.cc +++ b/third_party/blink/renderer/core/html/media/html_media_element_event_listeners_test.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <memory> +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/platform/web_fullscreen_video_status.h"
diff --git a/third_party/blink/renderer/core/input/event_handler.h b/third_party/blink/renderer/core/input/event_handler.h index 8c862939..f9b8c39 100644 --- a/third_party/blink/renderer/core/input/event_handler.h +++ b/third_party/blink/renderer/core/input/event_handler.h
@@ -28,6 +28,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/input/web_input_event.h" #include "third_party/blink/public/common/input/web_menu_source_type.h"
diff --git a/third_party/blink/renderer/core/input/mouse_event_manager.h b/third_party/blink/renderer/core/input/mouse_event_manager.h index 61897820..ba8362c 100644 --- a/third_party/blink/renderer/core/input/mouse_event_manager.h +++ b/third_party/blink/renderer/core/input/mouse_event_manager.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INPUT_MOUSE_EVENT_MANAGER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INPUT_MOUSE_EVENT_MANAGER_H_ +#include "base/time/time.h" #include "third_party/blink/public/common/input/pointer_id.h" #include "third_party/blink/public/common/input/web_mouse_event.h" #include "third_party/blink/public/platform/web_input_event_result.h"
diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.h b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.h index d543d25..65ef9a3 100644 --- a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_EMULATION_AGENT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_INSPECTOR_INSPECTOR_EMULATION_AGENT_H_ +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" #include "third_party/blink/public/platform/web_theme_engine.h"
diff --git a/third_party/blink/renderer/core/inspector/inspector_performance_agent.h b/third_party/blink/renderer/core/inspector/inspector_performance_agent.h index d366286..fd13fa5 100644 --- a/third_party/blink/renderer/core/inspector/inspector_performance_agent.h +++ b/third_party/blink/renderer/core/inspector/inspector_performance_agent.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/task/sequence_manager/task_time_observer.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/inspector/inspector_base_agent.h" #include "third_party/blink/renderer/core/inspector/protocol/performance.h"
diff --git a/third_party/blink/renderer/core/intersection_observer/element_intersection_observer_data.cc b/third_party/blink/renderer/core/intersection_observer/element_intersection_observer_data.cc index 129ca18..1c100944 100644 --- a/third_party/blink/renderer/core/intersection_observer/element_intersection_observer_data.cc +++ b/third_party/blink/renderer/core/intersection_observer/element_intersection_observer_data.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/core/intersection_observer/element_intersection_observer_data.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/intersection_observer/intersection_observation.h" #include "third_party/blink/renderer/core/intersection_observer/intersection_observer.h"
diff --git a/third_party/blink/renderer/core/intersection_observer/intersection_observer.cc b/third_party/blink/renderer/core/intersection_observer/intersection_observer.cc index cf0bd7c..3aef0ba 100644 --- a/third_party/blink/renderer/core/intersection_observer/intersection_observer.cc +++ b/third_party/blink/renderer/core/intersection_observer/intersection_observer.cc
@@ -8,6 +8,7 @@ #include <limits> #include "base/numerics/clamped_math.h" +#include "base/time/time.h" #include "third_party/blink/public/mojom/web_feature/web_feature.mojom-blink.h" #include "third_party/blink/renderer/bindings/core/v8/v8_intersection_observer_callback.h" #include "third_party/blink/renderer/bindings/core/v8/v8_intersection_observer_delegate.h"
diff --git a/third_party/blink/renderer/core/layout/layout_progress.h b/third_party/blink/renderer/core/layout/layout_progress.h index 105013c..eef9d69 100644 --- a/third_party/blink/renderer/core/layout/layout_progress.h +++ b/third_party/blink/renderer/core/layout/layout_progress.h
@@ -21,6 +21,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_LAYOUT_PROGRESS_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_LAYOUT_PROGRESS_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/layout/layout_block_flow.h"
diff --git a/third_party/blink/renderer/core/layout/layout_shift_tracker.h b/third_party/blink/renderer/core/layout/layout_shift_tracker.h index 483cfb96d..3971505 100644 --- a/third_party/blink/renderer/core/layout/layout_shift_tracker.h +++ b/third_party/blink/renderer/core/layout/layout_shift_tracker.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_LAYOUT_SHIFT_TRACKER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_LAYOUT_LAYOUT_SHIFT_TRACKER_H_ +#include "base/time/time.h" #include "cc/base/region.h" #include "third_party/blink/public/platform/web_vector.h" #include "third_party/blink/renderer/core/core_export.h"
diff --git a/third_party/blink/renderer/core/layout/layout_view.cc b/third_party/blink/renderer/core/layout/layout_view.cc index 4a29e45..4d8b214 100644 --- a/third_party/blink/renderer/core/layout/layout_view.cc +++ b/third_party/blink/renderer/core/layout/layout_view.cc
@@ -23,6 +23,7 @@ #include <inttypes.h> +#include "base/time/time.h" #include "build/build_config.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/mojom/scroll/scrollbar_mode.mojom-blink.h"
diff --git a/third_party/blink/renderer/core/loader/document_load_timing_test.cc b/third_party/blink/renderer/core/loader/document_load_timing_test.cc index 890494a..7a399d4 100644 --- a/third_party/blink/renderer/core/loader/document_load_timing_test.cc +++ b/third_party/blink/renderer/core/loader/document_load_timing_test.cc
@@ -5,6 +5,7 @@ #include "third_party/blink/renderer/core/loader/document_load_timing.h" #include <memory> +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/loader/document_loader.h"
diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h index 14807e2..6ea8710 100644 --- a/third_party/blink/renderer/core/loader/document_loader.h +++ b/third_party/blink/renderer/core/loader/document_loader.h
@@ -33,6 +33,7 @@ #include <memory> #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "mojo/public/cpp/base/big_buffer.h" #include "mojo/public/cpp/bindings/shared_remote.h"
diff --git a/third_party/blink/renderer/core/loader/http_refresh_scheduler.h b/third_party/blink/renderer/core/loader/http_refresh_scheduler.h index 44da27ac..188f0137 100644 --- a/third_party/blink/renderer/core/loader/http_refresh_scheduler.h +++ b/third_party/blink/renderer/core/loader/http_refresh_scheduler.h
@@ -34,6 +34,7 @@ #include <memory> +#include "base/time/time.h" #include "third_party/blink/public/web/web_frame_load_type.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/dom/document.h"
diff --git a/third_party/blink/renderer/core/loader/idleness_detector.h b/third_party/blink/renderer/core/loader/idleness_detector.h index b4dbca0..7a2ec8a1 100644 --- a/third_party/blink/renderer/core/loader/idleness_detector.h +++ b/third_party/blink/renderer/core/loader/idleness_detector.h
@@ -7,6 +7,7 @@ #include "base/task/sequence_manager/task_time_observer.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/timer.h"
diff --git a/third_party/blink/renderer/core/loader/idleness_detector_test.cc b/third_party/blink/renderer/core/loader/idleness_detector_test.cc index 287424f..8b02a0f6 100644 --- a/third_party/blink/renderer/core/loader/idleness_detector_test.cc +++ b/third_party/blink/renderer/core/loader/idleness_detector_test.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/core/loader/idleness_detector.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/testing/page_test_base.h"
diff --git a/third_party/blink/renderer/core/loader/interactive_detector_test.cc b/third_party/blink/renderer/core/loader/interactive_detector_test.cc index 37b4d8d..c496366 100644 --- a/third_party/blink/renderer/core/loader/interactive_detector_test.cc +++ b/third_party/blink/renderer/core/loader/interactive_detector_test.cc
@@ -6,6 +6,7 @@ #include "base/callback_helpers.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/loader/interactive_detector.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/core/loader/long_task_detector.cc b/third_party/blink/renderer/core/loader/long_task_detector.cc index d4d4557..a1b6da84 100644 --- a/third_party/blink/renderer/core/loader/long_task_detector.cc +++ b/third_party/blink/renderer/core/loader/long_task_detector.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/core/loader/long_task_detector.h" +#include "base/time/time.h" #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/renderer/platform/scheduler/public/thread.h" #include "third_party/blink/renderer/platform/wtf/wtf.h"
diff --git a/third_party/blink/renderer/core/loader/long_task_detector_test.cc b/third_party/blink/renderer/core/loader/long_task_detector_test.cc index fb88b59..d8bedae 100644 --- a/third_party/blink/renderer/core/loader/long_task_detector_test.cc +++ b/third_party/blink/renderer/core/loader/long_task_detector_test.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/core/loader/long_task_detector.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/scheduler/public/post_cross_thread_task.h" #include "third_party/blink/renderer/platform/testing/testing_platform_support_with_mock_scheduler.h"
diff --git a/third_party/blink/renderer/core/loader/render_blocking_resource_manager.h b/third_party/blink/renderer/core/loader/render_blocking_resource_manager.h index 02f71fe5..536d770 100644 --- a/third_party/blink/renderer/core/loader/render_blocking_resource_manager.h +++ b/third_party/blink/renderer/core/loader/render_blocking_resource_manager.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_RENDER_BLOCKING_RESOURCE_MANAGER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_RENDER_BLOCKING_RESOURCE_MANAGER_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/platform/heap/collection_support/heap_hash_map.h" #include "third_party/blink/renderer/platform/heap/collection_support/heap_hash_set.h"
diff --git a/third_party/blink/renderer/core/loader/resource/image_resource.h b/third_party/blink/renderer/core/loader/resource/image_resource.h index c15a62f4..2ce39712 100644 --- a/third_party/blink/renderer/core/loader/resource/image_resource.h +++ b/third_party/blink/renderer/core/loader/resource/image_resource.h
@@ -23,6 +23,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_RESOURCE_IMAGE_RESOURCE_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_RESOURCE_IMAGE_RESOURCE_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/loader/resource/image_resource_content.h" #include "third_party/blink/renderer/core/loader/resource/image_resource_info.h"
diff --git a/third_party/blink/renderer/core/loader/threadable_loader.h b/third_party/blink/renderer/core/loader/threadable_loader.h index c641601..77b21a1c6 100644 --- a/third_party/blink/renderer/core/loader/threadable_loader.h +++ b/third_party/blink/renderer/core/loader/threadable_loader.h
@@ -32,6 +32,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_THREADABLE_LOADER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_LOADER_THREADABLE_LOADER_H_ +#include "base/time/time.h" #include "services/network/public/mojom/fetch_api.mojom-blink.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink-forward.h" #include "third_party/blink/renderer/core/core_export.h"
diff --git a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.h b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.h index 79c6f6b..21fb8e4 100644 --- a/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.h +++ b/third_party/blink/renderer/core/mobile_metrics/mobile_friendliness_checker.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_MOBILE_METRICS_MOBILE_FRIENDLINESS_CHECKER_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_MOBILE_METRICS_MOBILE_FRIENDLINESS_CHECKER_H_ +#include "base/time/time.h" #include "third_party/blink/public/common/mobile_metrics/mobile_friendliness.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/frame/local_frame_view.h"
diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.h b/third_party/blink/renderer/core/origin_trials/origin_trial_context.h index 89824099..4382e3efb 100644 --- a/third_party/blink/renderer/core/origin_trials/origin_trial_context.h +++ b/third_party/blink/renderer/core/origin_trials/origin_trial_context.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_ORIGIN_TRIALS_ORIGIN_TRIAL_CONTEXT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_ORIGIN_TRIALS_ORIGIN_TRIAL_CONTEXT_H_ +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/origin_trials/trial_token.h" #include "third_party/blink/public/common/origin_trials/trial_token_validator.h"
diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context_test.cc b/third_party/blink/renderer/core/origin_trials/origin_trial_context_test.cc index 7607062c..56ba7ed 100644 --- a/third_party/blink/renderer/core/origin_trials/origin_trial_context_test.cc +++ b/third_party/blink/renderer/core/origin_trials/origin_trial_context_test.cc
@@ -9,6 +9,7 @@ #include "base/containers/span.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/origin_trials/origin_trials.h"
diff --git a/third_party/blink/renderer/core/page/chrome_client.h b/third_party/blink/renderer/core/page/chrome_client.h index 8209165..c87bf02e 100644 --- a/third_party/blink/renderer/core/page/chrome_client.h +++ b/third_party/blink/renderer/core/page/chrome_client.h
@@ -26,6 +26,7 @@ #include <memory> #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "cc/input/event_listener_properties.h" #include "cc/input/overscroll_behavior.h" #include "cc/paint/paint_image.h"
diff --git a/third_party/blink/renderer/core/page/validation_message_client_impl.h b/third_party/blink/renderer/core/page/validation_message_client_impl.h index d511879..d82c756 100644 --- a/third_party/blink/renderer/core/page/validation_message_client_impl.h +++ b/third_party/blink/renderer/core/page/validation_message_client_impl.h
@@ -26,6 +26,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_PAGE_VALIDATION_MESSAGE_CLIENT_IMPL_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_PAGE_VALIDATION_MESSAGE_CLIENT_IMPL_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/page/page.h" #include "third_party/blink/renderer/core/page/popup_opening_observer.h"
diff --git a/third_party/blink/renderer/core/page/validation_message_overlay_delegate.h b/third_party/blink/renderer/core/page/validation_message_overlay_delegate.h index e9ed369..9db786a4f 100644 --- a/third_party/blink/renderer/core/page/validation_message_overlay_delegate.h +++ b/third_party/blink/renderer/core/page/validation_message_overlay_delegate.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_PAGE_VALIDATION_MESSAGE_OVERLAY_DELEGATE_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_PAGE_VALIDATION_MESSAGE_OVERLAY_DELEGATE_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/frame/frame_overlay.h" #include "third_party/blink/renderer/platform/heap/persistent.h"
diff --git a/third_party/blink/renderer/core/paint/image_element_timing.h b/third_party/blink/renderer/core/paint/image_element_timing.h index 81c6cbb..a817420 100644 --- a/third_party/blink/renderer/core/paint/image_element_timing.h +++ b/third_party/blink/renderer/core/paint/image_element_timing.h
@@ -7,6 +7,7 @@ #include <utility> +#include "base/time/time.h" #include "third_party/blink/renderer/core/dom/element.h" #include "third_party/blink/renderer/core/frame/local_dom_window.h" #include "third_party/blink/renderer/platform/heap/collection_support/heap_hash_map.h"
diff --git a/third_party/blink/renderer/core/paint/image_paint_timing_detector.h b/third_party/blink/renderer/core/paint/image_paint_timing_detector.h index e800892..f5adf80f1 100644 --- a/third_party/blink/renderer/core/paint/image_paint_timing_detector.h +++ b/third_party/blink/renderer/core/paint/image_paint_timing_detector.h
@@ -9,6 +9,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_PAINT_IMAGE_PAINT_TIMING_DETECTOR_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_PAINT_IMAGE_PAINT_TIMING_DETECTOR_H_ +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/core/dom/dom_node_ids.h" #include "third_party/blink/renderer/core/loader/resource/image_resource_content.h"
diff --git a/third_party/blink/renderer/core/paint/image_paint_timing_detector_test.cc b/third_party/blink/renderer/core/paint/image_paint_timing_detector_test.cc index 4376c220..d6176b5 100644 --- a/third_party/blink/renderer/core/paint/image_paint_timing_detector_test.cc +++ b/third_party/blink/renderer/core/paint/image_paint_timing_detector_test.cc
@@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/test/test_mock_time_task_runner.h" #include "base/test/trace_event_analyzer.h" +#include "base/time/time.h" #include "build/build_config.h" #include "components/ukm/test_ukm_recorder.h" #include "services/metrics/public/cpp/ukm_builders.h"
diff --git a/third_party/blink/renderer/core/paint/link_highlight_impl.h b/third_party/blink/renderer/core/paint/link_highlight_impl.h index 7885f4c..d141bbd 100644 --- a/third_party/blink/renderer/core/paint/link_highlight_impl.h +++ b/third_party/blink/renderer/core/paint/link_highlight_impl.h
@@ -28,6 +28,7 @@ #include <memory> +#include "base/time/time.h" #include "cc/layers/content_layer_client.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/dom/node.h"
diff --git a/third_party/blink/renderer/core/paint/paint_timing.h b/third_party/blink/renderer/core/paint/paint_timing.h index 0176d4e7..1d0514f 100644 --- a/third_party/blink/renderer/core/paint/paint_timing.h +++ b/third_party/blink/renderer/core/paint/paint_timing.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "third_party/blink/public/web/web_performance.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/paint/first_meaningful_paint_detector.h"
diff --git a/third_party/blink/renderer/core/paint/paint_timing_detector.h b/third_party/blink/renderer/core/paint/paint_timing_detector.h index 49a1269..62edb95 100644 --- a/third_party/blink/renderer/core/paint/paint_timing_detector.h +++ b/third_party/blink/renderer/core/paint/paint_timing_detector.h
@@ -7,6 +7,7 @@ #include <queue> +#include "base/time/time.h" #include "third_party/blink/public/common/input/web_input_event.h" #include "third_party/blink/public/common/performance/largest_contentful_paint_type.h" #include "third_party/blink/renderer/core/core_export.h"
diff --git a/third_party/blink/renderer/core/paint/text_paint_timing_detector_test.cc b/third_party/blink/renderer/core/paint/text_paint_timing_detector_test.cc index 66355a74..462589d 100644 --- a/third_party/blink/renderer/core/paint/text_paint_timing_detector_test.cc +++ b/third_party/blink/renderer/core/paint/text_paint_timing_detector_test.cc
@@ -6,6 +6,7 @@ #include "base/test/test_mock_time_task_runner.h" #include "base/test/trace_event_analyzer.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/frame/frame_test_helpers.h" #include "third_party/blink/renderer/core/frame/web_local_frame_impl.h" #include "third_party/blink/renderer/core/paint/paint_timing_detector.h"
diff --git a/third_party/blink/renderer/core/probe/core_probes.h b/third_party/blink/renderer/core/probe/core_probes.h index 0ecbe3a..78d334d 100644 --- a/third_party/blink/renderer/core/probe/core_probes.h +++ b/third_party/blink/renderer/core/probe/core_probes.h
@@ -149,6 +149,7 @@ } // namespace probe } // namespace blink +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_probes_inl.h" #endif // THIRD_PARTY_BLINK_RENDERER_CORE_PROBE_CORE_PROBES_H_
diff --git a/third_party/blink/renderer/core/script/pending_script.h b/third_party/blink/renderer/core/script/pending_script.h index f8d7f91..0196817 100644 --- a/third_party/blink/renderer/core/script/pending_script.h +++ b/third_party/blink/renderer/core/script/pending_script.h
@@ -26,6 +26,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_PENDING_SCRIPT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_SCRIPT_PENDING_SCRIPT_H_ +#include "base/time/time.h" #include "third_party/blink/public/mojom/script/script_type.mojom-blink-forward.h" #include "third_party/blink/public/platform/scheduler/web_scoped_virtual_time_pauser.h" #include "third_party/blink/renderer/core/core_export.h"
diff --git a/third_party/blink/renderer/core/scroll/programmatic_scroll_animator.h b/third_party/blink/renderer/core/scroll/programmatic_scroll_animator.h index 4d246b20b..1186382 100644 --- a/third_party/blink/renderer/core/scroll/programmatic_scroll_animator.h +++ b/third_party/blink/renderer/core/scroll/programmatic_scroll_animator.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_SCROLL_PROGRAMMATIC_SCROLL_ANIMATOR_H_ #include <memory> +#include "base/time/time.h" #include "cc/animation/scroll_offset_animation_curve.h" #include "third_party/blink/renderer/core/scroll/scroll_animator_compositor_coordinator.h" #include "third_party/blink/renderer/core/scroll/scrollable_area.h"
diff --git a/third_party/blink/renderer/core/scroll/scroll_animator.h b/third_party/blink/renderer/core/scroll/scroll_animator.h index 9af219a5..7583f08 100644 --- a/third_party/blink/renderer/core/scroll/scroll_animator.h +++ b/third_party/blink/renderer/core/scroll/scroll_animator.h
@@ -34,6 +34,7 @@ #include <memory> #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/animation/scroll_offset_animation_curve.h" #include "third_party/blink/renderer/core/scroll/scroll_animator_base.h"
diff --git a/third_party/blink/renderer/core/scroll/scrollbar_theme_overlay_mock.h b/third_party/blink/renderer/core/scroll/scrollbar_theme_overlay_mock.h index 150bcb35..28b6379 100644 --- a/third_party/blink/renderer/core/scroll/scrollbar_theme_overlay_mock.h +++ b/third_party/blink/renderer/core/scroll/scrollbar_theme_overlay_mock.h
@@ -31,6 +31,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_SCROLL_SCROLLBAR_THEME_OVERLAY_MOCK_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_SCROLL_SCROLLBAR_THEME_OVERLAY_MOCK_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/core/scroll/scrollbar_theme_overlay_mobile.h" namespace blink {
diff --git a/third_party/blink/renderer/core/svg/animation/smil_time_container_test.cc b/third_party/blink/renderer/core/svg/animation/smil_time_container_test.cc index e6be66c..15b09bb 100644 --- a/third_party/blink/renderer/core/svg/animation/smil_time_container_test.cc +++ b/third_party/blink/renderer/core/svg/animation/smil_time_container_test.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/core/svg/animation/smil_time_container.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/animation/document_timeline.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/dom/element_traversal.h"
diff --git a/third_party/blink/renderer/core/timing/event_timing.h b/third_party/blink/renderer/core/timing/event_timing.h index bdf8792..20da1e4 100644 --- a/third_party/blink/renderer/core/timing/event_timing.h +++ b/third_party/blink/renderer/core/timing/event_timing.h
@@ -7,6 +7,7 @@ #include <memory> +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/timing/window_performance.h" #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
diff --git a/third_party/blink/renderer/core/timing/largest_contentful_paint.h b/third_party/blink/renderer/core/timing/largest_contentful_paint.h index 915e1b02..506b44c4 100644 --- a/third_party/blink/renderer/core/timing/largest_contentful_paint.h +++ b/third_party/blink/renderer/core/timing/largest_contentful_paint.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_TIMING_LARGEST_CONTENTFUL_PAINT_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_TIMING_LARGEST_CONTENTFUL_PAINT_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/dom/element.h" #include "third_party/blink/renderer/core/timing/performance_entry.h"
diff --git a/third_party/blink/renderer/core/timing/memory_info.cc b/third_party/blink/renderer/core/timing/memory_info.cc index 54f4dc2..ef5d257 100644 --- a/third_party/blink/renderer/core/timing/memory_info.cc +++ b/third_party/blink/renderer/core/timing/memory_info.cc
@@ -33,6 +33,7 @@ #include <limits> #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/frame/settings.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" #include "third_party/blink/renderer/platform/wtf/math_extras.h"
diff --git a/third_party/blink/renderer/core/timing/performance.h b/third_party/blink/renderer/core/timing/performance.h index 711c95f..29946aa3 100644 --- a/third_party/blink/renderer/core/timing/performance.h +++ b/third_party/blink/renderer/core/timing/performance.h
@@ -33,6 +33,7 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_TIMING_PERFORMANCE_H_ #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "third_party/blink/public/mojom/timing/resource_timing.mojom-blink.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/dom/dom_high_res_time_stamp.h"
diff --git a/third_party/blink/renderer/core/timing/performance_mark.h b/third_party/blink/renderer/core/timing/performance_mark.h index 4af6759..9d1a5e6 100644 --- a/third_party/blink/renderer/core/timing/performance_mark.h +++ b/third_party/blink/renderer/core/timing/performance_mark.h
@@ -26,6 +26,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_TIMING_PERFORMANCE_MARK_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_TIMING_PERFORMANCE_MARK_H_ +#include "base/time/time.h" #include "third_party/blink/public/mojom/timing/performance_mark_or_measure.mojom-blink-forward.h" #include "third_party/blink/renderer/bindings/core/v8/serialization/serialized_script_value.h" #include "third_party/blink/renderer/core/timing/performance_entry.h"
diff --git a/third_party/blink/renderer/core/timing/performance_resource_timing.h b/third_party/blink/renderer/core/timing/performance_resource_timing.h index c55e0d9..3b8631bb 100644 --- a/third_party/blink/renderer/core/timing/performance_resource_timing.h +++ b/third_party/blink/renderer/core/timing/performance_resource_timing.h
@@ -32,6 +32,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_TIMING_PERFORMANCE_RESOURCE_TIMING_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_TIMING_PERFORMANCE_RESOURCE_TIMING_H_ +#include "base/time/time.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h" #include "third_party/blink/public/mojom/timing/performance_mark_or_measure.mojom-blink-forward.h" #include "third_party/blink/public/mojom/timing/resource_timing.mojom-blink.h"
diff --git a/third_party/blink/renderer/core/timing/responsiveness_metrics.h b/third_party/blink/renderer/core/timing/responsiveness_metrics.h index fd8f7756..9114714 100644 --- a/third_party/blink/renderer/core/timing/responsiveness_metrics.h +++ b/third_party/blink/renderer/core/timing/responsiveness_metrics.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_TIMING_RESPONSIVENESS_METRICS_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_TIMING_RESPONSIVENESS_METRICS_H_ +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/responsiveness_metrics/user_interaction_latency.h" #include "third_party/blink/renderer/core/events/pointer_event.h"
diff --git a/third_party/blink/renderer/core/timing/window_performance.h b/third_party/blink/renderer/core/timing/window_performance.h index f6ab29397..d474814d 100644 --- a/third_party/blink/renderer/core/timing/window_performance.h +++ b/third_party/blink/renderer/core/timing/window_performance.h
@@ -32,6 +32,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_TIMING_WINDOW_PERFORMANCE_H_ #define THIRD_PARTY_BLINK_RENDERER_CORE_TIMING_WINDOW_PERFORMANCE_H_ +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/events/pointer_event.h"
diff --git a/third_party/blink/renderer/core/workers/worker_global_scope.h b/third_party/blink/renderer/core/workers/worker_global_scope.h index 9f6f46e..16167ff 100644 --- a/third_party/blink/renderer/core/workers/worker_global_scope.h +++ b/third_party/blink/renderer/core/workers/worker_global_scope.h
@@ -29,6 +29,7 @@ #include <memory> +#include "base/time/time.h" #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h" #include "services/network/public/mojom/ip_address_space.mojom-blink-forward.h" #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
diff --git a/third_party/blink/renderer/core/workers/worker_thread.h b/third_party/blink/renderer/core/workers/worker_thread.h index 2235452..89f75cb 100644 --- a/third_party/blink/renderer/core/workers/worker_thread.h +++ b/third_party/blink/renderer/core/workers/worker_thread.h
@@ -34,6 +34,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h" #include "base/thread_annotations.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.h b/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.h index 7e0dfc4..8a9ec0938 100644 --- a/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.h +++ b/third_party/blink/renderer/core/xmlhttprequest/xml_http_request.h
@@ -26,6 +26,7 @@ #include <memory> #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "services/network/public/mojom/trust_tokens.mojom-blink.h" #include "services/network/public/mojom/url_loader_factory.mojom-blink.h"
diff --git a/third_party/blink/renderer/modules/animationworklet/animation_worklet_global_scope.cc b/third_party/blink/renderer/modules/animationworklet/animation_worklet_global_scope.cc index cf406ee..97720dcc 100644 --- a/third_party/blink/renderer/modules/animationworklet/animation_worklet_global_scope.cc +++ b/third_party/blink/renderer/modules/animationworklet/animation_worklet_global_scope.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/modules/animationworklet/animation_worklet_global_scope.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/bindings/core/v8/generated_code_helper.h" #include "third_party/blink/renderer/bindings/core/v8/serialization/serialized_script_value.h"
diff --git a/third_party/blink/renderer/modules/animationworklet/worklet_animation.h b/third_party/blink/renderer/modules/animationworklet/worklet_animation.h index 4684942..96cba6c 100644 --- a/third_party/blink/renderer/modules/animationworklet/worklet_animation.h +++ b/third_party/blink/renderer/modules/animationworklet/worklet_animation.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_MODULES_ANIMATIONWORKLET_WORKLET_ANIMATION_H_ #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/core/animation/animation.h" #include "third_party/blink/renderer/core/animation/animation_effect_owner.h"
diff --git a/third_party/blink/renderer/modules/animationworklet/worklet_animation_effect.h b/third_party/blink/renderer/modules/animationworklet/worklet_animation_effect.h index 268d48fc..9ebc4dc 100644 --- a/third_party/blink/renderer/modules/animationworklet/worklet_animation_effect.h +++ b/third_party/blink/renderer/modules/animationworklet/worklet_animation_effect.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_ANIMATIONWORKLET_WORKLET_ANIMATION_EFFECT_H_ #define THIRD_PARTY_BLINK_RENDERER_MODULES_ANIMATIONWORKLET_WORKLET_ANIMATION_EFFECT_H_ +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/core/animation/timing.h" #include "third_party/blink/renderer/modules/modules_export.h"
diff --git a/third_party/blink/renderer/modules/battery/battery_status.h b/third_party/blink/renderer/modules/battery/battery_status.h index 5caeb0e8..a7e49fa 100644 --- a/third_party/blink/renderer/modules/battery/battery_status.h +++ b/third_party/blink/renderer/modules/battery/battery_status.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_BATTERY_BATTERY_STATUS_H_ #define THIRD_PARTY_BLINK_RENDERER_MODULES_BATTERY_BATTERY_STATUS_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/modules/modules_export.h" #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
diff --git a/third_party/blink/renderer/modules/breakout_box/pushable_media_stream_audio_source_test.cc b/third_party/blink/renderer/modules/breakout_box/pushable_media_stream_audio_source_test.cc index 69f9769..10ed492 100644 --- a/third_party/blink/renderer/modules/breakout_box/pushable_media_stream_audio_source_test.cc +++ b/third_party/blink/renderer/modules/breakout_box/pushable_media_stream_audio_source_test.cc
@@ -5,6 +5,7 @@ #include "third_party/blink/renderer/modules/breakout_box/pushable_media_stream_audio_source.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "media/base/bind_to_current_loop.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/mojom/mediastream/media_stream.mojom-blink.h"
diff --git a/third_party/blink/renderer/modules/breakout_box/pushable_media_stream_video_source_test.cc b/third_party/blink/renderer/modules/breakout_box/pushable_media_stream_video_source_test.cc index 3507429..b372084 100644 --- a/third_party/blink/renderer/modules/breakout_box/pushable_media_stream_video_source_test.cc +++ b/third_party/blink/renderer/modules/breakout_box/pushable_media_stream_video_source_test.cc
@@ -5,6 +5,7 @@ #include "third_party/blink/renderer/modules/breakout_box/pushable_media_stream_video_source.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "media/base/bind_to_current_loop.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/mojom/mediastream/media_stream.mojom-blink.h"
diff --git a/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc b/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc index f7b32435..079d85a 100644 --- a/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc +++ b/third_party/blink/renderer/modules/clipboard/clipboard_promise.cc
@@ -7,7 +7,6 @@ #include <memory> #include <utility> -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "mojo/public/cpp/base/big_buffer.h" #include "third_party/blink/public/common/features.h"
diff --git a/third_party/blink/renderer/modules/device_orientation/device_sensor_event_pump.h b/third_party/blink/renderer/modules/device_orientation/device_sensor_event_pump.h index 8f9f41b5..eabb51a 100644 --- a/third_party/blink/renderer/modules/device_orientation/device_sensor_event_pump.h +++ b/third_party/blink/renderer/modules/device_orientation/device_sensor_event_pump.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_DEVICE_ORIENTATION_DEVICE_SENSOR_EVENT_PUMP_H_ #define THIRD_PARTY_BLINK_RENDERER_MODULES_DEVICE_ORIENTATION_DEVICE_SENSOR_EVENT_PUMP_H_ +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "services/device/public/mojom/sensor_provider.mojom-blink.h" #include "third_party/blink/renderer/modules/modules_export.h"
diff --git a/third_party/blink/renderer/modules/eyedropper/eye_dropper.cc b/third_party/blink/renderer/modules/eyedropper/eye_dropper.cc index 8444995a..2402045 100644 --- a/third_party/blink/renderer/modules/eyedropper/eye_dropper.cc +++ b/third_party/blink/renderer/modules/eyedropper/eye_dropper.cc
@@ -23,7 +23,25 @@ namespace blink { -constexpr char kAbortMessage[] = "Color selection aborted."; +class EyeDropper::OpenAbortAlgorithm final : public AbortSignal::Algorithm { + public: + OpenAbortAlgorithm(EyeDropper* eyedropper, AbortSignal* signal) + : eyedropper_(eyedropper), abortsignal_(signal) {} + ~OpenAbortAlgorithm() override = default; + + void Run() override { eyedropper_->AbortCallback(abortsignal_); } + + void Trace(Visitor* visitor) const override { + visitor->Trace(eyedropper_); + visitor->Trace(abortsignal_); + Algorithm::Trace(visitor); + } + + private: + Member<EyeDropper> eyedropper_; + Member<AbortSignal> abortsignal_; +}; + constexpr char kNotAvailableMessage[] = "EyeDropper is not available."; EyeDropper::EyeDropper(ExecutionContext* context) @@ -66,13 +84,12 @@ } if (options->hasSignal()) { - if (options->signal()->aborted()) { - exception_state.ThrowDOMException(DOMExceptionCode::kAbortError, - kAbortMessage); - return ScriptPromise(); + signal_ = options->signal(); + if (signal_->aborted()) { + return ScriptPromise::Reject(script_state, signal_->reason(script_state)); } - options->signal()->AddAlgorithm( - WTF::Bind(&EyeDropper::AbortCallback, WrapWeakPersistent(this))); + signal_->AddAlgorithm( + MakeGarbageCollected<OpenAbortAlgorithm>(this, signal_)); } resolver_ = MakeGarbageCollected<ScriptPromiseResolver>(script_state); @@ -91,23 +108,30 @@ return promise; } -void EyeDropper::AbortCallback() { - eye_dropper_chooser_.reset(); - +void EyeDropper::AbortCallback(AbortSignal* signal) { // There is no way to remove abort signal callbacks, so we need to // perform null-check for `resolver_` to see if the promise has already // been resolved. // TODO(https://crbug.com/1296280): It should be possible to remove abort // callbacks. This object can be reused for multiple eyedropper operations, // and it might be possible for multiple abort signals to be mixed up. - if (!resolver_ || - !IsInParallelAlgorithmRunnable(resolver_->GetExecutionContext(), - resolver_->GetScriptState())) + + // There is no RemoveAlgorithm() method on AbortSignal so compare the signal + // bound to this callback to the one last passed to open(). + if (signal_ != signal) return; - ScriptState::Scope script_state_scope(resolver_->GetScriptState()); + if (resolver_) { + ScriptState* script_state = resolver_->GetScriptState(); + if (IsInParallelAlgorithmRunnable(resolver_->GetExecutionContext(), + script_state)) { + ScriptState::Scope script_state_scope(script_state); + resolver_->Reject(signal_->reason(script_state)); + } + } - RejectPromiseHelper(DOMExceptionCode::kAbortError, kAbortMessage); + eye_dropper_chooser_.reset(); + resolver_ = nullptr; } void EyeDropper::EyeDropperResponseHandler(ScriptPromiseResolver* resolver, @@ -162,6 +186,7 @@ void EyeDropper::Trace(Visitor* visitor) const { visitor->Trace(eye_dropper_chooser_); visitor->Trace(resolver_); + visitor->Trace(signal_); ScriptWrappable::Trace(visitor); }
diff --git a/third_party/blink/renderer/modules/eyedropper/eye_dropper.h b/third_party/blink/renderer/modules/eyedropper/eye_dropper.h index aed15ec15..2a49009 100644 --- a/third_party/blink/renderer/modules/eyedropper/eye_dropper.h +++ b/third_party/blink/renderer/modules/eyedropper/eye_dropper.h
@@ -12,6 +12,7 @@ namespace blink { +class AbortSignal; class ColorSelectionOptions; enum class DOMExceptionCode; class ExceptionState; @@ -43,13 +44,16 @@ void Trace(Visitor*) const override; private: - void AbortCallback(); + class OpenAbortAlgorithm; + + void AbortCallback(AbortSignal* signal); void EyeDropperResponseHandler(ScriptPromiseResolver*, bool, uint32_t); void EndChooser(); void RejectPromiseHelper(DOMExceptionCode, const WTF::String&); HeapMojoRemote<mojom::blink::EyeDropperChooser> eye_dropper_chooser_; Member<ScriptPromiseResolver> resolver_; + Member<AbortSignal> signal_; }; } // namespace blink
diff --git a/third_party/blink/renderer/modules/filesystem/file_writer.h b/third_party/blink/renderer/modules/filesystem/file_writer.h index 10c0e44a..a5e2399 100644 --- a/third_party/blink/renderer/modules/filesystem/file_writer.h +++ b/third_party/blink/renderer/modules/filesystem/file_writer.h
@@ -31,6 +31,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_FILESYSTEM_FILE_WRITER_H_ #define THIRD_PARTY_BLINK_RENDERER_MODULES_FILESYSTEM_FILE_WRITER_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h" #include "third_party/blink/renderer/core/execution_context/execution_context.h" #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h"
diff --git a/third_party/blink/renderer/modules/gamepad/gamepad.h b/third_party/blink/renderer/modules/gamepad/gamepad.h index 5739bf34..b773346d 100644 --- a/third_party/blink/renderer/modules/gamepad/gamepad.h +++ b/third_party/blink/renderer/modules/gamepad/gamepad.h
@@ -26,6 +26,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_GAMEPAD_GAMEPAD_H_ #define THIRD_PARTY_BLINK_RENDERER_MODULES_GAMEPAD_GAMEPAD_H_ +#include "base/time/time.h" #include "device/gamepad/public/cpp/gamepad.h" #include "third_party/blink/renderer/core/dom/dom_high_res_time_stamp.h" #include "third_party/blink/renderer/modules/gamepad/gamepad_button.h"
diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.h b/third_party/blink/renderer/modules/gamepad/navigator_gamepad.h index 6f0c2a0..d21d0d6 100644 --- a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.h +++ b/third_party/blink/renderer/modules/gamepad/navigator_gamepad.h
@@ -26,6 +26,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_GAMEPAD_NAVIGATOR_GAMEPAD_H_ #define THIRD_PARTY_BLINK_RENDERER_MODULES_GAMEPAD_NAVIGATOR_GAMEPAD_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/core/dom/dom_high_res_time_stamp.h" #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h" #include "third_party/blink/renderer/core/frame/local_dom_window.h"
diff --git a/third_party/blink/renderer/modules/idle/idle_detector.cc b/third_party/blink/renderer/modules/idle/idle_detector.cc index e2e1cc4..3ab0e8c 100644 --- a/third_party/blink/renderer/modules/idle/idle_detector.cc +++ b/third_party/blink/renderer/modules/idle/idle_detector.cc
@@ -45,6 +45,25 @@ } // namespace +class IdleDetector::StartAbortAlgorithm final : public AbortSignal::Algorithm { + public: + StartAbortAlgorithm(IdleDetector* idle_detector, AbortSignal* signal) + : idle_detector_(idle_detector), abort_signal_(signal) {} + ~StartAbortAlgorithm() override = default; + + void Run() override { idle_detector_->Abort(abort_signal_); } + + void Trace(Visitor* visitor) const override { + visitor->Trace(idle_detector_); + visitor->Trace(abort_signal_); + Algorithm::Trace(visitor); + } + + private: + Member<IdleDetector> idle_detector_; + Member<AbortSignal> abort_signal_; +}; + IdleDetector* IdleDetector::Create(ScriptState* script_state) { return MakeGarbageCollected<IdleDetector>( ExecutionContext::From(script_state)); @@ -127,9 +146,8 @@ if (options->hasSignal()) { signal_ = options->signal(); - signal_->AddAlgorithm(WTF::Bind(&IdleDetector::Abort, - WrapWeakPersistent(this), - WrapWeakPersistent(signal_.Get()))); + signal_->AddAlgorithm( + MakeGarbageCollected<StartAbortAlgorithm>(this, signal_)); } if (signal_ && signal_->aborted()) {
diff --git a/third_party/blink/renderer/modules/idle/idle_detector.h b/third_party/blink/renderer/modules/idle/idle_detector.h index 2a23e06..f06f2aba 100644 --- a/third_party/blink/renderer/modules/idle/idle_detector.h +++ b/third_party/blink/renderer/modules/idle/idle_detector.h
@@ -61,6 +61,8 @@ scoped_refptr<base::SingleThreadTaskRunner> task_runner); private: + class StartAbortAlgorithm; + // mojom::blink::IdleMonitor implementation. Invoked on a state change, and // causes an event to be dispatched. void Update(mojom::blink::IdleStatePtr state,
diff --git a/third_party/blink/renderer/modules/indexeddb/idb_open_db_request.h b/third_party/blink/renderer/modules/indexeddb/idb_open_db_request.h index 65a19deb..e1bb592d 100644 --- a/third_party/blink/renderer/modules/indexeddb/idb_open_db_request.h +++ b/third_party/blink/renderer/modules/indexeddb/idb_open_db_request.h
@@ -28,6 +28,7 @@ #include <memory> +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_associated_receiver.h" #include "third_party/blink/public/mojom/feature_observer/feature_observer.mojom-blink.h" #include "third_party/blink/public/mojom/indexeddb/indexeddb.mojom-blink.h"
diff --git a/third_party/blink/renderer/modules/media/audio/audio_device_factory.cc b/third_party/blink/renderer/modules/media/audio/audio_device_factory.cc index 71d7ae6..6871b5a 100644 --- a/third_party/blink/renderer/modules/media/audio/audio_device_factory.cc +++ b/third_party/blink/renderer/modules/media/audio/audio_device_factory.cc
@@ -11,9 +11,9 @@ #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "media/audio/audio_input_device.h" @@ -78,7 +78,6 @@ const blink::LocalFrameToken& frame_token, const media::AudioSinkParameters& params) { DCHECK(IsMainThread()) << __func__ << "() is called on a wrong thread."; - DCHECK(!params.processing_id.has_value()); return AudioRendererMixerManager::GetInstance().CreateInput( frame_token, params.session_id, params.device_id, AudioDeviceFactory::GetSourceLatencyType(source_type)); @@ -128,10 +127,6 @@ return device; } - // Perhaps streams with a processing ID just shouldn't be mixable, i.e. call - // NewFinalAudioRendererSink for them rather than DCHECK? - DCHECK(!(params.processing_id.has_value() && IsMixable(source_type))); - if (IsMixable(source_type)) return NewMixableSink(source_type, frame_token, params);
diff --git a/third_party/blink/renderer/modules/media/audio/audio_input_ipc_factory.cc b/third_party/blink/renderer/modules/media/audio/audio_input_ipc_factory.cc index 7ed24a0..65210a8 100644 --- a/third_party/blink/renderer/modules/media/audio/audio_input_ipc_factory.cc +++ b/third_party/blink/renderer/modules/media/audio/audio_input_ipc_factory.cc
@@ -42,8 +42,7 @@ web_frame->Client()->CreateAudioInputStream( std::move(client), source_params.session_id, params, automatic_gain_control, total_segments, std::move(controls_receiver), - source_params.processing ? &source_params.processing->settings - : nullptr); + source_params.processing ? &*source_params.processing : nullptr); } }
diff --git a/third_party/blink/renderer/modules/media/audio/mojo_audio_input_ipc_test.cc b/third_party/blink/renderer/modules/media/audio/mojo_audio_input_ipc_test.cc index 164f16628..d7c22ac2 100644 --- a/third_party/blink/renderer/modules/media/audio/mojo_audio_input_ipc_test.cc +++ b/third_party/blink/renderer/modules/media/audio/mojo_audio_input_ipc_test.cc
@@ -54,9 +54,7 @@ media::AudioSourceParameters SourceParamsWithProcessing() { media::AudioSourceParameters params( base::UnguessableToken::Deserialize(1234, 5678)); - params.processing = media::AudioSourceParameters::ProcessingConfig( - base::UnguessableToken::Deserialize(9876, 4321), - media::AudioProcessingSettings()); + params.processing = media::AudioProcessingSettings(); return params; }
diff --git a/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc.cc b/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc.cc index d4ad944..e334186d2 100644 --- a/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc.cc +++ b/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc.cc
@@ -62,10 +62,8 @@ media::AudioParameters::UnavailableDeviceParams(), String())); } -void MojoAudioOutputIPC::CreateStream( - media::AudioOutputIPCDelegate* delegate, - const media::AudioParameters& params, - const absl::optional<base::UnguessableToken>& processing_id) { +void MojoAudioOutputIPC::CreateStream(media::AudioOutputIPCDelegate* delegate, + const media::AudioParameters& params) { DCHECK(io_task_runner_->RunsTasksInCurrentSequence()); DCHECK(delegate); DCHECK(!StreamCreationRequested());
diff --git a/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc.h b/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc.h index c14f4844..2d44f569 100644 --- a/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc.h +++ b/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc.h
@@ -18,7 +18,6 @@ #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" -#include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/mojom/media/renderer_audio_output_stream_factory.mojom-blink.h" #include "third_party/blink/renderer/modules/modules_export.h" @@ -49,10 +48,8 @@ void RequestDeviceAuthorization(media::AudioOutputIPCDelegate* delegate, const base::UnguessableToken& session_id, const std::string& device_id) override; - void CreateStream( - media::AudioOutputIPCDelegate* delegate, - const media::AudioParameters& params, - const absl::optional<base::UnguessableToken>& processing_id) override; + void CreateStream(media::AudioOutputIPCDelegate* delegate, + const media::AudioParameters& params) override; void PlayStream() override; void PauseStream() override; void FlushStream() override;
diff --git a/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc_test.cc b/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc_test.cc index 9953e05..7ae2abb 100644 --- a/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc_test.cc +++ b/third_party/blink/renderer/modules/media/audio/mojo_audio_output_ipc_test.cc
@@ -251,7 +251,7 @@ NullAccessor(), blink::scheduler::GetSingleThreadTaskRunnerForTesting()); - ipc->CreateStream(&delegate, Params(), absl::nullopt); + ipc->CreateStream(&delegate, Params()); // No call to OnDeviceAuthorized since authotization wasn't explicitly // requested. @@ -296,7 +296,7 @@ session_id, kDeviceId, std::make_unique<TestStreamProvider>(&stream)); ipc->RequestDeviceAuthorization(&delegate, session_id, kDeviceId); - ipc->CreateStream(&delegate, Params(), absl::nullopt); + ipc->CreateStream(&delegate, Params()); EXPECT_CALL(delegate, OnDeviceAuthorized( media::OutputDeviceStatus::OUTPUT_DEVICE_STATUS_OK, @@ -327,7 +327,7 @@ std::string(media::AudioDeviceDescription::kDefaultDeviceId), std::make_unique<TestStreamProvider>(&stream)); - ipc->CreateStream(&delegate, Params(), absl::nullopt); + ipc->CreateStream(&delegate, Params()); EXPECT_CALL(delegate, GotOnStreamCreated()); base::RunLoop().RunUntilIdle(); @@ -352,7 +352,7 @@ session_id, kDeviceId, std::make_unique<TestStreamProvider>(&stream)); ipc->RequestDeviceAuthorization(&delegate, session_id, kDeviceId); - ipc->CreateStream(&delegate, Params(), absl::nullopt); + ipc->CreateStream(&delegate, Params()); EXPECT_CALL( delegate, @@ -400,7 +400,7 @@ session_id, kDeviceId, std::make_unique<TestStreamProvider>(&stream)); ipc->RequestDeviceAuthorization(&delegate, session_id, kDeviceId); - ipc->CreateStream(&delegate, Params(), absl::nullopt); + ipc->CreateStream(&delegate, Params()); EXPECT_CALL( delegate, @@ -542,7 +542,7 @@ stream_factory.GetAccessor(), blink::scheduler::GetSingleThreadTaskRunnerForTesting()); - ipc->CreateStream(&delegate, Params(), absl::nullopt); + ipc->CreateStream(&delegate, Params()); EXPECT_DCHECK_DEATH(ipc.reset()); ipc->CloseStream(); ipc.reset(); @@ -569,7 +569,7 @@ session_id, kDeviceId, std::make_unique<TestStreamProvider>(&stream)); ipc->RequestDeviceAuthorization(&delegate, session_id, kDeviceId); - ipc->CreateStream(&delegate, Params(), absl::nullopt); + ipc->CreateStream(&delegate, Params()); base::RunLoop().RunUntilIdle(); ipc->PlayStream(); base::RunLoop().RunUntilIdle(); @@ -597,7 +597,7 @@ session_id, kDeviceId, std::make_unique<TestStreamProvider>(&stream)); ipc->RequestDeviceAuthorization(&delegate, session_id, kDeviceId); - ipc->CreateStream(&delegate, Params(), absl::nullopt); + ipc->CreateStream(&delegate, Params()); base::RunLoop().RunUntilIdle(); ipc->PauseStream(); base::RunLoop().RunUntilIdle(); @@ -625,7 +625,7 @@ session_id, kDeviceId, std::make_unique<TestStreamProvider>(&stream)); ipc->RequestDeviceAuthorization(&delegate, session_id, kDeviceId); - ipc->CreateStream(&delegate, Params(), absl::nullopt); + ipc->CreateStream(&delegate, Params()); base::RunLoop().RunUntilIdle(); ipc->SetVolume(kNewVolume); base::RunLoop().RunUntilIdle();
diff --git a/third_party/blink/renderer/modules/media_capabilities/media_capabilities.h b/third_party/blink/renderer/modules/media_capabilities/media_capabilities.h index e6ead1b..c310fa5 100644 --- a/third_party/blink/renderer/modules/media_capabilities/media_capabilities.h +++ b/third_party/blink/renderer/modules/media_capabilities/media_capabilities.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIA_CAPABILITIES_MEDIA_CAPABILITIES_H_ #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "media/base/video_codecs.h" // for media::VideoCodecProfile #include "media/learning/mojo/public/cpp/mojo_learning_task_controller.h" #include "media/learning/mojo/public/mojom/learning_task_controller.mojom-blink.h"
diff --git a/third_party/blink/renderer/modules/media_capabilities/media_capabilities_test.cc b/third_party/blink/renderer/modules/media_capabilities/media_capabilities_test.cc index d3c6b3b..03bc4748 100644 --- a/third_party/blink/renderer/modules/media_capabilities/media_capabilities_test.cc +++ b/third_party/blink/renderer/modules/media_capabilities/media_capabilities_test.cc
@@ -9,7 +9,6 @@ #include <algorithm> #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "media/base/media_switches.h"
diff --git a/third_party/blink/renderer/modules/media_controls/media_controls_orientation_lock_delegate.cc b/third_party/blink/renderer/modules/media_controls/media_controls_orientation_lock_delegate.cc index 087ae9c..357d137 100644 --- a/third_party/blink/renderer/modules/media_controls/media_controls_orientation_lock_delegate.cc +++ b/third_party/blink/renderer/modules/media_controls/media_controls_orientation_lock_delegate.cc
@@ -6,6 +6,7 @@ #include <memory> +#include "base/time/time.h" #include "build/build_config.h" #include "third_party/blink/public/common/thread_safe_browser_interface_broker_proxy.h" #include "third_party/blink/public/platform/task_type.h"
diff --git a/third_party/blink/renderer/modules/mediacapturefromelement/canvas_capture_handler.h b/third_party/blink/renderer/modules/mediacapturefromelement/canvas_capture_handler.h index 29e4c6f..0d5b01e 100644 --- a/third_party/blink/renderer/modules/mediacapturefromelement/canvas_capture_handler.h +++ b/third_party/blink/renderer/modules/mediacapturefromelement/canvas_capture_handler.h
@@ -14,6 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "gpu/GLES2/gl2extchromium.h" #include "media/base/video_frame_pool.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/third_party/blink/renderer/modules/mediacapturefromelement/html_audio_element_capturer_source_unittest.cc b/third_party/blink/renderer/modules/mediacapturefromelement/html_audio_element_capturer_source_unittest.cc index fd013a3d..cb61f48 100644 --- a/third_party/blink/renderer/modules/mediacapturefromelement/html_audio_element_capturer_source_unittest.cc +++ b/third_party/blink/renderer/modules/mediacapturefromelement/html_audio_element_capturer_source_unittest.cc
@@ -6,6 +6,7 @@ #include "base/memory/weak_ptr.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "media/audio/null_audio_sink.h" #include "media/base/audio_parameters.h" #include "media/base/fake_audio_render_callback.h"
diff --git a/third_party/blink/renderer/modules/mediacapturefromelement/timed_canvas_draw_listener.h b/third_party/blink/renderer/modules/mediacapturefromelement/timed_canvas_draw_listener.h index 4cd4fe6..1b36264 100644 --- a/third_party/blink/renderer/modules/mediacapturefromelement/timed_canvas_draw_listener.h +++ b/third_party/blink/renderer/modules/mediacapturefromelement/timed_canvas_draw_listener.h
@@ -7,6 +7,7 @@ #include <memory> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "third_party/blink/renderer/modules/mediacapturefromelement/canvas_capture_handler.h" #include "third_party/blink/renderer/modules/mediacapturefromelement/on_request_canvas_draw_listener.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
diff --git a/third_party/blink/renderer/modules/mediarecorder/audio_track_opus_encoder.cc b/third_party/blink/renderer/modules/mediarecorder/audio_track_opus_encoder.cc index 19040f2d..da822b44 100644 --- a/third_party/blink/renderer/modules/mediarecorder/audio_track_opus_encoder.cc +++ b/third_party/blink/renderer/modules/mediarecorder/audio_track_opus_encoder.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/logging.h" +#include "base/time/time.h" #include "media/base/audio_sample_types.h" #include "media/base/audio_timestamp_helper.h"
diff --git a/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder.cc b/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder.cc index 6980d535..f35f037e 100644 --- a/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder.cc +++ b/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/modules/mediarecorder/audio_track_recorder.h" +#include "base/time/time.h" #include "media/base/audio_bus.h" #include "media/base/audio_parameters.h" #include "media/base/bind_to_current_loop.h"
diff --git a/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder_unittest.cc b/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder_unittest.cc index b8efb028d..da3700c812 100644 --- a/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder_unittest.cc +++ b/third_party/blink/renderer/modules/mediarecorder/audio_track_recorder_unittest.cc
@@ -10,6 +10,7 @@ #include "base/run_loop.h" #include "base/test/gmock_callback_support.h" +#include "base/time/time.h" #include "media/audio/simple_sources.h" #include "media/base/audio_sample_types.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder_unittest.cc b/third_party/blink/renderer/modules/mediarecorder/h264_encoder_unittest.cc index 02d8a51..9c83e95 100644 --- a/third_party/blink/renderer/modules/mediarecorder/h264_encoder_unittest.cc +++ b/third_party/blink/renderer/modules/mediarecorder/h264_encoder_unittest.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/synchronization/waitable_event.h" +#include "base/time/time.h" #include "media/base/video_codecs.h" #include "media/base/video_frame.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/modules/mediarecorder/media_recorder_handler.h b/third_party/blink/renderer/modules/mediarecorder/media_recorder_handler.h index 62ead3c7..45e68ea 100644 --- a/third_party/blink/renderer/modules/mediarecorder/media_recorder_handler.h +++ b/third_party/blink/renderer/modules/mediarecorder/media_recorder_handler.h
@@ -10,6 +10,7 @@ #include "base/strings/string_piece.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/web/modules/mediastream/encoded_video_frame.h" #include "third_party/blink/renderer/modules/mediarecorder/audio_track_recorder.h"
diff --git a/third_party/blink/renderer/modules/mediarecorder/vea_encoder.h b/third_party/blink/renderer/modules/mediarecorder/vea_encoder.h index e95dcda..dba8c1e 100644 --- a/third_party/blink/renderer/modules/mediarecorder/vea_encoder.h +++ b/third_party/blink/renderer/modules/mediarecorder/vea_encoder.h
@@ -9,6 +9,7 @@ #include "media/video/video_encode_accelerator.h" #include "third_party/blink/renderer/modules/mediarecorder/video_track_recorder.h" +#include "base/time/time.h" #include "third_party/blink/renderer/platform/wtf/vector.h" #include "ui/gfx/geometry/size.h"
diff --git a/third_party/blink/renderer/modules/mediarecorder/vpx_encoder.h b/third_party/blink/renderer/modules/mediarecorder/vpx_encoder.h index a65a7085..91435338 100644 --- a/third_party/blink/renderer/modules/mediarecorder/vpx_encoder.h +++ b/third_party/blink/renderer/modules/mediarecorder/vpx_encoder.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIARECORDER_VPX_ENCODER_H_ #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "third_party/blink/renderer/modules/mediarecorder/video_track_recorder.h" #include "third_party/blink/renderer/platform/wtf/vector.h" #include "third_party/libvpx/source/libvpx/vpx/vp8cx.h"
diff --git a/third_party/blink/renderer/modules/mediasession/media_session.cc b/third_party/blink/renderer/modules/mediasession/media_session.cc index 47df6c8..5280720 100644 --- a/third_party/blink/renderer/modules/mediasession/media_session.cc +++ b/third_party/blink/renderer/modules/mediasession/media_session.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/browser_interface_broker_proxy.h" #include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-blink.h"
diff --git a/third_party/blink/renderer/modules/mediastream/low_latency_video_renderer_algorithm_unittest.cc b/third_party/blink/renderer/modules/mediastream/low_latency_video_renderer_algorithm_unittest.cc index 70463e0..8cffd06 100644 --- a/third_party/blink/renderer/modules/mediastream/low_latency_video_renderer_algorithm_unittest.cc +++ b/third_party/blink/renderer/modules/mediastream/low_latency_video_renderer_algorithm_unittest.cc
@@ -4,6 +4,7 @@ #include <queue> +#include "base/time/time.h" #include "media/base/video_frame_pool.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/modules/mediastream/low_latency_video_renderer_algorithm.h"
diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source_test.cc b/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source_test.cc index 136c2124..b8f2aac 100644 --- a/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source_test.cc +++ b/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source_test.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" +#include "base/time/time.h" #include "media/base/bind_to_current_loop.h" #include "mojo/public/cpp/bindings/remote.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_video_track.cc b/third_party/blink/renderer/modules/mediastream/media_stream_video_track.cc index 60a28918..72fee5c 100644 --- a/third_party/blink/renderer/modules/mediastream/media_stream_video_track.cc +++ b/third_party/blink/renderer/modules/mediastream/media_stream_video_track.cc
@@ -11,6 +11,7 @@ #include "base/containers/contains.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/bind_to_current_loop.h" #include "media/base/limits.h"
diff --git a/third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc b/third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc index 50f4aba..3b4199c9 100644 --- a/third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc +++ b/third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc
@@ -412,8 +412,7 @@ SetFormat(audio_capture_params); // Add processing to the AudioCapturerSource configuration. - source_config.processing = media::AudioSourceParameters::ProcessingConfig( - rtc_audio_device->GetAudioProcessingId(), audio_processing_settings); + source_config.processing = audio_processing_settings; } else { // Create the MediaStreamAudioProcessor, bound to the WebRTC audio device
diff --git a/third_party/blink/renderer/modules/mediastream/track_audio_renderer.h b/third_party/blink/renderer/modules/mediastream/track_audio_renderer.h index 3f55d497..31f3d02 100644 --- a/third_party/blink/renderer/modules/mediastream/track_audio_renderer.h +++ b/third_party/blink/renderer/modules/mediastream/track_audio_renderer.h
@@ -13,6 +13,7 @@ #include "base/memory/scoped_refptr.h" #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "base/unguessable_token.h" #include "media/base/audio_renderer_sink.h" #include "third_party/blink/public/platform/modules/mediastream/web_media_stream_audio_renderer.h"
diff --git a/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc b/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc index d6f26f8d..bc8b7bbc 100644 --- a/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc +++ b/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "media/base/limits.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/web/web_heap.h"
diff --git a/third_party/blink/renderer/modules/mediastream/webmediaplayer_ms.cc b/third_party/blink/renderer/modules/mediastream/webmediaplayer_ms.cc index 6ba8ad03..6501864 100644 --- a/third_party/blink/renderer/modules/mediastream/webmediaplayer_ms.cc +++ b/third_party/blink/renderer/modules/mediastream/webmediaplayer_ms.cc
@@ -14,6 +14,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/layers/video_frame_provider_client_impl.h" #include "cc/layers/video_layer.h"
diff --git a/third_party/blink/renderer/modules/mediastream/webmediaplayer_ms_compositor.h b/third_party/blink/renderer/modules/mediastream/webmediaplayer_ms_compositor.h index 7236695f..59b1a60 100644 --- a/third_party/blink/renderer/modules/mediastream/webmediaplayer_ms_compositor.h +++ b/third_party/blink/renderer/modules/mediastream/webmediaplayer_ms_compositor.h
@@ -14,6 +14,7 @@ #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "cc/layers/surface_layer.h" #include "cc/layers/video_frame_provider.h" #include "media/base/media_util.h"
diff --git a/third_party/blink/renderer/modules/netinfo/network_information.cc b/third_party/blink/renderer/modules/netinfo/network_information.cc index 950c2af..9376b39 100644 --- a/third_party/blink/renderer/modules/netinfo/network_information.cc +++ b/third_party/blink/renderer/modules/netinfo/network_information.cc
@@ -6,6 +6,7 @@ #include <algorithm> +#include "base/time/time.h" #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h" #include "third_party/blink/public/platform/task_type.h" #include "third_party/blink/renderer/core/dom/events/event.h"
diff --git a/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.cc b/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.cc index 4a36b56c..6907ec84 100644 --- a/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.cc +++ b/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.cc
@@ -10,6 +10,7 @@ #include "base/callback_helpers.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "media/base/bind_to_current_loop.h" #include "media/base/timestamp_constants.h"
diff --git a/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source_test.cc b/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source_test.cc index 8ff4057..444489e 100644 --- a/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source_test.cc +++ b/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source_test.cc
@@ -14,6 +14,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/gmock_callback_support.h" #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "media/base/video_frame.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/common/features.h"
diff --git a/third_party/blink/renderer/modules/peerconnection/media_stream_track_metrics_test.cc b/third_party/blink/renderer/modules/peerconnection/media_stream_track_metrics_test.cc index b40ed14..4bf7a86 100644 --- a/third_party/blink/renderer/modules/peerconnection/media_stream_track_metrics_test.cc +++ b/third_party/blink/renderer/modules/peerconnection/media_stream_track_metrics_test.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/run_loop.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/modules/peerconnection/media_stream_track_metrics.h"
diff --git a/third_party/blink/renderer/modules/peerconnection/mock_peer_connection_dependency_factory.h b/third_party/blink/renderer/modules/peerconnection/mock_peer_connection_dependency_factory.h index 56f1408..8658f03 100644 --- a/third_party/blink/renderer/modules/peerconnection/mock_peer_connection_dependency_factory.h +++ b/third_party/blink/renderer/modules/peerconnection/mock_peer_connection_dependency_factory.h
@@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/time/time.h" #include "third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.h" #include "third_party/webrtc/api/media_stream_interface.h" #include "third_party/webrtc/rtc_base/ref_counted_object.h"
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.h b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.h index 8f363fd..010545d 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.h +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.h
@@ -35,6 +35,7 @@ #include <utility> #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.h b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.h index 0f52c0d..4891a911 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.h +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.h
@@ -15,6 +15,7 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "third_party/blink/public/mojom/peerconnection/peer_connection_tracker.mojom-blink.h" #include "third_party/blink/renderer/modules/modules_export.h" #include "third_party/blink/renderer/modules/peerconnection/media_stream_track_metrics.h"
diff --git a/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc b/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc index 6c80a30..266ecd34 100644 --- a/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc +++ b/third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
@@ -63,7 +63,6 @@ MOCK_METHOD1(RemoveAudioRenderer, void(blink::WebRtcAudioRenderer* renderer)); MOCK_METHOD0(AudioRendererThreadStopped, void()); MOCK_METHOD1(SetOutputDeviceForAec, void(const String&)); - MOCK_CONST_METHOD0(GetAudioProcessingId, base::UnguessableToken()); }; // Mock blink::Platform implementation needed for creating @@ -165,8 +164,6 @@ MediaStreamSourceVector dummy_components; stream_descriptor_ = MakeGarbageCollected<MediaStreamDescriptor>( String::FromUTF8("new stream"), dummy_components, dummy_components); - EXPECT_CALL(*source_.get(), GetAudioProcessingId()) - .WillRepeatedly(Return(*kAudioProcessingId)); } void SetupRenderer(const String& device_id) { @@ -228,8 +225,6 @@ blink::ScopedTestingPlatformSupport<AudioDeviceFactoryTestingPlatformSupport> audio_device_factory_platform_; - const absl::optional<base::UnguessableToken> kAudioProcessingId = - base::UnguessableToken::Create(); std::unique_ptr<MockAudioRendererSource> source_; Persistent<MediaStreamDescriptor> stream_descriptor_; std::unique_ptr<blink::scheduler::WebAgentGroupScheduler> @@ -359,8 +354,6 @@ // blink::Platform::NewAudioRendererSink should have been called by now. EXPECT_EQ(params.device_id, kOtherOutputDeviceId); - EXPECT_EQ(params.processing_id, kAudioProcessingId); - EXPECT_CALL(*mock_sink(), Stop()); EXPECT_CALL(*source_.get(), RemoveAudioRenderer(renderer_.get())); renderer_proxy_->Stop(); @@ -391,8 +384,6 @@ // blink::Platform::NewAudioRendererSink should have been called by now. EXPECT_EQ(params.device_id, kInvalidOutputDeviceId); - EXPECT_EQ(params.processing_id, kAudioProcessingId); - EXPECT_CALL(*original_sink, Stop()); EXPECT_CALL(*source_.get(), RemoveAudioRenderer(renderer_.get())); renderer_proxy_->Stop(); @@ -414,7 +405,6 @@ // blink::Platform::NewAudioRendererSink should have been called by now. EXPECT_EQ(params.device_id, kInvalidOutputDeviceId); - EXPECT_EQ(params.processing_id, kAudioProcessingId); renderer_proxy_ = renderer_->CreateSharedAudioRendererProxy(stream_descriptor_);
diff --git a/third_party/blink/renderer/modules/storage/cached_storage_area.cc b/third_party/blink/renderer/modules/storage/cached_storage_area.cc index 2ac66d1..e341e25 100644 --- a/third_party/blink/renderer/modules/storage/cached_storage_area.cc +++ b/third_party/blink/renderer/modules/storage/cached_storage_area.cc
@@ -13,7 +13,6 @@ #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h" #include "base/rand_util.h" -#include "base/task/post_task.h" #include "base/trace_event/memory_dump_manager.h" #include "third_party/blink/public/platform/scheduler/web_thread_scheduler.h" #include "third_party/blink/renderer/core/frame/local_dom_window.h"
diff --git a/third_party/blink/renderer/modules/storage/storage_controller_test.cc b/third_party/blink/renderer/modules/storage/storage_controller_test.cc index 08a6823..340e50aa 100644 --- a/third_party/blink/renderer/modules/storage/storage_controller_test.cc +++ b/third_party/blink/renderer/modules/storage/storage_controller_test.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/third_party/blink/renderer/modules/storage/storage_namespace_test.cc b/third_party/blink/renderer/modules/storage/storage_namespace_test.cc index a265847b..4c358bb 100644 --- a/third_party/blink/renderer/modules/storage/storage_namespace_test.cc +++ b/third_party/blink/renderer/modules/storage/storage_namespace_test.cc
@@ -6,7 +6,6 @@ #include <tuple> -#include "base/task/post_task.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h"
diff --git a/third_party/blink/renderer/modules/video_rvfc/video_frame_callback_requester_impl_test.cc b/third_party/blink/renderer/modules/video_rvfc/video_frame_callback_requester_impl_test.cc index 36d505e8..78d7656b 100644 --- a/third_party/blink/renderer/modules/video_rvfc/video_frame_callback_requester_impl_test.cc +++ b/third_party/blink/renderer/modules/video_rvfc/video_frame_callback_requester_impl_test.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/modules/video_rvfc/video_frame_callback_requester_impl.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/bindings/core/v8/script_function.h"
diff --git a/third_party/blink/renderer/modules/webcodecs/reclaimable_codec.h b/third_party/blink/renderer/modules/webcodecs/reclaimable_codec.h index e1bbd01b..adf8945 100644 --- a/third_party/blink/renderer/modules/webcodecs/reclaimable_codec.h +++ b/third_party/blink/renderer/modules/webcodecs/reclaimable_codec.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/feature_list.h" +#include "base/time/time.h" #include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h" #include "third_party/blink/renderer/modules/modules_export.h" #include "third_party/blink/renderer/platform/heap/prefinalizer.h"
diff --git a/third_party/blink/renderer/modules/webcodecs/reclaimable_codec_test.cc b/third_party/blink/renderer/modules/webcodecs/reclaimable_codec_test.cc index ebf1073..1400fa5c 100644 --- a/third_party/blink/renderer/modules/webcodecs/reclaimable_codec_test.cc +++ b/third_party/blink/renderer/modules/webcodecs/reclaimable_codec_test.cc
@@ -7,6 +7,7 @@ #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "media/base/test_helpers.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/modules/webcodecs/video_decoder_broker_test.cc b/third_party/blink/renderer/modules/webcodecs/video_decoder_broker_test.cc index 51cbed2..68382f8 100644 --- a/third_party/blink/renderer/modules/webcodecs/video_decoder_broker_test.cc +++ b/third_party/blink/renderer/modules/webcodecs/video_decoder_broker_test.cc
@@ -33,6 +33,7 @@ #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_testing.h" #include "third_party/blink/renderer/platform/wtf/functional.h" +#include "base/time/time.h" #include "third_party/blink/renderer/modules/webcodecs/video_decoder_broker.h" using ::testing::_; using ::testing::Invoke;
diff --git a/third_party/blink/renderer/modules/webcodecs/video_frame.cc b/third_party/blink/renderer/modules/webcodecs/video_frame.cc index 59694511..0917aa8 100644 --- a/third_party/blink/renderer/modules/webcodecs/video_frame.cc +++ b/third_party/blink/renderer/modules/webcodecs/video_frame.cc
@@ -12,6 +12,7 @@ #include "base/feature_list.h" #include "base/memory/scoped_refptr.h" #include "base/numerics/checked_math.h" +#include "base/time/time.h" #include "components/viz/common/gpu/raster_context_provider.h" #include "media/base/bind_to_current_loop.h" #include "media/base/limits.h"
diff --git a/third_party/blink/renderer/modules/webcodecs/webcodecs_logger.h b/third_party/blink/renderer/modules/webcodecs/webcodecs_logger.h index 8d5eb5d..64924003 100644 --- a/third_party/blink/renderer/modules/webcodecs/webcodecs_logger.h +++ b/third_party/blink/renderer/modules/webcodecs/webcodecs_logger.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBCODECS_WEBCODECS_LOGGER_H_ #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "media/base/video_frame.h" #include "third_party/blink/renderer/core/execution_context/execution_context.h" #include "third_party/blink/renderer/modules/modules_export.h"
diff --git a/third_party/blink/renderer/modules/webdatabase/web_database_host.cc b/third_party/blink/renderer/modules/webdatabase/web_database_host.cc index 50b24102..4b7db79 100644 --- a/third_party/blink/renderer/modules/webdatabase/web_database_host.cc +++ b/third_party/blink/renderer/modules/webdatabase/web_database_host.cc
@@ -6,7 +6,6 @@ #include <utility> -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/third_party/blink/renderer/modules/webrtc/webrtc_audio_device_impl.cc b/third_party/blink/renderer/modules/webrtc/webrtc_audio_device_impl.cc index 248810f..a51495e 100644 --- a/third_party/blink/renderer/modules/webrtc/webrtc_audio_device_impl.cc +++ b/third_party/blink/renderer/modules/webrtc/webrtc_audio_device_impl.cc
@@ -30,13 +30,11 @@ } // namespace WebRtcAudioDeviceImpl::WebRtcAudioDeviceImpl() - : audio_processing_id_(base::UnguessableToken::Create()), - audio_transport_callback_(nullptr), + : audio_transport_callback_(nullptr), initialized_(false), playing_(false), recording_(false) { - SendLogMessage(base::StringPrintf("%s({id=%s})", __func__, - GetAudioProcessingId().ToString().c_str())); + SendLogMessage(base::StringPrintf("%s()", __func__)); // This object can be constructed on either the signaling thread or the main // thread, so we need to detach these thread checkers here and have them // initialize automatically when the first methods are called. @@ -48,8 +46,7 @@ } WebRtcAudioDeviceImpl::~WebRtcAudioDeviceImpl() { - SendLogMessage(base::StringPrintf("%s() [id=%s]", __func__, - GetAudioProcessingId().ToString().c_str())); + SendLogMessage(base::StringPrintf("%s()", __func__)); DCHECK(!initialized_) << "Terminate must have been called."; } @@ -141,9 +138,8 @@ void WebRtcAudioDeviceImpl::SetOutputDeviceForAec( const String& output_device_id) { DCHECK_CALLED_ON_VALID_THREAD(main_thread_checker_); - SendLogMessage(base::StringPrintf("%s({output_device_id=%s}) [id=%s]", - __func__, output_device_id.Utf8().c_str(), - GetAudioProcessingId().ToString().c_str())); + SendLogMessage(base::StringPrintf("%s({output_device_id=%s})", __func__, + output_device_id.Utf8().c_str())); output_device_id_for_aec_ = output_device_id; base::AutoLock lock(lock_); for (auto* capturer : capturers_) { @@ -151,15 +147,10 @@ } } -base::UnguessableToken WebRtcAudioDeviceImpl::GetAudioProcessingId() const { - return audio_processing_id_; -} - int32_t WebRtcAudioDeviceImpl::RegisterAudioCallback( webrtc::AudioTransport* audio_callback) { DCHECK_CALLED_ON_VALID_THREAD(signaling_thread_checker_); - SendLogMessage(base::StringPrintf("%s() [id=%s]", __func__, - GetAudioProcessingId().ToString().c_str())); + SendLogMessage(base::StringPrintf("%s()", __func__)); base::AutoLock lock(lock_); DCHECK_EQ(!audio_transport_callback_, !!audio_callback); audio_transport_callback_ = audio_callback; @@ -271,8 +262,7 @@ int32_t WebRtcAudioDeviceImpl::StartRecording() { DCHECK_CALLED_ON_VALID_THREAD(worker_thread_checker_); DCHECK(initialized_); - SendLogMessage(base::StringPrintf("%s() [id=%s]", __func__, - GetAudioProcessingId().ToString().c_str())); + SendLogMessage(base::StringPrintf("%s()", __func__)); base::AutoLock auto_lock(lock_); if (!audio_transport_callback_) { LOG(ERROR) << "Audio transport is missing"; @@ -294,8 +284,7 @@ DCHECK(signaling_thread_checker_.CalledOnValidThread() || worker_thread_checker_.CalledOnValidThread()); #endif - SendLogMessage(base::StringPrintf("%s() [id=%s]", __func__, - GetAudioProcessingId().ToString().c_str())); + SendLogMessage(base::StringPrintf("%s()", __func__)); base::AutoLock auto_lock(lock_); recording_ = false; return 0; @@ -320,8 +309,7 @@ blink::WebRtcAudioRenderer* renderer) { DCHECK_CALLED_ON_VALID_THREAD(main_thread_checker_); DCHECK(renderer); - SendLogMessage(base::StringPrintf("%s() [id=%s]", __func__, - GetAudioProcessingId().ToString().c_str())); + SendLogMessage(base::StringPrintf("%s()", __func__)); // Here we acquire |lock_| in order to protect the internal state. { @@ -359,8 +347,7 @@ void WebRtcAudioDeviceImpl::AddAudioCapturer( ProcessedLocalAudioSource* capturer) { DCHECK_CALLED_ON_VALID_THREAD(main_thread_checker_); - SendLogMessage(base::StringPrintf("%s() [id=%s]", __func__, - GetAudioProcessingId().ToString().c_str())); + SendLogMessage(base::StringPrintf("%s()", __func__)); DCHECK(capturer); DCHECK(!capturer->device().id.empty()); @@ -373,8 +360,7 @@ void WebRtcAudioDeviceImpl::RemoveAudioCapturer( ProcessedLocalAudioSource* capturer) { DCHECK_CALLED_ON_VALID_THREAD(main_thread_checker_); - SendLogMessage(base::StringPrintf("%s() [id=%s]", __func__, - GetAudioProcessingId().ToString().c_str())); + SendLogMessage(base::StringPrintf("%s()", __func__)); DCHECK(capturer); base::AutoLock auto_lock(lock_); capturers_.remove(capturer);
diff --git a/third_party/blink/renderer/modules/webrtc/webrtc_audio_device_impl.h b/third_party/blink/renderer/modules/webrtc/webrtc_audio_device_impl.h index 460c556..d2e5c80f 100644 --- a/third_party/blink/renderer/modules/webrtc/webrtc_audio_device_impl.h +++ b/third_party/blink/renderer/modules/webrtc/webrtc_audio_device_impl.h
@@ -126,7 +126,6 @@ void RemoveAudioRenderer(blink::WebRtcAudioRenderer* renderer) override; void AudioRendererThreadStopped() override; void SetOutputDeviceForAec(const String& output_device_id) override; - base::UnguessableToken GetAudioProcessingId() const override; // blink::WebRtcPlayoutDataSource implementation. void AddPlayoutSink(blink::WebRtcPlayoutDataSource::Sink* sink) override; @@ -145,8 +144,6 @@ THREAD_CHECKER(worker_thread_checker_); THREAD_CHECKER(audio_renderer_thread_checker_); - const base::UnguessableToken audio_processing_id_; - // List of captures which provides access to the native audio input layer // in the browser process. The last capturer in this list is considered the // "default capturer" by the methods implementing the
diff --git a/third_party/blink/renderer/modules/webrtc/webrtc_audio_renderer.cc b/third_party/blink/renderer/modules/webrtc/webrtc_audio_renderer.cc index 7be5c757..67f9a28 100644 --- a/third_party/blink/renderer/modules/webrtc/webrtc_audio_renderer.cc +++ b/third_party/blink/renderer/modules/webrtc/webrtc_audio_renderer.cc
@@ -354,7 +354,6 @@ String::Format("%s([state=%s])", __func__, StateToString(state_))); media::AudioSinkParameters sink_params(session_id_, output_device_id_.Utf8()); - sink_params.processing_id = source->GetAudioProcessingId(); sink_ = Platform::Current()->NewAudioRendererSink( WebAudioDeviceSourceType::kWebRtc, source_internal_frame_->web_frame(), sink_params); @@ -577,7 +576,6 @@ #endif media::AudioSinkParameters sink_params(session_id_, device_id); - sink_params.processing_id = source_->GetAudioProcessingId(); scoped_refptr<media::AudioRendererSink> new_sink = Platform::Current()->NewAudioRendererSink( WebAudioDeviceSourceType::kWebRtc, web_frame, sink_params);
diff --git a/third_party/blink/renderer/modules/websockets/websocket_message_chunk_accumulator_test.cc b/third_party/blink/renderer/modules/websockets/websocket_message_chunk_accumulator_test.cc index 958727e..24aa08a5d 100644 --- a/third_party/blink/renderer/modules/websockets/websocket_message_chunk_accumulator_test.cc +++ b/third_party/blink/renderer/modules/websockets/websocket_message_chunk_accumulator_test.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/modules/websockets/websocket_message_chunk_accumulator.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/scheduler/test/fake_task_runner.h"
diff --git a/third_party/blink/renderer/modules/webtransport/web_transport.h b/third_party/blink/renderer/modules/webtransport/web_transport.h index 33429361..4382ae1 100644 --- a/third_party/blink/renderer/modules/webtransport/web_transport.h +++ b/third_party/blink/renderer/modules/webtransport/web_transport.h
@@ -8,6 +8,7 @@ #include <stdint.h> #include "base/containers/span.h" +#include "base/time/time.h" #include "base/types/pass_key.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/third_party/blink/renderer/modules/xr/xr_frame_provider.h b/third_party/blink/renderer/modules/xr/xr_frame_provider.h index d9943cc..d2a49cb4a 100644 --- a/third_party/blink/renderer/modules/xr/xr_frame_provider.h +++ b/third_party/blink/renderer/modules/xr/xr_frame_provider.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_XR_XR_FRAME_PROVIDER_H_ #define THIRD_PARTY_BLINK_RENDERER_MODULES_XR_XR_FRAME_PROVIDER_H_ +#include "base/time/time.h" #include "device/vr/public/mojom/vr_service.mojom-blink.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
diff --git a/third_party/blink/renderer/modules/xr/xr_input_source.h b/third_party/blink/renderer/modules/xr/xr_input_source.h index 6dc756e1..f29dd062 100644 --- a/third_party/blink/renderer/modules/xr/xr_input_source.h +++ b/third_party/blink/renderer/modules/xr/xr_input_source.h
@@ -7,6 +7,7 @@ #include <memory> +#include "base/time/time.h" #include "device/vr/public/mojom/vr_service.mojom-blink.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/modules/gamepad/gamepad.h"
diff --git a/third_party/blink/renderer/modules/xr/xr_system.h b/third_party/blink/renderer/modules/xr/xr_system.h index b36fb48..e15b38b 100644 --- a/third_party/blink/renderer/modules/xr/xr_system.h +++ b/third_party/blink/renderer/modules/xr/xr_system.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_XR_XR_SYSTEM_H_ #define THIRD_PARTY_BLINK_RENDERER_MODULES_XR_XR_SYSTEM_H_ +#include "base/time/time.h" #include "device/vr/public/mojom/vr_service.mojom-blink.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
diff --git a/third_party/blink/renderer/platform/blob/blob_bytes_provider.cc b/third_party/blink/renderer/platform/blob/blob_bytes_provider.cc index 125acccd..de9d940 100644 --- a/third_party/blink/renderer/platform/blob/blob_bytes_provider.cc +++ b/third_party/blink/renderer/platform/blob/blob_bytes_provider.cc
@@ -9,7 +9,6 @@ #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/numerics/safe_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "third_party/blink/public/platform/platform.h"
diff --git a/third_party/blink/renderer/platform/blob/blob_bytes_provider_test.cc b/third_party/blink/renderer/platform/blob/blob_bytes_provider_test.cc index 27bdebc..cb93aa85 100644 --- a/third_party/blink/renderer/platform/blob/blob_bytes_provider_test.cc +++ b/third_party/blink/renderer/platform/blob/blob_bytes_provider_test.cc
@@ -13,6 +13,7 @@ #include "base/files/file_util.h" #include "base/run_loop.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
diff --git a/third_party/blink/renderer/platform/graphics/animation_worklet_mutator_dispatcher_impl.cc b/third_party/blink/renderer/platform/graphics/animation_worklet_mutator_dispatcher_impl.cc index 7c4377d..de9f6763 100644 --- a/third_party/blink/renderer/platform/graphics/animation_worklet_mutator_dispatcher_impl.cc +++ b/third_party/blink/renderer/platform/graphics/animation_worklet_mutator_dispatcher_impl.cc
@@ -11,6 +11,7 @@ #include "base/metrics/histogram_macros.h" #include "base/synchronization/waitable_event.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/renderer/platform/graphics/animation_worklet_mutator.h"
diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc b/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc index d158959..03a311e 100644 --- a/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc +++ b/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc
@@ -34,6 +34,7 @@ #include "base/feature_list.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "cc/paint/image_provider.h" #include "cc/paint/skia_paint_canvas.h" #include "cc/tiles/mipmap_util.h"
diff --git a/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge.h b/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge.h index 27e2ce4..07543cc 100644 --- a/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge.h +++ b/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge.h
@@ -33,6 +33,7 @@ #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/numerics/checked_math.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/layers/texture_layer_client.h" #include "components/viz/common/resources/transferable_resource.h"
diff --git a/third_party/blink/renderer/platform/graphics/deferred_image_decoder.cc b/third_party/blink/renderer/platform/graphics/deferred_image_decoder.cc index 5e8da9b2..d627d54 100644 --- a/third_party/blink/renderer/platform/graphics/deferred_image_decoder.cc +++ b/third_party/blink/renderer/platform/graphics/deferred_image_decoder.cc
@@ -30,6 +30,7 @@ #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/platform/graphics/decoding_image_generator.h" #include "third_party/blink/renderer/platform/graphics/image_decoding_store.h"
diff --git a/third_party/blink/renderer/platform/graphics/deferred_image_decoder_test.cc b/third_party/blink/renderer/platform/graphics/deferred_image_decoder_test.cc index c0112aa..a73d41f 100644 --- a/third_party/blink/renderer/platform/graphics/deferred_image_decoder_test.cc +++ b/third_party/blink/renderer/platform/graphics/deferred_image_decoder_test.cc
@@ -28,6 +28,7 @@ #include <memory> #include "base/location.h" #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/platform/platform.h"
diff --git a/third_party/blink/renderer/platform/graphics/gpu/xr_frame_transport.h b/third_party/blink/renderer/platform/graphics/gpu/xr_frame_transport.h index 869c748c..1273e54 100644 --- a/third_party/blink/renderer/platform/graphics/gpu/xr_frame_transport.h +++ b/third_party/blink/renderer/platform/graphics/gpu/xr_frame_transport.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_GPU_XR_FRAME_TRANSPORT_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_GPU_XR_FRAME_TRANSPORT_H_ +#include "base/time/time.h" #include "device/vr/public/mojom/vr_service.mojom-blink.h" #include "third_party/blink/public/platform/web_graphics_context_3d_provider.h" #include "third_party/blink/renderer/platform/context_lifecycle_notifier.h"
diff --git a/third_party/blink/renderer/platform/graphics/parkable_image.h b/third_party/blink/renderer/platform/graphics/parkable_image.h index 57e42d26e..2f2d0aa 100644 --- a/third_party/blink/renderer/platform/graphics/parkable_image.h +++ b/third_party/blink/renderer/platform/graphics/parkable_image.h
@@ -10,6 +10,7 @@ #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "third_party/blink/public/platform/web_data.h" #include "third_party/blink/renderer/platform/disk_data_metadata.h" #include "third_party/blink/renderer/platform/graphics/rw_buffer.h"
diff --git a/third_party/blink/renderer/platform/graphics/parkable_image_manager.cc b/third_party/blink/renderer/platform/graphics/parkable_image_manager.cc index 1af8ce9..3821d75 100644 --- a/third_party/blink/renderer/platform/graphics/parkable_image_manager.cc +++ b/third_party/blink/renderer/platform/graphics/parkable_image_manager.cc
@@ -7,6 +7,7 @@ #include "base/metrics/histogram_functions.h" #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "base/trace_event/process_memory_dump.h" #include "third_party/blink/renderer/platform/graphics/parkable_image.h" #include "third_party/blink/renderer/platform/scheduler/public/thread.h"
diff --git a/third_party/blink/renderer/platform/graphics/picture_snapshot.cc b/third_party/blink/renderer/platform/graphics/picture_snapshot.cc index b1a385bb..053669e 100644 --- a/third_party/blink/renderer/platform/graphics/picture_snapshot.cc +++ b/third_party/blink/renderer/platform/graphics/picture_snapshot.cc
@@ -31,6 +31,7 @@ #include "third_party/blink/renderer/platform/graphics/picture_snapshot.h" #include <memory> +#include "base/time/time.h" #include "third_party/blink/renderer/platform/graphics/logging_canvas.h" #include "third_party/blink/renderer/platform/graphics/profiling_canvas.h" #include "third_party/blink/renderer/platform/graphics/replaying_canvas.h"
diff --git a/third_party/blink/renderer/platform/graphics/profiling_canvas.h b/third_party/blink/renderer/platform/graphics/profiling_canvas.h index 1836c57..59d97f4b 100644 --- a/third_party/blink/renderer/platform/graphics/profiling_canvas.h +++ b/third_party/blink/renderer/platform/graphics/profiling_canvas.h
@@ -33,6 +33,7 @@ #include "third_party/blink/renderer/platform/graphics/intercepting_canvas.h" +#include "base/time/time.h" #include "third_party/blink/renderer/platform/wtf/vector.h" namespace blink {
diff --git a/third_party/blink/renderer/platform/image-decoders/png/png_image_decoder_test.cc b/third_party/blink/renderer/platform/image-decoders/png/png_image_decoder_test.cc index b31122b..af054eb 100644 --- a/third_party/blink/renderer/platform/image-decoders/png/png_image_decoder_test.cc +++ b/third_party/blink/renderer/platform/image-decoders/png/png_image_decoder_test.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/logging.h" +#include "base/time/time.h" #include "png.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/image-decoders/image_decoder_test_helpers.h"
diff --git a/third_party/blink/renderer/platform/image-decoders/webp/webp_image_decoder_test.cc b/third_party/blink/renderer/platform/image-decoders/webp/webp_image_decoder_test.cc index 07b0edf..a61dcd4 100644 --- a/third_party/blink/renderer/platform/image-decoders/webp/webp_image_decoder_test.cc +++ b/third_party/blink/renderer/platform/image-decoders/webp/webp_image_decoder_test.cc
@@ -32,6 +32,7 @@ #include <memory> +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/platform/web_data.h" #include "third_party/blink/renderer/platform/image-decoders/image_decoder_test_helpers.h"
diff --git a/third_party/blink/renderer/platform/instrumentation/histogram.h b/third_party/blink/renderer/platform/instrumentation/histogram.h index 487f3408..d29ef5e 100644 --- a/third_party/blink/renderer/platform/instrumentation/histogram.h +++ b/third_party/blink/renderer/platform/instrumentation/histogram.h
@@ -10,6 +10,7 @@ #include "base/metrics/histogram_macros.h" #include "base/time/default_tick_clock.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
diff --git a/third_party/blink/renderer/platform/loader/fetch/fetch_api_request_body_mojom_traits.cc b/third_party/blink/renderer/platform/loader/fetch/fetch_api_request_body_mojom_traits.cc index e65e829..5a2d49a 100644 --- a/third_party/blink/renderer/platform/loader/fetch/fetch_api_request_body_mojom_traits.cc +++ b/third_party/blink/renderer/platform/loader/fetch/fetch_api_request_body_mojom_traits.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/platform/loader/fetch/fetch_api_request_body_mojom_traits.h" +#include "base/time/time.h" #include "mojo/public/cpp/base/file_mojom_traits.h" #include "mojo/public/cpp/base/file_path_mojom_traits.h" #include "mojo/public/cpp/bindings/array_traits_wtf_vector.h"
diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.h b/third_party/blink/renderer/platform/loader/fetch/memory_cache.h index 02b32efc..301d7405 100644 --- a/third_party/blink/renderer/platform/loader/fetch/memory_cache.h +++ b/third_party/blink/renderer/platform/loader/fetch/memory_cache.h
@@ -26,6 +26,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_LOADER_FETCH_MEMORY_CACHE_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_LOADER_FETCH_MEMORY_CACHE_H_ +#include "base/time/time.h" #include "third_party/blink/renderer/platform/heap/collection_support/heap_hash_map.h" #include "third_party/blink/renderer/platform/heap/collection_support/heap_vector.h" #include "third_party/blink/renderer/platform/heap/forward.h"
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_loader.h b/third_party/blink/renderer/platform/loader/fetch/resource_loader.h index ddfe4b3..8dd2356 100644 --- a/third_party/blink/renderer/platform/loader/fetch/resource_loader.h +++ b/third_party/blink/renderer/platform/loader/fetch/resource_loader.h
@@ -34,6 +34,7 @@ #include "base/feature_list.h" #include "base/gtest_prod_util.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "mojo/public/cpp/base/big_buffer.h" #include "mojo/public/cpp/bindings/associated_receiver.h" #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_timing_info.h b/third_party/blink/renderer/platform/loader/fetch/resource_timing_info.h index e989466..8d766d3 100644 --- a/third_party/blink/renderer/platform/loader/fetch/resource_timing_info.h +++ b/third_party/blink/renderer/platform/loader/fetch/resource_timing_info.h
@@ -33,6 +33,7 @@ #include <memory> +#include "base/time/time.h" #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink-forward.h" #include "third_party/blink/public/mojom/timing/resource_timing.mojom-blink.h" #include "third_party/blink/public/mojom/timing/worker_timing_container.mojom-blink.h"
diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/cached_metadata_handler.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/cached_metadata_handler.cc index 7336d02a..9187800 100644 --- a/third_party/blink/renderer/platform/loader/fetch/url_loader/cached_metadata_handler.cc +++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/cached_metadata_handler.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/platform/loader/fetch/url_loader/cached_metadata_handler.h" +#include "base/time/time.h" #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" #include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/web_security_origin.h"
diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc index 110b2b24..6cb5403 100644 --- a/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc +++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/dedicated_or_shared_worker_fetch_context_impl.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/navigation_body_loader.h b/third_party/blink/renderer/platform/loader/fetch/url_loader/navigation_body_loader.h index 30f1394..6e7ddd3 100644 --- a/third_party/blink/renderer/platform/loader/fetch/url_loader/navigation_body_loader.h +++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/navigation_body_loader.h
@@ -13,6 +13,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "mojo/public/cpp/base/big_buffer.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/source_keyed_cached_metadata_handler_test.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/source_keyed_cached_metadata_handler_test.cc index c5e6f8e..afe35af 100644 --- a/third_party/blink/renderer/platform/loader/fetch/url_loader/source_keyed_cached_metadata_handler_test.cc +++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/source_keyed_cached_metadata_handler_test.cc
@@ -5,6 +5,7 @@ #include "third_party/blink/renderer/platform/loader/fetch/source_keyed_cached_metadata_handler.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" #include "third_party/blink/public/platform/url_conversion.h"
diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/sync_load_context_unittest.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/sync_load_context_unittest.cc index 1f96d9c3..fc83082 100644 --- a/third_party/blink/renderer/platform/loader/fetch/url_loader/sync_load_context_unittest.cc +++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/sync_load_context_unittest.cc
@@ -7,6 +7,7 @@ #include "base/memory/ptr_util.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/system/data_pipe_utils.h"
diff --git a/third_party/blink/renderer/platform/loader/fetch/url_loader/web_resource_request_sender.cc b/third_party/blink/renderer/platform/loader/fetch/url_loader/web_resource_request_sender.cc index 5c8719c..2316fc9d 100644 --- a/third_party/blink/renderer/platform/loader/fetch/url_loader/web_resource_request_sender.cc +++ b/third_party/blink/renderer/platform/loader/fetch/url_loader/web_resource_request_sender.cc
@@ -16,7 +16,6 @@ #include "base/rand_util.h" #include "base/strings/string_util.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/third_party/blink/renderer/platform/loader/web_url_request_util.cc b/third_party/blink/renderer/platform/loader/web_url_request_util.cc index 3ae478c..0000bc1 100644 --- a/third_party/blink/renderer/platform/loader/web_url_request_util.cc +++ b/third_party/blink/renderer/platform/loader/web_url_request_util.cc
@@ -11,6 +11,7 @@ #include "base/check.h" #include "base/notreached.h" +#include "base/time/time.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "services/network/public/mojom/data_pipe_getter.mojom-blink.h" #include "third_party/blink/public/mojom/blob/blob.mojom-blink.h"
diff --git a/third_party/blink/renderer/platform/media/buffered_data_source_host_impl_unittest.cc b/third_party/blink/renderer/platform/media/buffered_data_source_host_impl_unittest.cc index 8a4ce31..a163df7 100644 --- a/third_party/blink/renderer/platform/media/buffered_data_source_host_impl_unittest.cc +++ b/third_party/blink/renderer/platform/media/buffered_data_source_host_impl_unittest.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace blink {
diff --git a/third_party/blink/renderer/platform/media/resource_multi_buffer_data_provider.cc b/third_party/blink/renderer/platform/media/resource_multi_buffer_data_provider.cc index 7f71935b..a2f0948e 100644 --- a/third_party/blink/renderer/platform/media/resource_multi_buffer_data_provider.cc +++ b/third_party/blink/renderer/platform/media/resource_multi_buffer_data_provider.cc
@@ -14,6 +14,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "net/http/http_byte_range.h" #include "net/http/http_request_headers.h" #include "services/network/public/cpp/cors/cors.h"
diff --git a/third_party/blink/renderer/platform/media/smoothness_helper.cc b/third_party/blink/renderer/platform/media/smoothness_helper.cc index 2097974..917ac3cf 100644 --- a/third_party/blink/renderer/platform/media/smoothness_helper.cc +++ b/third_party/blink/renderer/platform/media/smoothness_helper.cc
@@ -5,6 +5,7 @@ #include "third_party/blink/renderer/platform/media/smoothness_helper.h" #include "base/bind.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/unguessable_token.h" #include "media/learning/common/learning_task_controller.h"
diff --git a/third_party/blink/renderer/platform/media/smoothness_helper_unittest.cc b/third_party/blink/renderer/platform/media/smoothness_helper_unittest.cc index 68fc3ac79..b7f1727 100644 --- a/third_party/blink/renderer/platform/media/smoothness_helper_unittest.cc +++ b/third_party/blink/renderer/platform/media/smoothness_helper_unittest.cc
@@ -6,6 +6,7 @@ #include "base/run_loop.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "media/learning/common/labelled_example.h" #include "media/learning/common/learning_task_controller.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/third_party/blink/renderer/platform/media/video_frame_compositor.cc b/third_party/blink/renderer/platform/media/video_frame_compositor.cc index f98f588..2e30bda 100644 --- a/third_party/blink/renderer/platform/media/video_frame_compositor.cc +++ b/third_party/blink/renderer/platform/media/video_frame_compositor.cc
@@ -11,6 +11,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/bind_post_task.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "components/viz/common/frame_sinks/begin_frame_args.h" #include "media/base/media_switches.h"
diff --git a/third_party/blink/renderer/platform/media/video_frame_compositor_unittest.cc b/third_party/blink/renderer/platform/media/video_frame_compositor_unittest.cc index 933a11ce..81f02b3b 100644 --- a/third_party/blink/renderer/platform/media/video_frame_compositor_unittest.cc +++ b/third_party/blink/renderer/platform/media/video_frame_compositor_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/gmock_callback_support.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/viz/common/frame_sinks/begin_frame_args.h" #include "components/viz/common/surfaces/frame_sink_id.h" #include "media/base/video_frame.h"
diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc index 6c473593..a96d05f 100644 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
@@ -25,7 +25,6 @@ #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/third_party/blink/renderer/platform/mediastream/media_stream_audio_test.cc b/third_party/blink/renderer/platform/mediastream/media_stream_audio_test.cc index 49c3943f..6aeb675c 100644 --- a/third_party/blink/renderer/platform/mediastream/media_stream_audio_test.cc +++ b/third_party/blink/renderer/platform/mediastream/media_stream_audio_test.cc
@@ -10,6 +10,7 @@ #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/base/audio_bus.h" #include "media/base/audio_parameters.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/platform/mhtml/mhtml_archive.h b/third_party/blink/renderer/platform/mhtml/mhtml_archive.h index e0a0bd3..e7a473cb 100644 --- a/third_party/blink/renderer/platform/mhtml/mhtml_archive.h +++ b/third_party/blink/renderer/platform/mhtml/mhtml_archive.h
@@ -31,6 +31,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_MHTML_MHTML_ARCHIVE_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MHTML_MHTML_ARCHIVE_H_ +#include "base/time/time.h" #include "third_party/blink/public/mojom/loader/mhtml_load_result.mojom-blink-forward.h" #include "third_party/blink/renderer/platform/heap/collection_support/heap_hash_map.h" #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
diff --git a/third_party/blink/renderer/platform/mhtml/mhtml_parser.h b/third_party/blink/renderer/platform/mhtml/mhtml_parser.h index b1bbb2f..278be69 100644 --- a/third_party/blink/renderer/platform/mhtml/mhtml_parser.h +++ b/third_party/blink/renderer/platform/mhtml/mhtml_parser.h
@@ -32,6 +32,7 @@ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_MHTML_MHTML_PARSER_H_ #include "base/memory/scoped_refptr.h" +#include "base/time/time.h" #include "third_party/blink/renderer/platform/heap/collection_support/heap_vector.h" #include "third_party/blink/renderer/platform/heap/member.h" #include "third_party/blink/renderer/platform/mhtml/shared_buffer_chunk_reader.h"
diff --git a/third_party/blink/renderer/platform/mhtml/mhtml_parser_test.cc b/third_party/blink/renderer/platform/mhtml/mhtml_parser_test.cc index 60ecdab..c5dbdf6 100644 --- a/third_party/blink/renderer/platform/mhtml/mhtml_parser_test.cc +++ b/third_party/blink/renderer/platform/mhtml/mhtml_parser_test.cc
@@ -6,6 +6,7 @@ #include <string> +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/mhtml/archive_resource.h" #include "third_party/blink/renderer/platform/wtf/shared_buffer.h"
diff --git a/third_party/blink/renderer/platform/network/http_parsers_fuzzer.cc b/third_party/blink/renderer/platform/network/http_parsers_fuzzer.cc index 55c2ff5..3ccc7db 100644 --- a/third_party/blink/renderer/platform/network/http_parsers_fuzzer.cc +++ b/third_party/blink/renderer/platform/network/http_parsers_fuzzer.cc
@@ -6,6 +6,7 @@ #include <string> +#include "base/time/time.h" #include "services/network/public/mojom/parsed_headers.mojom-blink.h" #include "third_party/blink/renderer/platform/loader/fetch/resource_response.h" #include "third_party/blink/renderer/platform/testing/blink_fuzzer_test_support.h"
diff --git a/third_party/blink/renderer/platform/network/http_parsers_test.cc b/third_party/blink/renderer/platform/network/http_parsers_test.cc index d725071..fff2385 100644 --- a/third_party/blink/renderer/platform/network/http_parsers_test.cc +++ b/third_party/blink/renderer/platform/network/http_parsers_test.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/platform/network/http_parsers.h" +#include "base/time/time.h" #include "services/network/public/mojom/content_security_policy.mojom-blink-forward.h" #include "services/network/public/mojom/content_security_policy.mojom-blink.h" #include "services/network/public/mojom/parsed_headers.mojom-blink.h"
diff --git a/third_party/blink/renderer/platform/network/network_state_notifier.h b/third_party/blink/renderer/platform/network/network_state_notifier.h index d2b61d1..79b97af 100644 --- a/third_party/blink/renderer/platform/network/network_state_notifier.h +++ b/third_party/blink/renderer/platform/network/network_state_notifier.h
@@ -42,6 +42,7 @@ #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "third_party/blink/renderer/platform/wtf/threading_primitives.h" +#include "base/time/time.h" #include "third_party/blink/renderer/platform/wtf/vector.h" namespace blink {
diff --git a/third_party/blink/renderer/platform/network/network_state_notifier_test.cc b/third_party/blink/renderer/platform/network/network_state_notifier_test.cc index 408208e..a378b05e 100644 --- a/third_party/blink/renderer/platform/network/network_state_notifier_test.cc +++ b/third_party/blink/renderer/platform/network/network_state_notifier_test.cc
@@ -32,6 +32,7 @@ #include "base/bind.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/platform/platform.h"
diff --git a/third_party/blink/renderer/platform/peerconnection/coalesced_tasks_test.cc b/third_party/blink/renderer/platform/peerconnection/coalesced_tasks_test.cc index b4c1002..fcb3174 100644 --- a/third_party/blink/renderer/platform/peerconnection/coalesced_tasks_test.cc +++ b/third_party/blink/renderer/platform/peerconnection/coalesced_tasks_test.cc
@@ -7,6 +7,7 @@ #include <string> #include <vector> +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/webrtc/rtc_base/task_utils/to_queued_task.h"
diff --git a/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.h b/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.h index 5bffebd..8d74b2f 100644 --- a/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.h +++ b/third_party/blink/renderer/platform/peerconnection/rtc_video_decoder_adapter.h
@@ -13,6 +13,7 @@ #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/synchronization/lock.h" +#include "base/time/time.h" #include "build/build_config.h" #include "media/base/decoder_status.h" #include "media/base/status.h"
diff --git a/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_test.cc b/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_test.cc index 699f595..0d4a2c1 100644 --- a/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_test.cc +++ b/third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_test.cc
@@ -10,6 +10,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "media/base/media_log.h"
diff --git a/third_party/blink/renderer/platform/peerconnection/stats_collector_test.cc b/third_party/blink/renderer/platform/peerconnection/stats_collector_test.cc index 8981de2e..1dcf392 100644 --- a/third_party/blink/renderer/platform/peerconnection/stats_collector_test.cc +++ b/third_party/blink/renderer/platform/peerconnection/stats_collector_test.cc
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "third_party/blink/renderer/platform/peerconnection/stats_collector.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace blink {
diff --git a/third_party/blink/renderer/platform/peerconnection/webrtc_audio_sink.h b/third_party/blink/renderer/platform/peerconnection/webrtc_audio_sink.h index 68b25ff..3beb9eb 100644 --- a/third_party/blink/renderer/platform/peerconnection/webrtc_audio_sink.h +++ b/third_party/blink/renderer/platform/peerconnection/webrtc_audio_sink.h
@@ -17,6 +17,7 @@ #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "media/base/audio_parameters.h" #include "media/base/audio_push_fifo.h" #include "third_party/blink/public/platform/modules/mediastream/web_media_stream_audio_sink.h"
diff --git a/third_party/blink/renderer/platform/scheduler/common/idle_helper.h b/third_party/blink/renderer/platform/scheduler/common/idle_helper.h index 7056fff1..5ca7e9d 100644 --- a/third_party/blink/renderer/platform/scheduler/common/idle_helper.h +++ b/third_party/blink/renderer/platform/scheduler/common/idle_helper.h
@@ -7,6 +7,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/task_observer.h" +#include "base/time/time.h" #include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/scheduler/common/cancelable_closure_holder.h" #include "third_party/blink/renderer/platform/scheduler/common/scheduler_helper.h"
diff --git a/third_party/blink/renderer/platform/scheduler/common/thread_cpu_throttler.cc b/third_party/blink/renderer/platform/scheduler/common/thread_cpu_throttler.cc index f509b8b..0bfdea2 100644 --- a/third_party/blink/renderer/platform/scheduler/common/thread_cpu_throttler.cc +++ b/third_party/blink/renderer/platform/scheduler/common/thread_cpu_throttler.cc
@@ -11,6 +11,7 @@ #include "base/memory/singleton.h" #include "base/synchronization/atomic_flag.h" #include "base/threading/platform_thread.h" +#include "base/time/time.h" #include "build/build_config.h" #if BUILDFLAG(IS_POSIX)
diff --git a/third_party/blink/renderer/platform/scheduler/common/thread_load_tracker_unittest.cc b/third_party/blink/renderer/platform/scheduler/common/thread_load_tracker_unittest.cc index b627adb2..f8b51ee 100644 --- a/third_party/blink/renderer/platform/scheduler/common/thread_load_tracker_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/common/thread_load_tracker_unittest.cc
@@ -1,6 +1,7 @@ #include "third_party/blink/renderer/platform/scheduler/common/thread_load_tracker.h" #include "base/bind.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/wtf/vector.h"
diff --git a/third_party/blink/renderer/platform/scheduler/common/throttling/budget_pool_unittest.cc b/third_party/blink/renderer/platform/scheduler/common/throttling/budget_pool_unittest.cc index fcc19c55..e7dd922 100644 --- a/third_party/blink/renderer/platform/scheduler/common/throttling/budget_pool_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/common/throttling/budget_pool_unittest.cc
@@ -12,6 +12,7 @@ #include "base/task/sequence_manager/test/sequence_manager_for_test.h" #include "base/test/null_task_runner.h" #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/scheduler/common/throttling/budget_pool.h"
diff --git a/third_party/blink/renderer/platform/scheduler/common/throttling/cpu_time_budget_pool.h b/third_party/blink/renderer/platform/scheduler/common/throttling/cpu_time_budget_pool.h index b7064085..c8e4525 100644 --- a/third_party/blink/renderer/platform/scheduler/common/throttling/cpu_time_budget_pool.h +++ b/third_party/blink/renderer/platform/scheduler/common/throttling/cpu_time_budget_pool.h
@@ -8,6 +8,7 @@ #include "third_party/blink/renderer/platform/scheduler/common/throttling/budget_pool.h" #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/renderer/platform/scheduler/common/tracing_helper.h"
diff --git a/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler_unittest.cc b/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler_unittest.cc index 7e67f26..a5e0c505 100644 --- a/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/common/throttling/task_queue_throttler_unittest.cc
@@ -14,6 +14,7 @@ #include "base/task/sequence_manager/test/sequence_manager_for_test.h" #include "base/test/bind.h" #include "base/test/test_mock_time_task_runner.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/scheduler/common/throttling/budget_pool.h"
diff --git a/third_party/blink/renderer/platform/scheduler/common/throttling/wake_up_budget_pool.h b/third_party/blink/renderer/platform/scheduler/common/throttling/wake_up_budget_pool.h index fd02605..4ad99cb 100644 --- a/third_party/blink/renderer/platform/scheduler/common/throttling/wake_up_budget_pool.h +++ b/third_party/blink/renderer/platform/scheduler/common/throttling/wake_up_budget_pool.h
@@ -7,6 +7,7 @@ #include "third_party/blink/renderer/platform/scheduler/common/throttling/budget_pool.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace blink {
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/auto_advancing_virtual_time_domain.h b/third_party/blink/renderer/platform/scheduler/main_thread/auto_advancing_virtual_time_domain.h index d0fa055..88c6d557 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/auto_advancing_virtual_time_domain.h +++ b/third_party/blink/renderer/platform/scheduler/main_thread/auto_advancing_virtual_time_domain.h
@@ -8,6 +8,7 @@ #include "base/task/sequence_manager/time_domain.h" #include "base/task/task_observer.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "base/time/time_override.h" #include "third_party/blink/renderer/platform/platform_export.h"
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/auto_advancing_virtual_time_domain_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/auto_advancing_virtual_time_domain_unittest.cc index 9300e62..8370e21e 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/auto_advancing_virtual_time_domain_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/auto_advancing_virtual_time_domain_unittest.cc
@@ -12,6 +12,7 @@ #include "base/task/sequence_manager/sequence_manager.h" #include "base/task/sequence_manager/test/test_task_queue.h" #include "base/task/sequence_manager/test/test_task_time_observer.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/scheduler/worker/non_main_thread_scheduler_helper.h"
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner_unittest.cc index d868a84..66a36453 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner_unittest.cc
@@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/test/task_environment.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.h b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.h index c2b0b85..8e06ee0 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.h +++ b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.h
@@ -15,6 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/sequence_manager/task_queue.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "components/power_scheduler/power_mode_voter.h" #include "net/base/request_priority.h" #include "services/metrics/public/cpp/ukm_source_id.h"
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator.h b/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator.h index 2367d16..e2e0b92 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator.h +++ b/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator.h
@@ -7,6 +7,7 @@ #include "base/task/task_observer.h" #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "cc/base/rolling_time_delta_history.h" #include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/scheduler/main_thread/main_thread_task_queue.h"
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator_unittest.cc index 4dd6529..3f3fca4 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator_unittest.cc
@@ -13,6 +13,7 @@ #include "base/task/sequence_manager/test/test_task_queue.h" #include "base/task/sequence_manager/test/test_task_time_observer.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/scheduler/main_thread/main_thread_task_queue.h"
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.h b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.h index b69a3e0..88d213c 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.h +++ b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl.h
@@ -21,6 +21,7 @@ #include "base/task/sequence_manager/task_time_observer.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/trace_event/trace_log.h" #include "build/build_config.h" #include "components/power_scheduler/power_mode_voter.h"
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl_unittest.cc index 0afe2bd..47698b8 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_scheduler_impl_unittest.cc
@@ -15,7 +15,6 @@ #include "base/metrics/field_trial_params.h" #include "base/run_loop.h" #include "base/task/common/task_annotator.h" -#include "base/task/post_task.h" #include "base/task/sequence_manager/test/fake_task.h" #include "base/task/sequence_manager/test/sequence_manager_for_test.h" #include "base/task/single_thread_task_runner.h"
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl_unittest.cc index 6f01ed05..2213ef1 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl_unittest.cc
@@ -18,6 +18,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_mock_time_task_runner.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/common/features.h"
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/user_model.h b/third_party/blink/renderer/platform/scheduler/main_thread/user_model.h index a849d07..d7a83e8 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/user_model.h +++ b/third_party/blink/renderer/platform/scheduler/main_thread/user_model.h
@@ -5,6 +5,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_MAIN_THREAD_USER_MODEL_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_MAIN_THREAD_USER_MODEL_H_ +#include "base/time/time.h" #include "third_party/blink/public/common/input/web_input_event.h" #include "third_party/blink/public/platform/scheduler/web_thread_scheduler.h" #include "third_party/blink/renderer/platform/platform_export.h"
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/user_model_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/user_model_unittest.cc index 4ceaf941..b3e5dcdc 100644 --- a/third_party/blink/renderer/platform/scheduler/main_thread/user_model_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/main_thread/user_model_unittest.cc
@@ -7,6 +7,7 @@ #include <memory> #include "base/test/simple_test_tick_clock.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/platform/scheduler/public/cooperative_scheduling_manager.h b/third_party/blink/renderer/platform/scheduler/public/cooperative_scheduling_manager.h index 302eb4c..44317380 100644 --- a/third_party/blink/renderer/platform/scheduler/public/cooperative_scheduling_manager.h +++ b/third_party/blink/renderer/platform/scheduler/public/cooperative_scheduling_manager.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCHEDULER_PUBLIC_COOPERATIVE_SCHEDULING_MANAGER_H_ #include "base/time/tick_clock.h" +#include "base/time/time.h" #include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
diff --git a/third_party/blink/renderer/platform/scheduler/test/fuzzer/simple_thread_impl.h b/third_party/blink/renderer/platform/scheduler/test/fuzzer/simple_thread_impl.h index 5fb07511..b5093e39 100644 --- a/third_party/blink/renderer/platform/scheduler/test/fuzzer/simple_thread_impl.h +++ b/third_party/blink/renderer/platform/scheduler/test/fuzzer/simple_thread_impl.h
@@ -8,6 +8,7 @@ #include "base/callback.h" #include "base/synchronization/waitable_event.h" #include "base/threading/simple_thread.h" +#include "base/time/time.h" #include "third_party/blink/renderer/platform/platform_export.h" namespace base {
diff --git a/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_impl_unittest.cc b/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_impl_unittest.cc index a87546bd..2765df6 100644 --- a/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_impl_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_impl_unittest.cc
@@ -9,6 +9,7 @@ #include "base/task/sequence_manager/test/sequence_manager_for_test.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_mock_time_task_runner.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/renderer/platform/scheduler/common/throttling/cpu_time_budget_pool.h"
diff --git a/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler_unittest.cc b/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler_unittest.cc index 7068c30..a72fea2 100644 --- a/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler_unittest.cc +++ b/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler_unittest.cc
@@ -10,6 +10,7 @@ #include "base/task/sequence_manager/test/sequence_manager_for_test.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "components/ukm/test_ukm_recorder.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/platform/timer_test.cc b/third_party/blink/renderer/platform/timer_test.cc index 78a2ca2..87ff155 100644 --- a/third_party/blink/renderer/platform/timer_test.cc +++ b/third_party/blink/renderer/platform/timer_test.cc
@@ -8,6 +8,7 @@ #include <queue> #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/platform/platform.h"
diff --git a/third_party/blink/renderer/platform/video_capture/gpu_memory_buffer_test_support.h b/third_party/blink/renderer/platform/video_capture/gpu_memory_buffer_test_support.h index cbe0b17..bad3274 100644 --- a/third_party/blink/renderer/platform/video_capture/gpu_memory_buffer_test_support.h +++ b/third_party/blink/renderer/platform/video_capture/gpu_memory_buffer_test_support.h
@@ -7,6 +7,7 @@ #include <memory> +#include "base/time/time.h" #include "gpu/ipc/common/gpu_memory_buffer_support.h" #include "third_party/blink/renderer/platform/testing/io_task_runner_testing_platform_support.h"
diff --git a/third_party/blink/renderer/platform/video_capture/video_capture_impl.h b/third_party/blink/renderer/platform/video_capture/video_capture_impl.h index e6c8eb58..c7b0f63 100644 --- a/third_party/blink/renderer/platform/video_capture/video_capture_impl.h +++ b/third_party/blink/renderer/platform/video_capture/video_capture_impl.h
@@ -15,6 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/thread_annotations.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "base/token.h" #include "media/base/video_frame.h" #include "media/capture/mojom/video_capture.mojom-blink.h"
diff --git a/third_party/blink/renderer/platform/webrtc/webrtc_source.h b/third_party/blink/renderer/platform/webrtc/webrtc_source.h index 5efe182..5c551971 100644 --- a/third_party/blink/renderer/platform/webrtc/webrtc_source.h +++ b/third_party/blink/renderer/platform/webrtc/webrtc_source.h
@@ -10,7 +10,6 @@ namespace base { class TimeDelta; -class UnguessableToken; } namespace media { @@ -43,10 +42,6 @@ // Callback to notify the client of the output device the renderer is using. virtual void SetOutputDeviceForAec(const String& output_device_id) = 0; - // Returns the UnguessableToken used to connect this stream to an input stream - // for echo cancellation. - virtual base::UnguessableToken GetAudioProcessingId() const = 0; - protected: virtual ~WebRtcAudioRendererSource() {} };
diff --git a/third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.h b/third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.h index 3e1b9558..2122ead 100644 --- a/third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.h +++ b/third_party/blink/renderer/platform/webrtc/webrtc_video_frame_adapter.h
@@ -12,6 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/time/default_tick_clock.h" +#include "base/time/time.h" #include "components/viz/common/gpu/raster_context_provider.h" #include "media/base/video_frame.h" #include "media/base/video_frame_pool.h"
diff --git a/third_party/blink/renderer/platform/widget/compositing/android_webview/synchronous_layer_tree_frame_sink.h b/third_party/blink/renderer/platform/widget/compositing/android_webview/synchronous_layer_tree_frame_sink.h index 2f65cf5..58a3477 100644 --- a/third_party/blink/renderer/platform/widget/compositing/android_webview/synchronous_layer_tree_frame_sink.h +++ b/third_party/blink/renderer/platform/widget/compositing/android_webview/synchronous_layer_tree_frame_sink.h
@@ -16,6 +16,7 @@ #include "base/memory/ref_counted.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "cc/trees/layer_tree_frame_sink.h" #include "cc/trees/managed_memory_policy.h" #include "components/power_scheduler/power_mode_voter.h"
diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_view.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_view.cc index a6f9999..772dd39 100644 --- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_view.cc +++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_view.cc
@@ -15,7 +15,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_view_unittest.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_view_unittest.cc index 97bb868..2114432 100644 --- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_view_unittest.cc +++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_view_unittest.cc
@@ -14,6 +14,7 @@ #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/test/fake_layer_tree_frame_sink.h" #include "cc/test/test_task_graph_runner.h"
diff --git a/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller.h b/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller.h index 33ff45bd..e4011b4 100644 --- a/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller.h +++ b/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller.h
@@ -6,6 +6,7 @@ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_WIDGET_INPUT_ELASTIC_OVERSCROLL_CONTROLLER_H_ #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "cc/input/overscroll_behavior.h" #include "cc/input/scroll_elasticity_helper.h" #include "third_party/blink/public/common/input/web_gesture_event.h"
diff --git a/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller_exponential_unittest.cc b/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller_exponential_unittest.cc index 466d0906..e52d4fef 100644 --- a/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller_exponential_unittest.cc +++ b/third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller_exponential_unittest.cc
@@ -4,6 +4,7 @@ #include "third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller_exponential.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/input/input_handler.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/platform/widget/input/event_with_callback.h b/third_party/blink/renderer/platform/widget/input/event_with_callback.h index 4584999..707f9809 100644 --- a/third_party/blink/renderer/platform/widget/input/event_with_callback.h +++ b/third_party/blink/renderer/platform/widget/input/event_with_callback.h
@@ -7,6 +7,7 @@ #include <list> +#include "base/time/time.h" #include "third_party/blink/public/common/input/web_coalesced_input_event.h" #include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/widget/input/input_handler_proxy.h"
diff --git a/third_party/blink/renderer/platform/widget/input/input_event_prediction.h b/third_party/blink/renderer/platform/widget/input/input_event_prediction.h index f101b71..d7b7a094 100644 --- a/third_party/blink/renderer/platform/widget/input/input_event_prediction.h +++ b/third_party/blink/renderer/platform/widget/input/input_event_prediction.h
@@ -8,6 +8,7 @@ #include <unordered_map> #include "base/gtest_prod_util.h" +#include "base/time/time.h" #include "third_party/blink/public/common/input/pointer_id.h" #include "third_party/blink/public/common/input/web_coalesced_input_event.h" #include "third_party/blink/renderer/platform/platform_export.h"
diff --git a/third_party/blink/renderer/platform/widget/input/input_event_prediction_unittest.cc b/third_party/blink/renderer/platform/widget/input/input_event_prediction_unittest.cc index 1d2c6ae..8eee8f9 100644 --- a/third_party/blink/renderer/platform/widget/input/input_event_prediction_unittest.cc +++ b/third_party/blink/renderer/platform/widget/input/input_event_prediction_unittest.cc
@@ -7,6 +7,7 @@ #include <string> #include "base/test/scoped_feature_list.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/common/input/synthetic_web_input_event_builders.h"
diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_proxy.h b/third_party/blink/renderer/platform/widget/input/input_handler_proxy.h index ab4f38b9..2d15d19 100644 --- a/third_party/blink/renderer/platform/widget/input/input_handler_proxy.h +++ b/third_party/blink/renderer/platform/widget/input/input_handler_proxy.h
@@ -7,6 +7,7 @@ #include <memory> +#include "base/time/time.h" #include "cc/input/input_handler.h" #include "cc/input/snap_fling_controller.h" #include "cc/paint/element_id.h"
diff --git a/third_party/blink/renderer/platform/widget/input/main_thread_event_queue.h b/third_party/blink/renderer/platform/widget/input/main_thread_event_queue.h index e6309de..251b276 100644 --- a/third_party/blink/renderer/platform/widget/input/main_thread_event_queue.h +++ b/third_party/blink/renderer/platform/widget/input/main_thread_event_queue.h
@@ -10,6 +10,7 @@ #include "base/feature_list.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "cc/input/touch_action.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/third_party/blink/renderer/platform/widget/input/main_thread_event_queue_unittest.cc b/third_party/blink/renderer/platform/widget/input/main_thread_event_queue_unittest.cc index f3ba2da..ca65da12 100644 --- a/third_party/blink/renderer/platform/widget/input/main_thread_event_queue_unittest.cc +++ b/third_party/blink/renderer/platform/widget/input/main_thread_event_queue_unittest.cc
@@ -13,6 +13,7 @@ #include "base/bind.h" #include "base/strings/string_util.h" #include "base/test/test_simple_task_runner.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/metrics/event_metrics.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/third_party/blink/renderer/platform/widget/input/widget_base_input_handler.cc b/third_party/blink/renderer/platform/widget/input/widget_base_input_handler.cc index 9b83c8f..6034010 100644 --- a/third_party/blink/renderer/platform/widget/input/widget_base_input_handler.cc +++ b/third_party/blink/renderer/platform/widget/input/widget_base_input_handler.cc
@@ -9,6 +9,7 @@ #include <utility> #include "base/metrics/histogram_macros.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/metrics/event_metrics.h" #include "cc/paint/element_id.h"
diff --git a/third_party/blink/renderer/platform/wtf/sequence_bound_test.cc b/third_party/blink/renderer/platform/wtf/sequence_bound_test.cc index d06c5db..2621e0a 100644 --- a/third_party/blink/renderer/platform/wtf/sequence_bound_test.cc +++ b/third_party/blink/renderer/platform/wtf/sequence_bound_test.cc
@@ -4,7 +4,6 @@ #include "third_party/blink/renderer/platform/wtf/sequence_bound.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/test/task_environment.h"
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index 0f1c8c6..0833ddba 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations
@@ -7586,9 +7586,6 @@ crbug.com/1296179 [ Mac Release ] virtual/plz-dedicated-worker/external/wpt/fetch/private-network-access/service-worker-background-fetch.https.window.html [ Failure Pass ] crbug.com/1296179 [ Linux Release ] virtual/plz-dedicated-worker/external/wpt/fetch/private-network-access/service-worker-background-fetch.https.window.html [ Failure Pass ] -# Disabled to unblock crbug.com/1309854 -crbug.com/1309854 http/tests/devtools/components/parsed-url.js [ Skip ] - # Fails flakily on Win crbug.com/1173382 [ Win ] virtual/stable/http/tests/navigation/replacestate-base-legal.html [ Failure Pass ]
diff --git a/third_party/blink/web_tests/WebGPUExpectations b/third_party/blink/web_tests/WebGPUExpectations index 563ad31..f8fb35b 100644 --- a/third_party/blink/web_tests/WebGPUExpectations +++ b/third_party/blink/web_tests/WebGPUExpectations
@@ -104,32 +104,20 @@ # VVL failure crbug.com/1083478 [ Linux ] wpt_internal/webgpu/web_platform/reftests/canvas_size_different_with_back_buffer_size.https.html [ Crash ] -# These tests aren't working on CQ, unclear whether the test or harness (or Chrome) is broken. -# Shifted by about half a pixel -crbug.com/1083478 wpt_internal/webgpu/web_platform/reftests/canvas_complex_bgra8unorm_copy.https.html [ Failure ] -crbug.com/1083478 wpt_internal/webgpu/web_platform/reftests/canvas_complex_bgra8unorm_draw.https.html [ Failure ] -crbug.com/1083478 wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba16float_copy.https.html [ Failure ] -crbug.com/1083478 wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba16float_draw.https.html [ Failure ] - +# Mac doesn't support rgba8unorm for the swapchain format (yet) crbug.com/1298618 [ Mac ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_copy.https.html [ Skip ] crbug.com/1298618 [ Mac ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_draw.https.html [ Skip ] -crbug.com/1083478 [ Win ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_copy.https.html [ Failure ] -crbug.com/1083478 [ Win ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_draw.https.html [ Failure ] -crbug.com/1083478 [ Linux ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_copy.https.html [ Failure ] -crbug.com/1083478 [ Linux ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_draw.https.html [ Failure ] +crbug.com/1298618 [ Mac ] wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_opaque_copy.https.html [ Skip ] +crbug.com/1298618 [ Mac ] wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_opaque_draw.https.html [ Skip ] +crbug.com/1298618 [ Mac ] wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_copy.https.html [ Skip ] +crbug.com/1298618 [ Mac ] wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_draw.https.html [ Skip ] -crbug.com/1083478 [ Win ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_store.https.html [ Failure ] -crbug.com/1083478 [ Win ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba16float_store.https.html [ Failure ] +# STORAGE_BINDING is only support on WIN. crbug.com/1241369 [ Mac ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_store.https.html [ Skip ] crbug.com/1241369 [ Mac ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba16float_store.https.html [ Skip ] crbug.com/1241369 [ Linux ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba8unorm_store.https.html [ Skip ] crbug.com/1241369 [ Linux ] wpt_internal/webgpu/web_platform/reftests/canvas_complex_rgba16float_store.https.html [ Skip ] -crbug.com/1083478 wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_opaque_copy.https.html [ Failure ] -crbug.com/1083478 wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_opaque_draw.https.html [ Failure ] -crbug.com/1083478 wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_premultiplied_copy.https.html [ Failure ] -crbug.com/1083478 wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_bgra8unorm_premultiplied_draw.https.html [ Failure ] - # Spec was changed so BGLs should eagerly apply per-pipeline limits. Tests need fixing, then Dawn # needs to pass them. https://github.com/gpuweb/cts/issues/230 wpt_internal/webgpu/cts.https.html?q=webgpu:api,validation,createBindGroupLayout:max_resources_per_stage,in_bind_group_layout,* [ Failure ] @@ -507,12 +495,6 @@ crbug.com/dawn/1116 [ Mac ] wpt_internal/webgpu/cts.https.html?q=webgpu:shader,execution,zero_init:compute,zero_init:storageClass="private";batch__=28;* [ Failure ] crbug.com/dawn/1116 [ Mac ] wpt_internal/webgpu/cts.https.html?q=webgpu:shader,execution,zero_init:compute,zero_init:storageClass="private";batch__=29;* [ Failure ] -# Mac doesn't support rgba8unorm for the swapchain format (yet) -crbug.com/1241369 [ mac ] wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_opaque_copy.https.html [ Failure ] -crbug.com/1241369 [ mac ] wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_opaque_draw.https.html [ Failure ] -crbug.com/1241369 [ mac ] wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_copy.https.html [ Failure ] -crbug.com/1241369 [ mac ] wpt_internal/webgpu/web_platform/reftests/canvas_composite_alpha_rgba8unorm_premultiplied_draw.https.html [ Failure ] - ### ### Linux (Vulkan) specific ###
diff --git a/third_party/blink/web_tests/external/wpt/shadow-dom/slot-dir-attach-child-crash.html b/third_party/blink/web_tests/external/wpt/shadow-dom/slot-dir-attach-child-crash.html new file mode 100644 index 0000000..3da70e3e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/shadow-dom/slot-dir-attach-child-crash.html
@@ -0,0 +1,18 @@ +<!DOCTYPE html> +<link rel=author href="mailto:myid.shin@igalia.com"> +<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=1309343"> + +<datalist id="move"> + <option dir="rtl"> + <select id="select"></select> + </option> +</datalist> +<svg> + <tspan id="tspan1"/><use xlink:href="#tspan1"/> +</svg> +<script> + onload = () => { + document.getElementById("select").appendChild(document.createElement("ol")); + document.getElementById("tspan1").appendChild(move); + } +</script>
diff --git a/third_party/blink/web_tests/http/tests/devtools/components/parsed-url-expected.txt b/third_party/blink/web_tests/http/tests/devtools/components/parsed-url-expected.txt index 7d221e91..75695467 100644 --- a/third_party/blink/web_tests/http/tests/devtools/components/parsed-url-expected.txt +++ b/third_party/blink/web_tests/http/tests/devtools/components/parsed-url-expected.txt
@@ -85,7 +85,7 @@ port: undefined path: // queryParams: queryParam1=value1 - fragment: undefined + fragment: folderPathComponents: / lastPathComponent: Parsing url: http://example.com//foo.html @@ -96,7 +96,7 @@ port: undefined path: //foo.html queryParams: - fragment: undefined + fragment: folderPathComponents: / lastPathComponent: foo.html Parsing url: http://example.com//foo/bar.html @@ -107,7 +107,7 @@ port: undefined path: //foo/bar.html queryParams: - fragment: undefined + fragment: folderPathComponents: //foo lastPathComponent: bar.html Parsing url: http://example.com/foo//bar.html @@ -118,7 +118,7 @@ port: undefined path: /foo//bar.html queryParams: - fragment: undefined + fragment: folderPathComponents: /foo/ lastPathComponent: bar.html Parsing url: http://example.com//foo//bar.html @@ -129,7 +129,7 @@ port: undefined path: //foo//bar.html queryParams: - fragment: undefined + fragment: folderPathComponents: //foo/ lastPathComponent: bar.html Parsing url: http://example.com//foo/bar/baz.html @@ -140,7 +140,7 @@ port: undefined path: //foo/bar/baz.html queryParams: - fragment: undefined + fragment: folderPathComponents: //foo/bar lastPathComponent: baz.html Parsing url: http://example.com/foo//bar/baz.html @@ -151,7 +151,7 @@ port: undefined path: /foo//bar/baz.html queryParams: - fragment: undefined + fragment: folderPathComponents: /foo//bar lastPathComponent: baz.html Parsing url: http://example.com/foo/bar//baz.html @@ -162,7 +162,7 @@ port: undefined path: /foo/bar//baz.html queryParams: - fragment: undefined + fragment: folderPathComponents: /foo/bar/ lastPathComponent: baz.html Parsing url: http://example.com///foo/bar/baz.html @@ -173,7 +173,7 @@ port: undefined path: ///foo/bar/baz.html queryParams: - fragment: undefined + fragment: folderPathComponents: ///foo/bar lastPathComponent: baz.html Parsing url: http://example.com/foo////bar/baz.html @@ -184,7 +184,7 @@ port: undefined path: /foo////bar/baz.html queryParams: - fragment: undefined + fragment: folderPathComponents: /foo////bar lastPathComponent: baz.html Parsing url: http://example.com/foo/bar/////baz.html @@ -195,7 +195,7 @@ port: undefined path: /foo/bar/////baz.html queryParams: - fragment: undefined + fragment: folderPathComponents: /foo/bar//// lastPathComponent: baz.html Splitting url: http://www.chromium.org
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/report-prerender-final-status-expected.txt b/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/report-prerender-final-status-expected.txt new file mode 100644 index 0000000..a233ad3a --- /dev/null +++ b/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/report-prerender-final-status-expected.txt
@@ -0,0 +1,11 @@ +Test that prerender navigations report the final status +{ + method : Page.prerenderAttemptCompleted + params : { + finalStatus : Activated + initiatingFrameId : <string> + prerenderingUrl : http://127.0.0.1:8000/inspector-protocol/prerender/resources/empty.html + } + sessionId : <string> +} +
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/report-prerender-final-status.js b/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/report-prerender-final-status.js new file mode 100644 index 0000000..bce9cce7 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/report-prerender-final-status.js
@@ -0,0 +1,13 @@ +(async function(testRunner) { + const {page, session, dp} = await testRunner.startBlank( + `Test that prerender navigations report the final status`); + await dp.Page.enable(); + + // Navigate to speculation rules Prerender Page. + await page.navigate('resources/simple-prerender.html'); + session.evaluate(`document.getElementById('link').click()`); + const statusReport = await dp.Page.oncePrerenderAttemptCompleted(); + testRunner.log(statusReport, '', ['initiatingFrameId', 'sessionId']); + + testRunner.completeTest(); +});
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/resources/empty.html b/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/resources/empty.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/resources/empty.html
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/resources/simple-prerender.html b/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/resources/simple-prerender.html new file mode 100644 index 0000000..1f47e9c --- /dev/null +++ b/third_party/blink/web_tests/http/tests/inspector-protocol/prerender/resources/simple-prerender.html
@@ -0,0 +1,17 @@ +<!DOCTYPE html> +<html> +<head> +<script type="speculationrules"> +{ + "prerender":[ + {"source": "list", + "urls": ["empty.html"]} + ] +} +</script> +<title>Prerender Test</title> +<!-- Make sure there is no zoom so that simulated clicks hit the right spot --> +<meta name="viewport" content="width=device-width,minimum-scale=1"> +</head> +<body><a href="empty.html" id="link">link</a></body> +</html>
diff --git a/third_party/boringssl/BUILD.generated.gni b/third_party/boringssl/BUILD.generated.gni index 5fe1e0f..97a75cd 100644 --- a/third_party/boringssl/BUILD.generated.gni +++ b/third_party/boringssl/BUILD.generated.gni
@@ -10,7 +10,6 @@ "src/crypto/asn1/a_bool.c", "src/crypto/asn1/a_d2i_fp.c", "src/crypto/asn1/a_dup.c", - "src/crypto/asn1/a_enum.c", "src/crypto/asn1/a_gentm.c", "src/crypto/asn1/a_i2d_fp.c", "src/crypto/asn1/a_int.c", @@ -135,6 +134,7 @@ "src/crypto/fipsmodule/bn/rsaz_exp.h", "src/crypto/fipsmodule/cipher/internal.h", "src/crypto/fipsmodule/delocate.h", + "src/crypto/fipsmodule/dh/internal.h", "src/crypto/fipsmodule/digest/internal.h", "src/crypto/fipsmodule/digest/md32_common.h", "src/crypto/fipsmodule/ec/internal.h",
diff --git a/third_party/boringssl/err_data.c b/third_party/boringssl/err_data.c index de52cc0..04b265d 100644 --- a/third_party/boringssl/err_data.c +++ b/third_party/boringssl/err_data.c
@@ -55,188 +55,188 @@ OPENSSL_STATIC_ASSERT(ERR_NUM_LIBS == 34, "number of libraries changed"); const uint32_t kOpenSSLReasonValues[] = { - 0xc320862, - 0xc32887c, - 0xc33088b, - 0xc33889b, - 0xc3408aa, - 0xc3488c3, - 0xc3508cf, - 0xc3588ec, - 0xc36090c, - 0xc36891a, - 0xc37092a, - 0xc378937, - 0xc380947, - 0xc388952, - 0xc390968, - 0xc398977, - 0xc3a098b, - 0xc3a886f, + 0xc320885, + 0xc32889f, + 0xc3308ae, + 0xc3388be, + 0xc3408cd, + 0xc3488e6, + 0xc3508f2, + 0xc35890f, + 0xc36092f, + 0xc36893d, + 0xc37094d, + 0xc37895a, + 0xc38096a, + 0xc388975, + 0xc39098b, + 0xc39899a, + 0xc3a09ae, + 0xc3a8892, 0xc3b00f7, - 0xc3b88fe, - 0x1032086f, - 0x103295e5, - 0x103315f1, - 0x1033960a, - 0x1034161d, - 0x10348f4f, - 0x10350c88, - 0x10359630, - 0x1036165a, - 0x1036966d, - 0x1037168c, - 0x103796a5, - 0x103816ba, - 0x103896d8, - 0x103916e7, - 0x10399703, - 0x103a171e, - 0x103a972d, - 0x103b1749, - 0x103b9764, - 0x103c178a, + 0xc3b8921, + 0x10320892, + 0x10329620, + 0x1033162c, + 0x10339645, + 0x10341658, + 0x10348f72, + 0x10350cab, + 0x1035966b, + 0x10361695, + 0x103696a8, + 0x103716c7, + 0x103796e0, + 0x103816f5, + 0x10389713, + 0x10391722, + 0x1039973e, + 0x103a1759, + 0x103a9768, + 0x103b1784, + 0x103b979f, + 0x103c17c5, 0x103c80f7, - 0x103d179b, - 0x103d97af, - 0x103e17ce, - 0x103e97dd, - 0x103f17f4, - 0x103f9807, - 0x10400c4c, - 0x1040981a, - 0x10411838, - 0x1041984b, - 0x10421865, - 0x10429875, - 0x10431889, - 0x1043989f, - 0x104418b7, - 0x104498cc, - 0x104518e0, - 0x104598f2, - 0x10460625, - 0x10468977, - 0x10471907, - 0x1047991e, - 0x10481933, - 0x10489941, - 0x10490e9b, - 0x1049977b, - 0x104a1645, - 0x14320c2f, - 0x14328c3d, - 0x14330c4c, - 0x14338c5e, + 0x103d17d6, + 0x103d97ea, + 0x103e1809, + 0x103e9818, + 0x103f182f, + 0x103f9842, + 0x10400c6f, + 0x10409855, + 0x10411873, + 0x10419886, + 0x104218a0, + 0x104298b0, + 0x104318c4, + 0x104398da, + 0x104418f2, + 0x10449907, + 0x1045191b, + 0x1045992d, + 0x10460635, + 0x1046899a, + 0x10471942, + 0x10479959, + 0x1048196e, + 0x1048997c, + 0x10490ebe, + 0x104997b6, + 0x104a1680, + 0x14320c52, + 0x14328c60, + 0x14330c6f, + 0x14338c81, 0x143400b9, 0x143480f7, 0x18320090, - 0x18328fa5, + 0x18328fc8, 0x183300b9, - 0x18338fbb, - 0x18340fcf, + 0x18338fde, + 0x18340ff2, 0x183480f7, - 0x18350fee, - 0x18359006, - 0x1836101b, - 0x1836902f, - 0x18371067, - 0x1837907d, - 0x18381091, - 0x183890a1, - 0x18390a9d, - 0x183990b1, - 0x183a10d7, - 0x183a90fd, - 0x183b0ca7, - 0x183b914c, - 0x183c115e, - 0x183c9169, - 0x183d1179, - 0x183d918a, - 0x183e119b, - 0x183e91ad, - 0x183f11d6, - 0x183f91ef, - 0x18401207, - 0x184086fd, - 0x18411120, - 0x184190eb, - 0x1842110a, - 0x18428c94, - 0x184310c6, - 0x18439132, - 0x18440fe4, - 0x18449053, - 0x20321241, - 0x2032922e, - 0x2432124d, - 0x243289bd, - 0x2433125f, - 0x2433926c, - 0x24341279, - 0x2434928b, - 0x2435129a, - 0x243592b7, - 0x243612c4, - 0x243692d2, - 0x243712e0, - 0x243792ee, - 0x243812f7, - 0x24389304, - 0x24391317, - 0x28320c7c, - 0x28328ca7, - 0x28330c4c, - 0x28338cba, - 0x28340c88, + 0x18351011, + 0x18359029, + 0x1836103e, + 0x18369052, + 0x1837108a, + 0x183790a0, + 0x183810b4, + 0x183890c4, + 0x18390ac0, + 0x183990d4, + 0x183a10fa, + 0x183a9120, + 0x183b0cca, + 0x183b916f, + 0x183c1181, + 0x183c918c, + 0x183d119c, + 0x183d91ad, + 0x183e11be, + 0x183e91d0, + 0x183f11f9, + 0x183f9212, + 0x1840122a, + 0x1840870d, + 0x18411143, + 0x1841910e, + 0x1842112d, + 0x18428cb7, + 0x184310e9, + 0x18439155, + 0x18441007, + 0x18449076, + 0x20321264, + 0x20329251, + 0x24321270, + 0x243289e0, + 0x24331282, + 0x2433928f, + 0x2434129c, + 0x243492ae, + 0x243512bd, + 0x243592da, + 0x243612e7, + 0x243692f5, + 0x24371303, + 0x24379311, + 0x2438131a, + 0x24389327, + 0x2439133a, + 0x28320c9f, + 0x28328cca, + 0x28330c6f, + 0x28338cdd, + 0x28340cab, 0x283480b9, 0x283500f7, - 0x28358c94, - 0x2c323284, - 0x2c32932e, - 0x2c333292, - 0x2c33b2a4, - 0x2c3432b8, - 0x2c34b2ca, - 0x2c3532e5, - 0x2c35b2f7, - 0x2c363327, + 0x28358cb7, + 0x2c3232bf, + 0x2c329351, + 0x2c3332cd, + 0x2c33b2df, + 0x2c3432f3, + 0x2c34b305, + 0x2c353320, + 0x2c35b332, + 0x2c363362, 0x2c36833a, - 0x2c373334, - 0x2c37b360, - 0x2c383385, - 0x2c38b39c, - 0x2c3933ba, - 0x2c39b3ca, - 0x2c3a33dc, - 0x2c3ab3f0, - 0x2c3b3401, - 0x2c3bb420, - 0x2c3c1340, - 0x2c3c9356, - 0x2c3d3465, - 0x2c3d936f, - 0x2c3e348f, - 0x2c3eb49d, - 0x2c3f34b5, - 0x2c3fb4cd, - 0x2c4034f7, - 0x2c409241, - 0x2c413508, - 0x2c41b51b, - 0x2c421207, - 0x2c42b52c, - 0x2c43074a, - 0x2c43b412, - 0x2c443373, - 0x2c44b4da, - 0x2c45330a, - 0x2c45b346, - 0x2c4633aa, - 0x2c46b434, - 0x2c473449, - 0x2c47b482, + 0x2c37336f, + 0x2c37b39b, + 0x2c3833c0, + 0x2c38b3d7, + 0x2c3933f5, + 0x2c39b405, + 0x2c3a3417, + 0x2c3ab42b, + 0x2c3b343c, + 0x2c3bb45b, + 0x2c3c1363, + 0x2c3c9379, + 0x2c3d34a0, + 0x2c3d9392, + 0x2c3e34ca, + 0x2c3eb4d8, + 0x2c3f34f0, + 0x2c3fb508, + 0x2c403532, + 0x2c409264, + 0x2c413543, + 0x2c41b556, + 0x2c42122a, + 0x2c42b567, + 0x2c43076d, + 0x2c43b44d, + 0x2c4433ae, + 0x2c44b515, + 0x2c453345, + 0x2c45b381, + 0x2c4633e5, + 0x2c46b46f, + 0x2c473484, + 0x2c47b4bd, 0x30320000, 0x30328015, 0x3033001f, @@ -281,528 +281,531 @@ 0x3046833a, 0x30470372, 0x30478384, - 0x30480392, - 0x304883a3, - 0x304903b2, - 0x304983ca, - 0x304a03dc, - 0x304a83f0, - 0x304b0408, - 0x304b841b, - 0x304c0426, - 0x304c8437, - 0x304d0443, - 0x304d8459, - 0x304e0467, - 0x304e847d, - 0x304f048f, - 0x304f84a1, - 0x305004c4, - 0x305084d7, - 0x305104e8, - 0x305184f8, - 0x30520510, - 0x30528525, - 0x3053053d, - 0x30538551, - 0x30540569, - 0x30548582, - 0x3055059b, - 0x305585b8, - 0x305605c3, - 0x305685db, - 0x305705eb, - 0x305785fc, - 0x3058060f, - 0x30588625, - 0x3059062e, - 0x30598643, - 0x305a0656, - 0x305a8665, - 0x305b0685, - 0x305b8694, - 0x305c06b5, - 0x305c86d1, - 0x305d06dd, - 0x305d86fd, - 0x305e0719, - 0x305e872a, - 0x305f0740, - 0x305f874a, - 0x306004b4, + 0x304803a2, + 0x304883b3, + 0x304903c2, + 0x304983da, + 0x304a03ec, + 0x304a8400, + 0x304b0418, + 0x304b842b, + 0x304c0436, + 0x304c8447, + 0x304d0453, + 0x304d8469, + 0x304e0477, + 0x304e848d, + 0x304f049f, + 0x304f84b1, + 0x305004d4, + 0x305084e7, + 0x305104f8, + 0x30518508, + 0x30520520, + 0x30528535, + 0x3053054d, + 0x30538561, + 0x30540579, + 0x30548592, + 0x305505ab, + 0x305585c8, + 0x305605d3, + 0x305685eb, + 0x305705fb, + 0x3057860c, + 0x3058061f, + 0x30588635, + 0x3059063e, + 0x30598653, + 0x305a0666, + 0x305a8675, + 0x305b0695, + 0x305b86a4, + 0x305c06c5, + 0x305c86e1, + 0x305d06ed, + 0x305d870d, + 0x305e0729, + 0x305e874d, + 0x305f0763, + 0x305f876d, + 0x306004c4, 0x3060804a, 0x30610357, - 0x34320b8d, - 0x34328ba1, - 0x34330bbe, - 0x34338bd1, - 0x34340be0, - 0x34348c19, - 0x34350bfd, + 0x3061873a, + 0x30620392, + 0x34320bb0, + 0x34328bc4, + 0x34330be1, + 0x34338bf4, + 0x34340c03, + 0x34348c3c, + 0x34350c20, 0x3c320090, - 0x3c328ce4, - 0x3c330cfd, - 0x3c338d18, - 0x3c340d35, - 0x3c348d5f, - 0x3c350d7a, - 0x3c358da0, - 0x3c360db9, - 0x3c368dd1, - 0x3c370de2, - 0x3c378df0, - 0x3c380dfd, - 0x3c388e11, - 0x3c390ca7, - 0x3c398e34, - 0x3c3a0e48, - 0x3c3a8937, - 0x3c3b0e58, - 0x3c3b8e73, - 0x3c3c0e85, - 0x3c3c8eb8, - 0x3c3d0ec2, - 0x3c3d8ed6, - 0x3c3e0ee4, - 0x3c3e8f09, - 0x3c3f0cd0, - 0x3c3f8ef2, + 0x3c328d07, + 0x3c330d20, + 0x3c338d3b, + 0x3c340d58, + 0x3c348d82, + 0x3c350d9d, + 0x3c358dc3, + 0x3c360ddc, + 0x3c368df4, + 0x3c370e05, + 0x3c378e13, + 0x3c380e20, + 0x3c388e34, + 0x3c390cca, + 0x3c398e57, + 0x3c3a0e6b, + 0x3c3a895a, + 0x3c3b0e7b, + 0x3c3b8e96, + 0x3c3c0ea8, + 0x3c3c8edb, + 0x3c3d0ee5, + 0x3c3d8ef9, + 0x3c3e0f07, + 0x3c3e8f2c, + 0x3c3f0cf3, + 0x3c3f8f15, 0x3c4000b9, 0x3c4080f7, - 0x3c410d50, - 0x3c418d8f, - 0x3c420e9b, - 0x3c428e25, - 0x403219d3, - 0x403299e9, - 0x40331a17, - 0x40339a21, - 0x40341a38, - 0x40349a56, - 0x40351a66, - 0x40359a78, - 0x40361a85, - 0x40369a91, - 0x40371aa6, - 0x40379ab8, - 0x40381ac3, - 0x40389ad5, - 0x40390f4f, - 0x40399ae5, - 0x403a1af8, - 0x403a9b19, - 0x403b1b2a, - 0x403b9b3a, + 0x3c410d73, + 0x3c418db2, + 0x3c420ebe, + 0x3c428e48, + 0x40321a0e, + 0x40329a24, + 0x40331a52, + 0x40339a5c, + 0x40341a73, + 0x40349a91, + 0x40351aa1, + 0x40359ab3, + 0x40361ac0, + 0x40369acc, + 0x40371ae1, + 0x40379af3, + 0x40381afe, + 0x40389b10, + 0x40390f72, + 0x40399b20, + 0x403a1b33, + 0x403a9b54, + 0x403b1b65, + 0x403b9b75, 0x403c0071, 0x403c8090, - 0x403d1b9b, - 0x403d9bb1, - 0x403e1bc0, - 0x403e9bf8, - 0x403f1c12, - 0x403f9c3a, - 0x40401c4f, - 0x40409c63, - 0x40411c9e, - 0x40419cb9, - 0x40421cd2, - 0x40429ce5, - 0x40431cf9, - 0x40439d27, - 0x40441d3e, + 0x403d1bd6, + 0x403d9bec, + 0x403e1bfb, + 0x403e9c33, + 0x403f1c4d, + 0x403f9c75, + 0x40401c8a, + 0x40409c9e, + 0x40411cd9, + 0x40419cf4, + 0x40421d0d, + 0x40429d20, + 0x40431d34, + 0x40439d62, + 0x40441d79, 0x404480b9, - 0x40451d53, - 0x40459d65, - 0x40461d89, - 0x40469da9, - 0x40471db7, - 0x40479dde, - 0x40481e4f, - 0x40489f09, - 0x40491f20, - 0x40499f3a, - 0x404a1f51, - 0x404a9f6f, - 0x404b1f87, - 0x404b9fb4, - 0x404c1fca, - 0x404c9fdc, - 0x404d1ffd, - 0x404da036, - 0x404e204a, - 0x404ea057, - 0x404f20f1, - 0x404fa167, - 0x405021d6, - 0x4050a1ea, - 0x4051221d, - 0x4052222d, - 0x4052a251, - 0x40532269, - 0x4053a27c, - 0x40542291, - 0x4054a2b4, - 0x405522df, - 0x4055a31c, - 0x40562341, - 0x4056a35a, - 0x40572372, - 0x4057a385, - 0x4058239a, - 0x4058a3c1, - 0x405923f0, - 0x4059a41d, - 0x405a2431, - 0x405aa441, - 0x405b2459, - 0x405ba46a, - 0x405c247d, - 0x405ca4bc, - 0x405d24c9, - 0x405da4ee, - 0x405e252c, - 0x405e8adb, - 0x405f254d, - 0x405fa55a, - 0x40602568, - 0x4060a58a, - 0x406125eb, - 0x4061a623, - 0x4062263a, - 0x4062a64b, - 0x40632698, - 0x4063a6ad, - 0x406426c4, - 0x4064a6f0, - 0x4065270b, - 0x4065a722, - 0x4066273a, - 0x4066a764, - 0x4067278f, - 0x4067a7d4, - 0x4068281c, - 0x4068a83d, - 0x4069286f, - 0x4069a89d, - 0x406a28be, - 0x406aa8de, - 0x406b2a66, - 0x406baa89, - 0x406c2a9f, - 0x406cada9, - 0x406d2dd8, - 0x406dae00, - 0x406e2e2e, - 0x406eae7b, - 0x406f2ed4, - 0x406faf0c, - 0x40702f1f, - 0x4070af3c, - 0x4071082a, - 0x4071af4e, - 0x40722f61, - 0x4072af97, - 0x40732faf, - 0x40739540, - 0x40742fc3, - 0x4074afdd, - 0x40752fee, - 0x4075b002, - 0x40763010, - 0x40769304, - 0x40773035, - 0x4077b075, - 0x40783090, - 0x4078b0c9, - 0x407930e0, - 0x4079b0f6, - 0x407a3122, - 0x407ab135, - 0x407b314a, - 0x407bb15c, - 0x407c318d, - 0x407cb196, - 0x407d2858, - 0x407da18f, - 0x407e30a5, - 0x407ea3d1, - 0x407f1dcb, - 0x407f9f9e, - 0x40802101, - 0x40809df3, - 0x4081223f, - 0x4081a0a5, - 0x40822e19, - 0x40829b46, - 0x408323ac, - 0x4083a6d5, - 0x40841e07, - 0x4084a409, - 0x4085248e, - 0x4085a5b2, - 0x4086250e, - 0x4086a1a9, - 0x40872e5f, - 0x4087a600, - 0x40881b84, - 0x4088a7e7, - 0x40891bd3, - 0x40899b60, - 0x408a2ad7, - 0x408a9958, - 0x408b3171, - 0x408baee9, - 0x408c249e, - 0x408c9990, - 0x408d1eef, - 0x408d9e39, - 0x408e201f, - 0x408ea2fc, - 0x408f27fb, - 0x408fa5ce, - 0x409027b0, - 0x4090a4e0, - 0x40912abf, - 0x409199b6, - 0x40921c20, - 0x4092ae9a, - 0x40932f7a, - 0x4093a1ba, - 0x40941e1b, - 0x4094aaf0, - 0x4095265c, - 0x4095b102, - 0x40962e46, - 0x4096a11a, - 0x40972205, - 0x4097a06e, - 0x40981c80, - 0x4098a670, - 0x40992eb6, - 0x4099a329, - 0x409a22c2, - 0x409a9974, - 0x409b1e75, - 0x409b9ea0, - 0x409c3057, - 0x409c9ec8, - 0x409d20d6, - 0x409da0bb, - 0x409e1d11, - 0x409ea14f, - 0x409f2137, - 0x409f9e68, - 0x40a02177, - 0x40a0a088, - 0x41f42991, - 0x41f92a23, - 0x41fe2916, - 0x41feabcc, - 0x41ff2cfa, - 0x420329aa, - 0x420829cc, - 0x4208aa08, - 0x420928fa, - 0x4209aa42, - 0x420a2951, - 0x420aa931, - 0x420b2971, - 0x420ba9ea, - 0x420c2d16, - 0x420cab00, - 0x420d2bb3, - 0x420dabea, - 0x42122c1d, - 0x42172cdd, - 0x4217ac5f, - 0x421c2c81, - 0x421f2c3c, - 0x42212d8e, - 0x42262cc0, - 0x422b2d6c, - 0x422bab8e, - 0x422c2d4e, - 0x422cab41, - 0x422d2b1a, - 0x422dad2d, - 0x422e2b6d, - 0x42302c9c, - 0x4230ac04, - 0x44320755, - 0x44328764, - 0x44330770, - 0x4433877e, - 0x44340791, - 0x443487a2, - 0x443507a9, - 0x443587b3, - 0x443607c6, - 0x443687dc, - 0x443707ee, - 0x443787fb, - 0x4438080a, - 0x44388812, - 0x4439082a, - 0x44398838, - 0x443a084b, - 0x4832132e, - 0x48329340, - 0x48331356, - 0x4833936f, - 0x4c321394, - 0x4c3293a4, - 0x4c3313b7, - 0x4c3393d7, + 0x40451d8e, + 0x40459da0, + 0x40461dc4, + 0x40469de4, + 0x40471df2, + 0x40479e19, + 0x40481e8a, + 0x40489f44, + 0x40491f5b, + 0x40499f75, + 0x404a1f8c, + 0x404a9faa, + 0x404b1fc2, + 0x404b9fef, + 0x404c2005, + 0x404ca017, + 0x404d2038, + 0x404da071, + 0x404e2085, + 0x404ea092, + 0x404f212c, + 0x404fa1a2, + 0x40502211, + 0x4050a225, + 0x40512258, + 0x40522268, + 0x4052a28c, + 0x405322a4, + 0x4053a2b7, + 0x405422cc, + 0x4054a2ef, + 0x4055231a, + 0x4055a357, + 0x4056237c, + 0x4056a395, + 0x405723ad, + 0x4057a3c0, + 0x405823d5, + 0x4058a3fc, + 0x4059242b, + 0x4059a458, + 0x405a246c, + 0x405aa47c, + 0x405b2494, + 0x405ba4a5, + 0x405c24b8, + 0x405ca4f7, + 0x405d2504, + 0x405da529, + 0x405e2567, + 0x405e8afe, + 0x405f2588, + 0x405fa595, + 0x406025a3, + 0x4060a5c5, + 0x40612626, + 0x4061a65e, + 0x40622675, + 0x4062a686, + 0x406326d3, + 0x4063a6e8, + 0x406426ff, + 0x4064a72b, + 0x40652746, + 0x4065a75d, + 0x40662775, + 0x4066a79f, + 0x406727ca, + 0x4067a80f, + 0x40682857, + 0x4068a878, + 0x406928aa, + 0x4069a8d8, + 0x406a28f9, + 0x406aa919, + 0x406b2aa1, + 0x406baac4, + 0x406c2ada, + 0x406cade4, + 0x406d2e13, + 0x406dae3b, + 0x406e2e69, + 0x406eaeb6, + 0x406f2f0f, + 0x406faf47, + 0x40702f5a, + 0x4070af77, + 0x4071084d, + 0x4071af89, + 0x40722f9c, + 0x4072afd2, + 0x40732fea, + 0x4073957b, + 0x40742ffe, + 0x4074b018, + 0x40753029, + 0x4075b03d, + 0x4076304b, + 0x40769327, + 0x40773070, + 0x4077b0b0, + 0x407830cb, + 0x4078b104, + 0x4079311b, + 0x4079b131, + 0x407a315d, + 0x407ab170, + 0x407b3185, + 0x407bb197, + 0x407c31c8, + 0x407cb1d1, + 0x407d2893, + 0x407da1ca, + 0x407e30e0, + 0x407ea40c, + 0x407f1e06, + 0x407f9fd9, + 0x4080213c, + 0x40809e2e, + 0x4081227a, + 0x4081a0e0, + 0x40822e54, + 0x40829b81, + 0x408323e7, + 0x4083a710, + 0x40841e42, + 0x4084a444, + 0x408524c9, + 0x4085a5ed, + 0x40862549, + 0x4086a1e4, + 0x40872e9a, + 0x4087a63b, + 0x40881bbf, + 0x4088a822, + 0x40891c0e, + 0x40899b9b, + 0x408a2b12, + 0x408a9993, + 0x408b31ac, + 0x408baf24, + 0x408c24d9, + 0x408c99cb, + 0x408d1f2a, + 0x408d9e74, + 0x408e205a, + 0x408ea337, + 0x408f2836, + 0x408fa609, + 0x409027eb, + 0x4090a51b, + 0x40912afa, + 0x409199f1, + 0x40921c5b, + 0x4092aed5, + 0x40932fb5, + 0x4093a1f5, + 0x40941e56, + 0x4094ab2b, + 0x40952697, + 0x4095b13d, + 0x40962e81, + 0x4096a155, + 0x40972240, + 0x4097a0a9, + 0x40981cbb, + 0x4098a6ab, + 0x40992ef1, + 0x4099a364, + 0x409a22fd, + 0x409a99af, + 0x409b1eb0, + 0x409b9edb, + 0x409c3092, + 0x409c9f03, + 0x409d2111, + 0x409da0f6, + 0x409e1d4c, + 0x409ea18a, + 0x409f2172, + 0x409f9ea3, + 0x40a021b2, + 0x40a0a0c3, + 0x41f429cc, + 0x41f92a5e, + 0x41fe2951, + 0x41feac07, + 0x41ff2d35, + 0x420329e5, + 0x42082a07, + 0x4208aa43, + 0x42092935, + 0x4209aa7d, + 0x420a298c, + 0x420aa96c, + 0x420b29ac, + 0x420baa25, + 0x420c2d51, + 0x420cab3b, + 0x420d2bee, + 0x420dac25, + 0x42122c58, + 0x42172d18, + 0x4217ac9a, + 0x421c2cbc, + 0x421f2c77, + 0x42212dc9, + 0x42262cfb, + 0x422b2da7, + 0x422babc9, + 0x422c2d89, + 0x422cab7c, + 0x422d2b55, + 0x422dad68, + 0x422e2ba8, + 0x42302cd7, + 0x4230ac3f, + 0x44320778, + 0x44328787, + 0x44330793, + 0x443387a1, + 0x443407b4, + 0x443487c5, + 0x443507cc, + 0x443587d6, + 0x443607e9, + 0x443687ff, + 0x44370811, + 0x4437881e, + 0x4438082d, + 0x44388835, + 0x4439084d, + 0x4439885b, + 0x443a086e, + 0x48321351, + 0x48329363, + 0x48331379, + 0x48339392, + 0x4c3213cf, + 0x4c3293df, + 0x4c3313f2, + 0x4c339412, 0x4c3400b9, 0x4c3480f7, - 0x4c3513e3, - 0x4c3593f1, - 0x4c36140d, - 0x4c369433, - 0x4c371442, - 0x4c379450, - 0x4c381465, - 0x4c389471, - 0x4c391491, - 0x4c3994bb, - 0x4c3a14d4, - 0x4c3a94ed, - 0x4c3b0625, - 0x4c3b9506, - 0x4c3c1518, - 0x4c3c9527, - 0x4c3d1540, - 0x4c3d8c6f, - 0x4c3e15ad, - 0x4c3e954f, - 0x4c3f15cf, - 0x4c3f9304, - 0x4c401565, - 0x4c409380, - 0x4c41159d, - 0x4c419420, - 0x4c421589, - 0x5032353e, - 0x5032b54d, - 0x50333558, - 0x5033b568, - 0x50343581, - 0x5034b59b, - 0x503535a9, - 0x5035b5bf, - 0x503635d1, - 0x5036b5e7, - 0x50373600, - 0x5037b613, - 0x5038362b, - 0x5038b63c, - 0x50393651, - 0x5039b665, - 0x503a3685, - 0x503ab69b, - 0x503b36b3, - 0x503bb6c5, - 0x503c36e1, - 0x503cb6f8, - 0x503d3711, - 0x503db727, - 0x503e3734, - 0x503eb74a, - 0x503f375c, - 0x503f83a3, - 0x5040376f, - 0x5040b77f, - 0x50413799, - 0x5041b7a8, - 0x504237c2, - 0x5042b7df, - 0x504337ef, - 0x5043b7ff, - 0x5044381c, - 0x50448459, - 0x50453830, - 0x5045b84e, - 0x50463861, - 0x5046b877, - 0x50473889, - 0x5047b89e, - 0x504838c4, - 0x5048b8d2, - 0x504938e5, - 0x5049b8fa, - 0x504a3910, - 0x504ab920, - 0x504b3940, - 0x504bb953, - 0x504c3976, - 0x504cb9a4, - 0x504d39d1, - 0x504db9ee, - 0x504e3a09, - 0x504eba25, - 0x504f3a37, - 0x504fba4e, - 0x50503a5d, - 0x50508719, - 0x50513a70, - 0x5051b80e, - 0x505239b6, - 0x58320f8d, - 0x68320f4f, - 0x68328ca7, - 0x68330cba, - 0x68338f5d, - 0x68340f6d, + 0x4c35141e, + 0x4c35942c, + 0x4c361448, + 0x4c36946e, + 0x4c37147d, + 0x4c37948b, + 0x4c3814a0, + 0x4c3894ac, + 0x4c3914cc, + 0x4c3994f6, + 0x4c3a150f, + 0x4c3a9528, + 0x4c3b0635, + 0x4c3b9541, + 0x4c3c1553, + 0x4c3c9562, + 0x4c3d157b, + 0x4c3d8c92, + 0x4c3e15e8, + 0x4c3e958a, + 0x4c3f160a, + 0x4c3f9327, + 0x4c4015a0, + 0x4c4093bb, + 0x4c4115d8, + 0x4c41945b, + 0x4c4215c4, + 0x4c4293a3, + 0x50323579, + 0x5032b588, + 0x50333593, + 0x5033b5a3, + 0x503435bc, + 0x5034b5d6, + 0x503535e4, + 0x5035b5fa, + 0x5036360c, + 0x5036b622, + 0x5037363b, + 0x5037b64e, + 0x50383666, + 0x5038b677, + 0x5039368c, + 0x5039b6a0, + 0x503a36c0, + 0x503ab6d6, + 0x503b36ee, + 0x503bb700, + 0x503c371c, + 0x503cb733, + 0x503d374c, + 0x503db762, + 0x503e376f, + 0x503eb785, + 0x503f3797, + 0x503f83b3, + 0x504037aa, + 0x5040b7ba, + 0x504137d4, + 0x5041b7e3, + 0x504237fd, + 0x5042b81a, + 0x5043382a, + 0x5043b83a, + 0x50443857, + 0x50448469, + 0x5045386b, + 0x5045b889, + 0x5046389c, + 0x5046b8b2, + 0x504738c4, + 0x5047b8d9, + 0x504838ff, + 0x5048b90d, + 0x50493920, + 0x5049b935, + 0x504a394b, + 0x504ab95b, + 0x504b397b, + 0x504bb98e, + 0x504c39b1, + 0x504cb9df, + 0x504d3a0c, + 0x504dba29, + 0x504e3a44, + 0x504eba60, + 0x504f3a72, + 0x504fba89, + 0x50503a98, + 0x50508729, + 0x50513aab, + 0x5051b849, + 0x505239f1, + 0x58320fb0, + 0x68320f72, + 0x68328cca, + 0x68330cdd, + 0x68338f80, + 0x68340f90, 0x683480f7, - 0x6c320f15, - 0x6c328c5e, - 0x6c330f20, - 0x6c338f39, - 0x74320a43, + 0x6c320f38, + 0x6c328c81, + 0x6c330f43, + 0x6c338f5c, + 0x74320a66, 0x743280b9, - 0x74330c6f, - 0x783209a8, - 0x783289bd, - 0x783309c9, + 0x74330c92, + 0x783209cb, + 0x783289e0, + 0x783309ec, 0x78338090, - 0x783409d8, - 0x783489ed, - 0x78350a0c, - 0x78358a2e, - 0x78360a43, - 0x78368a59, - 0x78370a69, - 0x78378a8a, - 0x78380a9d, - 0x78388aaf, - 0x78390abc, - 0x78398adb, - 0x783a0af0, - 0x783a8afe, - 0x783b0b08, - 0x783b8b1c, - 0x783c0b33, - 0x783c8b48, - 0x783d0b5f, - 0x783d8b74, - 0x783e0aca, - 0x783e8a7c, - 0x7c32121d, - 0x80321433, + 0x783409fb, + 0x78348a10, + 0x78350a2f, + 0x78358a51, + 0x78360a66, + 0x78368a7c, + 0x78370a8c, + 0x78378aad, + 0x78380ac0, + 0x78388ad2, + 0x78390adf, + 0x78398afe, + 0x783a0b13, + 0x783a8b21, + 0x783b0b2b, + 0x783b8b3f, + 0x783c0b56, + 0x783c8b6b, + 0x783d0b82, + 0x783d8b97, + 0x783e0aed, + 0x783e8a9f, + 0x7c321240, + 0x8032146e, 0x80328090, - 0x80333253, + 0x8033328e, 0x803380b9, - 0x80343262, - 0x8034b1ca, - 0x803531e8, - 0x8035b276, - 0x8036322a, - 0x8036b1d9, - 0x8037321c, - 0x8037b1b7, - 0x8038323d, - 0x8038b1f9, - 0x8039320e, + 0x8034329d, + 0x8034b205, + 0x80353223, + 0x8035b2b1, + 0x80363265, + 0x8036b214, + 0x80373257, + 0x8037b1f2, + 0x80383278, + 0x8038b234, + 0x80393249, }; const size_t kOpenSSLReasonValuesLen = sizeof(kOpenSSLReasonValues) / sizeof(kOpenSSLReasonValues[0]); @@ -854,6 +857,7 @@ "INVALID_BIT_STRING_PADDING\0" "INVALID_BMPSTRING\0" "INVALID_DIGIT\0" + "INVALID_INTEGER\0" "INVALID_MODIFIER\0" "INVALID_NUMBER\0" "INVALID_OBJECT_ENCODING\0" @@ -900,6 +904,7 @@ "UNSUPPORTED_ANY_DEFINED_BY_TYPE\0" "UNSUPPORTED_PUBLIC_KEY_TYPE\0" "UNSUPPORTED_TYPE\0" + "WRONG_INTEGER_TYPE\0" "WRONG_PUBLIC_KEY_TYPE\0" "WRONG_TAG\0" "WRONG_TYPE\0" @@ -1069,6 +1074,7 @@ "NOT_PKCS7_SIGNED_DATA\0" "NO_CERTIFICATES_INCLUDED\0" "NO_CRLS_INCLUDED\0" + "AMBIGUOUS_FRIENDLY_NAME\0" "BAD_ITERATION_COUNT\0" "BAD_PKCS12_DATA\0" "BAD_PKCS12_VERSION\0"
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc index 6c128c7..dd491bc 100644 --- a/third_party/leveldatabase/env_chromium.cc +++ b/third_party/leveldatabase/env_chromium.cc
@@ -26,6 +26,7 @@ #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" +#include "base/time/time.h" #include "base/time/time_override.h" #include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/memory_dump_provider.h"
diff --git a/third_party/woff2/README.chromium b/third_party/woff2/README.chromium index 4cf3e71..74ea0d5 100644 --- a/third_party/woff2/README.chromium +++ b/third_party/woff2/README.chromium
@@ -1,6 +1,6 @@ Name: woff2 URL: https://github.com/google/woff2 -Version: a0d0ed7da27b708c0a4e96ad7a998bddc933c06e +Version: 4721483ad780ee2b63cb787bfee4aa64b61a0446 License: MIT License File: LICENSE Security Critical: yes
diff --git a/third_party/woff2/include/woff2/encode.h b/third_party/woff2/include/woff2/encode.h index 34b7722..2ac5630 100644 --- a/third_party/woff2/include/woff2/encode.h +++ b/third_party/woff2/include/woff2/encode.h
@@ -26,8 +26,8 @@ // Returns an upper bound on the size of the compressed file. size_t MaxWOFF2CompressedSize(const uint8_t* data, size_t length); -size_t MaxWOFF2CompressedSize(const uint8_t* data, size_t length, - const std::string& extended_metadata); +size_t MaxWOFF2CompressedSize(const uint8_t *data, size_t length, + const std::string &extended_metadata); // Compresses the font into the target buffer. *result_length should be at least // the value returned by MaxWOFF2CompressedSize(), upon return, it is set to the
diff --git a/third_party/woff2/include/woff2/output.h b/third_party/woff2/include/woff2/output.h index c325f67..dc78ccf 100644 --- a/third_party/woff2/include/woff2/output.h +++ b/third_party/woff2/include/woff2/output.h
@@ -51,7 +51,7 @@ // Create a writer that writes its data to buf. // buf->size() will grow to at most max_size // buf may be sized (e.g. using EstimateWOFF2FinalSize) or empty. - explicit WOFF2StringOut(std::string* buf); + explicit WOFF2StringOut(std::string *buf); bool Write(const void *buf, size_t n) override; bool Write(const void *buf, size_t offset, size_t n) override; @@ -59,7 +59,7 @@ size_t MaxSize() { return max_size_; } void SetMaxSize(size_t max_size); private: - std::string* buf_; + std::string *buf_; size_t max_size_; size_t offset_; };
diff --git a/third_party/woff2/src/file.h b/third_party/woff2/src/file.h index 6131877..70ea7a7 100644 --- a/third_party/woff2/src/file.h +++ b/third_party/woff2/src/file.h
@@ -14,18 +14,14 @@ namespace woff2 { -using std::string; - - -inline string GetFileContent(string filename) { +inline std::string GetFileContent(std::string filename) { std::ifstream ifs(filename.c_str(), std::ios::binary); - return string( - std::istreambuf_iterator<char>(ifs.rdbuf()), - std::istreambuf_iterator<char>()); + return std::string(std::istreambuf_iterator<char>(ifs.rdbuf()), + std::istreambuf_iterator<char>()); } -inline void SetFileContents(string filename, string::iterator start, - string::iterator end) { +inline void SetFileContents(std::string filename, std::string::iterator start, + std::string::iterator end) { std::ofstream ofs(filename.c_str(), std::ios::binary); std::copy(start, end, std::ostream_iterator<char>(ofs)); }
diff --git a/third_party/woff2/src/glyph.cc b/third_party/woff2/src/glyph.cc index 057174d..5b49486 100644 --- a/third_party/woff2/src/glyph.cc +++ b/third_party/woff2/src/glyph.cc
@@ -21,6 +21,7 @@ static const int32_t kFLAG_REPEAT = 1 << 3; static const int32_t kFLAG_XREPEATSIGN = 1 << 4; static const int32_t kFLAG_YREPEATSIGN = 1 << 5; +static const int32_t kFLAG_OVERLAP_SIMPLE = 1 << 6; static const int32_t kFLAG_ARG_1_AND_2_ARE_WORDS = 1 << 0; static const int32_t kFLAG_WE_HAVE_A_SCALE = 1 << 3; static const int32_t kFLAG_MORE_COMPONENTS = 1 << 5; @@ -134,6 +135,10 @@ } } + if (!flags.empty() && !flags[0].empty()) { + glyph->overlap_simple_flag_set = (flags[0][0] & kFLAG_OVERLAP_SIMPLE); + } + // Read the x coordinates. int prev_x = 0; for (int i = 0; i < num_contours; ++i) { @@ -239,7 +244,7 @@ bool StorePoints(const Glyph& glyph, size_t* offset, uint8_t* dst, size_t dst_size) { - int last_flag = -1; + int previous_flag = -1; int repeat_count = 0; int last_x = 0; int last_y = 0; @@ -250,6 +255,10 @@ for (const auto& contour : glyph.contours) { for (const auto& point : contour) { int flag = point.on_curve ? kFLAG_ONCURVE : 0; + if (previous_flag == -1 && glyph.overlap_simple_flag_set) { + // First flag needs to have overlap simple bit set. + flag = flag | kFLAG_OVERLAP_SIMPLE; + } int dx = point.x - last_x; int dy = point.y - last_y; if (dx == 0) { @@ -268,7 +277,7 @@ } else { y_bytes += 2; } - if (flag == last_flag && repeat_count != 255) { + if (flag == previous_flag && repeat_count != 255) { dst[*offset - 1] |= kFLAG_REPEAT; repeat_count++; } else { @@ -286,7 +295,7 @@ } last_x = point.x; last_y = point.y; - last_flag = flag; + previous_flag = flag; } } if (repeat_count != 0) {
diff --git a/third_party/woff2/src/glyph.h b/third_party/woff2/src/glyph.h index f24056f..c38eb5f2b 100644 --- a/third_party/woff2/src/glyph.h +++ b/third_party/woff2/src/glyph.h
@@ -10,8 +10,10 @@ #ifndef WOFF2_GLYPH_H_ #define WOFF2_GLYPH_H_ -#include <stddef.h> #include <inttypes.h> +#include <stddef.h> + +#include <cstdint> #include <vector> namespace woff2 { @@ -22,7 +24,10 @@ // is around. class Glyph { public: - Glyph() : instructions_size(0), composite_data_size(0) {} + Glyph() + : instructions_size(0), + overlap_simple_flag_set(false), + composite_data_size(0) {} // Bounding box. int16_t x_min; @@ -34,6 +39,9 @@ uint16_t instructions_size; const uint8_t* instructions_data; + // Flags. + bool overlap_simple_flag_set; + // Data model for simple glyphs. struct Point { int x;
diff --git a/third_party/woff2/src/transform.cc b/third_party/woff2/src/transform.cc index 999bef37..1016efc 100644 --- a/third_party/woff2/src/transform.cc +++ b/third_party/woff2/src/transform.cc
@@ -22,6 +22,7 @@ const int FLAG_ARG_1_AND_2_ARE_WORDS = 1 << 0; const int FLAG_WE_HAVE_INSTRUCTIONS = 1 << 8; +const int FLAG_OVERLAP_SIMPLE_BITMAP = 1 << 0; void WriteBytes(std::vector<uint8_t>* out, const uint8_t* data, size_t len) { if (len == 0) return; @@ -69,7 +70,10 @@ } void GetTransformedGlyfBytes(std::vector<uint8_t>* result) { - WriteLong(result, 0); // version + WriteUShort(result, 0); // Version + WriteUShort(result, overlap_bitmap_.empty() + ? 0x00 + : FLAG_OVERLAP_SIMPLE_BITMAP); // Flags WriteUShort(result, n_glyphs_); WriteUShort(result, 0); // index_format, will be set later WriteLong(result, n_contour_stream_.size()); @@ -87,6 +91,9 @@ WriteBytes(result, bbox_bitmap_); WriteBytes(result, bbox_stream_); WriteBytes(result, instruction_stream_); + if (!overlap_bitmap_.empty()) { + WriteBytes(result, overlap_bitmap_); + } } private: @@ -127,6 +134,10 @@ } void WriteSimpleGlyph(int glyph_id, const Glyph& glyph) { + if (glyph.overlap_simple_flag_set) { + EnsureOverlapBitmap(); + overlap_bitmap_[glyph_id >> 3] |= 0x80 >> (glyph_id & 7); + } int num_contours = glyph.contours.size(); WriteUShort(&n_contour_stream_, num_contours); if (ShouldWriteSimpleGlyphBbox(glyph)) { @@ -214,6 +225,12 @@ } } + void EnsureOverlapBitmap() { + if (overlap_bitmap_.empty()) { + overlap_bitmap_.resize((n_glyphs_ + 7) >> 3); + } + } + std::vector<uint8_t> n_contour_stream_; std::vector<uint8_t> n_points_stream_; std::vector<uint8_t> flag_byte_stream_; @@ -222,6 +239,7 @@ std::vector<uint8_t> bbox_stream_; std::vector<uint8_t> glyph_stream_; std::vector<uint8_t> instruction_stream_; + std::vector<uint8_t> overlap_bitmap_; int n_glyphs_; };
diff --git a/third_party/woff2/src/woff2_compress.cc b/third_party/woff2/src/woff2_compress.cc index 80e3108..36e8fca 100644 --- a/third_party/woff2/src/woff2_compress.cc +++ b/third_party/woff2/src/woff2_compress.cc
@@ -13,22 +13,20 @@ int main(int argc, char **argv) { - using std::string; - if (argc != 2) { fprintf(stderr, "One argument, the input filename, must be provided.\n"); return 1; } - string filename(argv[1]); - string outfilename = filename.substr(0, filename.find_last_of(".")) + ".woff2"; + std::string filename(argv[1]); + std::string outfilename = filename.substr(0, filename.find_last_of(".")) + ".woff2"; fprintf(stdout, "Processing %s => %s\n", filename.c_str(), outfilename.c_str()); - string input = woff2::GetFileContent(filename); + std::string input = woff2::GetFileContent(filename); const uint8_t* input_data = reinterpret_cast<const uint8_t*>(input.data()); size_t output_size = woff2::MaxWOFF2CompressedSize(input_data, input.size()); - string output(output_size, 0); + std::string output(output_size, 0); uint8_t* output_data = reinterpret_cast<uint8_t*>(&output[0]); woff2::WOFF2Params params;
diff --git a/third_party/woff2/src/woff2_dec.cc b/third_party/woff2/src/woff2_dec.cc index 25e18c6..efb579b 100644 --- a/third_party/woff2/src/woff2_dec.cc +++ b/third_party/woff2/src/woff2_dec.cc
@@ -32,10 +32,6 @@ namespace { -using std::string; -using std::vector; - - // simple glyph flags const int kGlyfOnCurve = 1 << 0; const int kGlyfXShort = 1 << 1; @@ -43,6 +39,7 @@ const int kGlyfRepeat = 1 << 3; const int kGlyfThisXIsSame = 1 << 4; const int kGlyfThisYIsSame = 1 << 5; +const int kOverlapSimple = 1 << 6; // composite glyph flags // See CompositeGlyph.java in sfntly for full definitions @@ -53,6 +50,9 @@ const int FLAG_WE_HAVE_A_TWO_BY_TWO = 1 << 7; const int FLAG_WE_HAVE_INSTRUCTIONS = 1 << 8; +// glyf flags +const int FLAG_OVERLAP_SIMPLE_BITMAP = 1 << 0; + const size_t kCheckSumAdjustmentOffset = 8; const size_t kEndPtsOfContoursOffset = 10; @@ -191,8 +191,9 @@ // This function stores just the point data. On entry, dst points to the // beginning of a simple glyph. Returns true on success. bool StorePoints(unsigned int n_points, const Point* points, - unsigned int n_contours, unsigned int instruction_length, - uint8_t* dst, size_t dst_size, size_t* glyph_size) { + unsigned int n_contours, unsigned int instruction_length, + bool has_overlap_bit, uint8_t* dst, size_t dst_size, + size_t* glyph_size) { // I believe that n_contours < 65536, in which case this is safe. However, a // comment and/or an assert would be good. unsigned int flag_offset = kEndPtsOfContoursOffset + 2 * n_contours + 2 + @@ -207,6 +208,10 @@ for (unsigned int i = 0; i < n_points; ++i) { const Point& point = points[i]; int flag = point.on_curve ? kGlyfOnCurve : 0; + if (has_overlap_bit && i == 0) { + flag |= kOverlapSimple; + } + int dx = point.x - last_x; int dy = point.y - last_y; if (dx == 0) { @@ -404,13 +409,20 @@ WOFF2Out* out) { static const int kNumSubStreams = 7; Buffer file(data, glyf_table->transform_length); - uint32_t version; + uint16_t version; std::vector<std::pair<const uint8_t*, size_t> > substreams(kNumSubStreams); const size_t glyf_start = out->Size(); - if (PREDICT_FALSE(!file.ReadU32(&version))) { + if (PREDICT_FALSE(!file.ReadU16(&version))) { return FONT_COMPRESSION_FAILURE(); } + + uint16_t flags; + if (PREDICT_FALSE(!file.ReadU16(&flags))) { + return FONT_COMPRESSION_FAILURE(); + } + bool has_overlap_bitmap = (flags & FLAG_OVERLAP_SIMPLE_BITMAP); + if (PREDICT_FALSE(!file.ReadU16(&info->num_glyphs) || !file.ReadU16(&info->index_format))) { return FONT_COMPRESSION_FAILURE(); @@ -448,6 +460,17 @@ Buffer bbox_stream(substreams[5].first, substreams[5].second); Buffer instruction_stream(substreams[6].first, substreams[6].second); + const uint8_t* overlap_bitmap = nullptr; + unsigned int overlap_bitmap_length = 0; + if (has_overlap_bitmap) { + overlap_bitmap_length = (info->num_glyphs + 7) >> 3; + overlap_bitmap = data + offset; + if (PREDICT_FALSE(overlap_bitmap_length > + glyf_table->transform_length - offset)) { + return FONT_COMPRESSION_FAILURE(); + } + } + std::vector<uint32_t> loca_values(info->num_glyphs + 1); std::vector<unsigned int> n_points_vec; std::unique_ptr<Point[]> points; @@ -601,8 +624,12 @@ } glyph_size += instruction_size; - if (PREDICT_FALSE(!StorePoints(total_n_points, points.get(), n_contours, - instruction_size, glyph_buf.get(), glyph_buf_size, &glyph_size))) { + bool has_overlap_bit = + has_overlap_bitmap && overlap_bitmap[i >> 3] & (0x80 >> (i & 7)); + + if (PREDICT_FALSE(!StorePoints( + total_n_points, points.get(), n_contours, instruction_size, + has_overlap_bit, glyph_buf.get(), glyph_buf_size, &glyph_size))) { return FONT_COMPRESSION_FAILURE(); } } else {
diff --git a/third_party/woff2/src/woff2_decompress.cc b/third_party/woff2/src/woff2_decompress.cc index de088b9..47394781 100644 --- a/third_party/woff2/src/woff2_decompress.cc +++ b/third_party/woff2/src/woff2_decompress.cc
@@ -14,21 +14,21 @@ int main(int argc, char **argv) { - using std::string; - if (argc != 2) { fprintf(stderr, "One argument, the input filename, must be provided.\n"); return 1; } - string filename(argv[1]); - string outfilename = filename.substr(0, filename.find_last_of(".")) + ".ttf"; + std::string filename(argv[1]); + std::string outfilename = filename.substr(0, filename.find_last_of(".")) + ".ttf"; // Note: update woff2_dec_fuzzer_new_entry.cc if this pattern changes. - string input = woff2::GetFileContent(filename); + std::string input = woff2::GetFileContent(filename); const uint8_t* raw_input = reinterpret_cast<const uint8_t*>(input.data()); - string output(std::min(woff2::ComputeWOFF2FinalSize(raw_input, input.size()), - woff2::kDefaultMaxSize), 0); + std::string output( + std::min(woff2::ComputeWOFF2FinalSize(raw_input, input.size()), + woff2::kDefaultMaxSize), + 0); woff2::WOFF2StringOut out(&output); const bool ok = woff2::ConvertWOFF2ToTTF(raw_input, input.size(), &out);
diff --git a/third_party/woff2/src/woff2_enc.cc b/third_party/woff2/src/woff2_enc.cc index ec00878b..f3f46e5 100644 --- a/third_party/woff2/src/woff2_enc.cc +++ b/third_party/woff2/src/woff2_enc.cc
@@ -28,13 +28,9 @@ namespace woff2 { + namespace { - -using std::string; -using std::vector; - - const size_t kWoff2HeaderSize = 48; const size_t kWoff2EntrySize = 20; @@ -183,7 +179,7 @@ } size_t MaxWOFF2CompressedSize(const uint8_t* data, size_t length, - const string& extended_metadata) { + const std::string& extended_metadata) { // Except for the header size, which is 32 bytes larger in woff2 format, // all other parts should be smaller (table header in short format, // transformations and compression). Just to be sure, we will give some
diff --git a/third_party/woff2/src/woff2_info.cc b/third_party/woff2/src/woff2_info.cc index 2b51adc..b132304 100644 --- a/third_party/woff2/src/woff2_info.cc +++ b/third_party/woff2/src/woff2_info.cc
@@ -29,18 +29,16 @@ } int main(int argc, char **argv) { - using std::string; - if (argc != 2) { fprintf(stderr, "One argument, the input filename, must be provided.\n"); return 1; } - string filename(argv[1]); - string outfilename = filename.substr(0, filename.find_last_of(".")) + ".woff2"; + std::string filename(argv[1]); + std::string outfilename = filename.substr(0, filename.find_last_of(".")) + ".woff2"; fprintf(stdout, "Processing %s => %s\n", filename.c_str(), outfilename.c_str()); - string input = woff2::GetFileContent(filename); + std::string input = woff2::GetFileContent(filename); woff2::Buffer file(reinterpret_cast<const uint8_t*>(input.data()), input.size());
diff --git a/third_party/woff2/src/woff2_out.cc b/third_party/woff2/src/woff2_out.cc index 8ab3268..a22d3bf 100644 --- a/third_party/woff2/src/woff2_out.cc +++ b/third_party/woff2/src/woff2_out.cc
@@ -8,14 +8,10 @@ #include <woff2/output.h> -using std::string; - namespace woff2 { -WOFF2StringOut::WOFF2StringOut(string* buf) - : buf_(buf), - max_size_(kDefaultMaxSize), - offset_(0) {} +WOFF2StringOut::WOFF2StringOut(std::string *buf) + : buf_(buf), max_size_(kDefaultMaxSize), offset_(0) {} bool WOFF2StringOut::Write(const void *buf, size_t n) { return Write(buf, offset_, n);
diff --git a/third_party/zlib/README.chromium b/third_party/zlib/README.chromium index c3c1ef6..db159bef 100644 --- a/third_party/zlib/README.chromium +++ b/third_party/zlib/README.chromium
@@ -1,7 +1,7 @@ Name: zlib Short Name: zlib URL: http://zlib.net/ -Version: 1.2.11 +Version: 1.2.12 CPEPrefix: cpe:/a:zlib:zlib:1.2.11 Security Critical: yes License: Custom license @@ -27,3 +27,4 @@ - Plus the changes in 'patches' folder. - Code in contrib/ other than contrib/minizip was added to match zlib's contributor layout. + - Backported patches from 1.2.12 release (Work In Progress).
diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c index 346a479b..87d8e3b4 100644 --- a/third_party/zlib/deflate.c +++ b/third_party/zlib/deflate.c
@@ -176,10 +176,15 @@ /* =========================================================================== * Initialize the hash table (avoiding 64K overflow for 16 bit systems). * prev[] will be initialized on the fly. + * TODO(cavalcantii): optimization opportunity, check comments on: + * https://chromium-review.googlesource.com/c/chromium/src/+/3561506/ */ #define CLEAR_HASH(s) \ - s->head[s->hash_size-1] = NIL; \ - zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); + do { \ + s->head[s->hash_size-1] = NIL; \ + zmemzero((Bytef *)s->head, \ + (unsigned)(s->hash_size-1)*sizeof(*s->head)); \ + } while (0) /* =========================================================================== * Slide the hash table when sliding the window down (could be avoided with 32 @@ -1851,7 +1856,7 @@ return block_done; /* Fill the window with any remaining input. */ - have = s->window_size - s->strstart - 1; + have = s->window_size - s->strstart; if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) { /* Slide the window down. */ s->block_start -= s->w_size;
diff --git a/third_party/zlib/gzlib.c b/third_party/zlib/gzlib.c index 4105e6a..4838bf0 100644 --- a/third_party/zlib/gzlib.c +++ b/third_party/zlib/gzlib.c
@@ -5,7 +5,7 @@ #include "gzguts.h" -#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__) +#if defined(_WIN32) && !defined(__BORLANDC__) # define LSEEK _lseeki64 #else #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 @@ -397,7 +397,7 @@ /* if within raw area while reading, just go there */ if (state->mode == GZ_READ && state->how == COPY && state->x.pos + offset >= 0) { - ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR); + ret = LSEEK(state->fd, offset - (z_off64_t)state->x.have, SEEK_CUR); if (ret == -1) return -1; state->x.have = 0;
diff --git a/tools/android/forwarder2/device_forwarder_main.cc b/tools/android/forwarder2/device_forwarder_main.cc index 33df045..440270a 100644 --- a/tools/android/forwarder2/device_forwarder_main.cc +++ b/tools/android/forwarder2/device_forwarder_main.cc
@@ -19,6 +19,7 @@ #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "tools/android/forwarder2/common.h" #include "tools/android/forwarder2/daemon.h" #include "tools/android/forwarder2/device_controller.h"
diff --git a/tools/android/forwarder2/device_listener.h b/tools/android/forwarder2/device_listener.h index e7cf7fd..ecf93a5 100644 --- a/tools/android/forwarder2/device_listener.h +++ b/tools/android/forwarder2/device_listener.h
@@ -11,6 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "tools/android/forwarder2/forwarders_manager.h" #include "tools/android/forwarder2/pipe_notifier.h" #include "tools/android/forwarder2/self_deleter_helper.h"
diff --git a/tools/android/forwarder2/forwarders_manager.h b/tools/android/forwarder2/forwarders_manager.h index dd5d2b1..03dedf84 100644 --- a/tools/android/forwarder2/forwarders_manager.h +++ b/tools/android/forwarder2/forwarders_manager.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/threading/thread.h" +#include "base/time/time.h" #include "tools/android/forwarder2/pipe_notifier.h" namespace forwarder2 {
diff --git a/tools/android/forwarder2/host_controller.h b/tools/android/forwarder2/host_controller.h index 87ab3b64..54a25d6a 100644 --- a/tools/android/forwarder2/host_controller.h +++ b/tools/android/forwarder2/host_controller.h
@@ -12,6 +12,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "tools/android/forwarder2/forwarders_manager.h" #include "tools/android/forwarder2/pipe_notifier.h" #include "tools/android/forwarder2/self_deleter_helper.h"
diff --git a/tools/android/forwarder2/host_controllers_manager.h b/tools/android/forwarder2/host_controllers_manager.h index fb7d888..d809b7b 100644 --- a/tools/android/forwarder2/host_controllers_manager.h +++ b/tools/android/forwarder2/host_controllers_manager.h
@@ -12,6 +12,7 @@ #include "base/at_exit.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "tools/android/forwarder2/host_controller.h" #include "tools/android/forwarder2/socket.h"
diff --git a/tools/cr/cr-bash-helpers.sh b/tools/cr/cr-bash-helpers.sh index 3fa6a8aa..38d80181 100755 --- a/tools/cr/cr-bash-helpers.sh +++ b/tools/cr/cr-bash-helpers.sh
@@ -26,7 +26,7 @@ fi cr_main="${cr_base_dir}/main.py" -cr_exec=("PYTHONDONTWRITEBYTECODE=1" "python" "${cr_main}") +cr_exec=("PYTHONDONTWRITEBYTECODE=1" "python3" "${cr_main}") # The main entry point to the cr tool. # Invokes the python script with pyc files turned off.
diff --git a/tools/cr/cr/base/buildtype.py b/tools/cr/cr/base/buildtype.py index 2761531..8a40f47 100644 --- a/tools/cr/cr/base/buildtype.py +++ b/tools/cr/cr/base/buildtype.py
@@ -29,12 +29,12 @@ @classmethod def AddArguments(cls, parser): - parser.add_argument( - '--type', dest=cls.SELECTOR, - choices=cls.Choices(), - default=None, - help='Sets the build type to use. Overrides ' + cls.SELECTOR - ) + parser.add_argument('--type', + dest=cls.SELECTOR, + choices=cls.Choices(), + default='Debug', + help='Sets the build type to use. Overrides ' + + cls.SELECTOR) class DebugBuildType(BuildType):
diff --git a/tools/cr/cr/commands/init.py b/tools/cr/cr/commands/init.py index 9debbba..dea3440 100644 --- a/tools/cr/cr/commands/init.py +++ b/tools/cr/cr/commands/init.py
@@ -71,16 +71,6 @@ if not (base and buildtype): print('Specified output directory must be two levels') exit(1) - if not cr.BuildType.FindPlugin(buildtype): - print('Specified build type', buildtype, 'is not valid') - print('Must be one of', - ','.join(p.name for p in cr.BuildType.Plugins())) - exit(1) - if (cr.context.args.CR_BUILDTYPE and - cr.context.args.CR_BUILDTYPE != buildtype): - print('If --type and --out are both specified, they must match') - print('Got', cr.context.args.CR_BUILDTYPE, 'and', buildtype) - exit(1) platform = cr.context.args.CR_PLATFORM if not platform: # Try to guess platform based on output name @@ -103,7 +93,6 @@ CR_OUT_FULL=out, CR_OUT_BASE=base, CR_PLATFORM=platform, - CR_BUILDTYPE=buildtype, CR_GENERATOR=generator ) if not 'CR_OUT_BASE' in cr.context:
diff --git a/tools/ipc_fuzzer/message_replay/replay_process.h b/tools/ipc_fuzzer/message_replay/replay_process.h index 9fa4528..6eb7128 100644 --- a/tools/ipc_fuzzer/message_replay/replay_process.h +++ b/tools/ipc_fuzzer/message_replay/replay_process.h
@@ -12,6 +12,7 @@ #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_executor.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_listener.h"
diff --git a/tools/mac/power/power_sampler/resource_coalition_sampler.h b/tools/mac/power/power_sampler/resource_coalition_sampler.h index fcf0d5f..e196a2d 100644 --- a/tools/mac/power/power_sampler/resource_coalition_sampler.h +++ b/tools/mac/power/power_sampler/resource_coalition_sampler.h
@@ -10,6 +10,7 @@ #include <memory> #include "base/process/process_handle.h" +#include "base/time/time.h" #include "components/power_metrics/energy_impact_mac.h" #include "components/power_metrics/resource_coalition_mac.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index da7896a..7ccdb40 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -52868,6 +52868,7 @@ <int value="-1396595854" label="PrivateNetworkAccessRespectPreflightResults:enabled"/> <int value="-1396434715" label="AssistMultiWord:disabled"/> + <int value="-1395216271" label="LauncherGameSearch:disabled"/> <int value="-1392689905" label="ServiceWorkerLongRunningMessage:enabled"/> <int value="-1392673888" label="PolicyBlocklistThrottleRequiresPoliciesLoaded:enabled"/> @@ -53737,7 +53738,6 @@ <int value="-816895294" label="DiscoverApp:disabled"/> <int value="-816404462" label="TabGroupsAutoCreate:disabled"/> <int value="-815213125" label="SplitSettings:enabled"/> - <int value="-815067606" label="AppDiscoveryRemoteUrlSearch:enabled"/> <int value="-814097014" label="disable-session-crashed-bubble"/> <int value="-813753274" label="VrBrowsing:disabled"/> <int value="-813474479" label="site-per-process"/> @@ -56675,6 +56675,7 @@ <int value="1222808563" label="DisableInitialMostVisitedFadeIn:disabled"/> <int value="1226624874" label="Mus:disabled"/> <int value="1226676061" label="PageInfoV2Desktop:enabled"/> + <int value="1226760549" label="LauncherGameSearch:enabled"/> <int value="1227633129" label="NtpChromeCartModule:disabled"/> <int value="1228054141" label="OverrideUnsupportedPageLanguageForHrefTranslate:enabled"/> @@ -56756,7 +56757,6 @@ <int value="1279584261" label="enable-carrier-switching"/> <int value="1280614081" label="show-overdraw-feedback"/> <int value="1281471853" label="UseButtonTranslateBubbleUI:disabled"/> - <int value="1283371794" label="AppDiscoveryRemoteUrlSearch:disabled"/> <int value="1283908088" label="ImprovedLanguageSettings:disabled"/> <int value="1283956865" label="force-tablet-mode"/> <int value="1283960113" label="disable-fixed-position-compositing"/> @@ -75202,6 +75202,8 @@ <int value="0" label="Black"/> <int value="1" label="White"/> <int value="2" label="Blue"/> + <int value="3" label="Red"/> + <int value="4" label="Yellow"/> </enum> <enum name="ProjectorToolbar">
diff --git a/tools/metrics/histograms/metadata/sb_client/histograms.xml b/tools/metrics/histograms/metadata/sb_client/histograms.xml index da104849..02bd4194 100644 --- a/tools/metrics/histograms/metadata/sb_client/histograms.xml +++ b/tools/metrics/histograms/metadata/sb_client/histograms.xml
@@ -71,6 +71,46 @@ </summary> </histogram> +<histogram name="SBClientDownload.DmgAnalysisTimedOut" enum="BooleanTimedOut" + expires_after="2022-09-30"> + <owner>drubery@chromium.org</owner> + <owner>chrome-safebrowsing-alerts@google.com</owner> + <summary> + For each DMG download on Mac, records whether or not analysis of the DMG + timed out. + </summary> +</histogram> + +<histogram name="SBClientDownload.DmgHasAPFS" enum="Boolean" + expires_after="2022-09-30"> + <owner>drubery@chromium.org</owner> + <owner>chrome-safebrowsing-alerts@google.com</owner> + <summary> + For each DMG download on Mac, records whether or not the download contains + any APFS partitions. + </summary> +</histogram> + +<histogram name="SBClientDownload.DmgIterationSuccess" enum="BooleanSuccess" + expires_after="2022-09-30"> + <owner>drubery@chromium.org</owner> + <owner>chrome-safebrowsing-alerts@google.com</owner> + <summary> + For each DMG download on Mac, records whether or not we were able to iterate + through the partitions of the DMG. + </summary> +</histogram> + +<histogram name="SBClientDownload.DmgParsedUdif" enum="BooleanSuccess" + expires_after="2022-09-30"> + <owner>drubery@chromium.org</owner> + <owner>chrome-safebrowsing-alerts@google.com</owner> + <summary> + For each DMG download on Mac, records whether or not the UDIF image was + parsed successfully. + </summary> +</histogram> + <histogram name="SBClientDownload.DocumentAnalysisSuccess" units="Boolean" expires_after="2022-08-15"> <owner>drubery@chromium.org</owner> @@ -372,7 +412,7 @@ </histogram> <histogram name="SBClientDownload.{Analyzer}AnalysisRemoteValid" - enum="BooleanValid" expires_after="2022-05-08"> + enum="BooleanValid" expires_after="2022-08-08"> <owner>drubery@chromium.org</owner> <owner>chrome-safebrowsing-alerts@google.com</owner> <summary> @@ -442,8 +482,8 @@ </histogram> <histogram name="SBClientPhishing.ClassificationStart" enum="BooleanHit" - expires_after="2022-05-08"> - <owner>vakh@chromium.org</owner> + expires_after="2023-05-08"> + <owner>drubery@chromium.org</owner> <owner>chrome-safebrowsing-alerts@google.com</owner> <summary> The number of pages that we could have possibly classified (essentially the
diff --git a/tools/metrics/histograms/metadata/storage/histograms.xml b/tools/metrics/histograms/metadata/storage/histograms.xml index da7bea4..5b9fecb 100644 --- a/tools/metrics/histograms/metadata/storage/histograms.xml +++ b/tools/metrics/histograms/metadata/storage/histograms.xml
@@ -736,6 +736,45 @@ </summary> </histogram> +<histogram name="Storage.SharedStorage.OnShutdown.NumSqlErrors" units="Errors" + expires_after="2023-01-31"> + <owner>cammie@chromium.org</owner> + <owner>yaoxia@chromium.org</owner> + <owner>chrome-ads-histograms@google.com</owner> + <summary> + Count of SQL errors that have occurred in Shared Storage. Recorded by + SharedStorageManager::RecordShutdownMetrics() when the StoragePartitionImpl + is destroyed. + </summary> +</histogram> + +<histogram + name="Storage.SharedStorage.OnShutdown.RecoveryFromInitFailureAttempted" + units="BooleanRecoveryAttempted" expires_after="2023-01-31"> + <owner>cammie@chromium.org</owner> + <owner>yaoxia@chromium.org</owner> + <owner>chrome-ads-histograms@google.com</owner> + <summary> + Whether or not the SharedStorageManager tried to recover from + SharedStorageDatabase::InitStatus::kInitFailure. Recorded by + SharedStorageManager::RecordShutdownMetrics() when the StoragePartitionImpl + is destroyed. + </summary> +</histogram> + +<histogram name="Storage.SharedStorage.OnShutdown.RecoveryOnDiskAttempted" + units="BooleanRecoveryOnDiskAttempted" expires_after="2023-01-31"> + <owner>cammie@chromium.org</owner> + <owner>yaoxia@chromium.org</owner> + <owner>chrome-ads-histograms@google.com</owner> + <summary> + Whether or not the SharedStorageManager tried to recover from + SharedStorageDatabase::InitStatus::kInitFailure on disk. Recorded by + SharedStorageManager::RecordShutdownMetrics() when the StoragePartitionImpl + is destroyed. + </summary> +</histogram> + <histogram name="Storage.StoragePressure.Bubble" enum="StoragePressureBubbleUserAction" expires_after="2023-03-09"> <owner>ayui@chromium.org</owner>
diff --git a/tools/metrics/ukm/ukm.xml b/tools/metrics/ukm/ukm.xml index 4ab3e439..d8c56ae 100644 --- a/tools/metrics/ukm/ukm.xml +++ b/tools/metrics/ukm/ukm.xml
@@ -11767,6 +11767,28 @@ </metric> </event> +<event name="Navigation.ReceivedResponse"> + <owner>abeyad@chromium.org</owner> + <owner>potassium-katabolism@google.com</owner> + <summary> + Recorded when the navigation receives a response from the networking layer. + Only recorded for main frames (i.e. top-level frames). + </summary> + <metric name="HasAcceptCHFrame"> + <summary> + A boolean value representing whether the navigation included the + processing of an ACCEPT_CH ALPS frame. + </summary> + </metric> + <metric name="NavigationFirstResponseLatency"> + <summary> + The duration (in milliseconds) for how long it took from the time the + navigation loader is created to the time the navigation loader receives + the response from the networking layer. + </summary> + </metric> +</event> + <event name="NavigationPredictorAnchorElementMetrics"> <owner>ryansturm@chromium.org</owner> <summary>
diff --git a/ui/aura/native_window_occlusion_tracker_win.cc b/ui/aura/native_window_occlusion_tracker_win.cc index de2ceb5..f0d96bb 100644 --- a/ui/aura/native_window_occlusion_tracker_win.cc +++ b/ui/aura/native_window_occlusion_tracker_win.cc
@@ -18,7 +18,6 @@ #include "base/strings/string_util_win.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h"
diff --git a/ui/base/accelerators/mojom/accelerator_mojom_traits.h b/ui/base/accelerators/mojom/accelerator_mojom_traits.h index 1b32acd..3b79141 100644 --- a/ui/base/accelerators/mojom/accelerator_mojom_traits.h +++ b/ui/base/accelerators/mojom/accelerator_mojom_traits.h
@@ -5,6 +5,7 @@ #ifndef UI_BASE_ACCELERATORS_MOJOM_ACCELERATOR_MOJOM_TRAITS_H_ #define UI_BASE_ACCELERATORS_MOJOM_ACCELERATOR_MOJOM_TRAITS_H_ +#include "base/time/time.h" #include "mojo/public/cpp/base/time_mojom_traits.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/mojom/accelerator.mojom-shared.h"
diff --git a/ui/base/clipboard/clipboard_android.cc b/ui/base/clipboard/clipboard_android.cc index 13e00589..8996b66 100644 --- a/ui/base/clipboard/clipboard_android.cc +++ b/ui/base/clipboard/clipboard_android.cc
@@ -22,7 +22,6 @@ #include "base/notreached.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/thread_annotations.h" #include "base/time/time.h"
diff --git a/ui/base/clipboard/clipboard_util_win.cc b/ui/base/clipboard/clipboard_util_win.cc index 6ae3176..893cf7f 100644 --- a/ui/base/clipboard/clipboard_util_win.cc +++ b/ui/base/clipboard/clipboard_util_win.cc
@@ -18,7 +18,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/ui/base/clipboard/test/test_clipboard.h b/ui/base/clipboard/test/test_clipboard.h index 438c2ee..3c09f236 100644 --- a/ui/base/clipboard/test/test_clipboard.h +++ b/ui/base/clipboard/test/test_clipboard.h
@@ -13,6 +13,7 @@ #include <vector> #include "base/containers/flat_map.h" +#include "base/time/time.h" #include "build/chromeos_buildflags.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/clipboard.h"
diff --git a/ui/base/ime/win/on_screen_keyboard_display_manager_input_pane.cc b/ui/base/ime/win/on_screen_keyboard_display_manager_input_pane.cc index 7f4580aa..18fceb4a 100644 --- a/ui/base/ime/win/on_screen_keyboard_display_manager_input_pane.cc +++ b/ui/base/ime/win/on_screen_keyboard_display_manager_input_pane.cc
@@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h" #include "base/win/com_init_util.h"
diff --git a/ui/base/interaction/interaction_sequence_unittest.cc b/ui/base/interaction/interaction_sequence_unittest.cc index c48d1679..4f328baf 100644 --- a/ui/base/interaction/interaction_sequence_unittest.cc +++ b/ui/base/interaction/interaction_sequence_unittest.cc
@@ -8,7 +8,6 @@ #include "base/debug/stack_trace.h" #include "base/location.h" #include "base/logging.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/ui/base/prediction/input_filter_unittest_helpers.cc b/ui/base/prediction/input_filter_unittest_helpers.cc index a295dd4..d042237 100644 --- a/ui/base/prediction/input_filter_unittest_helpers.cc +++ b/ui/base/prediction/input_filter_unittest_helpers.cc
@@ -5,6 +5,7 @@ #include "ui/base/prediction/input_filter_unittest_helpers.h" #include "base/rand_util.h" +#include "base/time/time.h" #include "ui/base/prediction/input_predictor_unittest_helpers.h" #include "ui/base/prediction/prediction_unittest_helpers.h"
diff --git a/ui/base/prediction/kalman_predictor.cc b/ui/base/prediction/kalman_predictor.cc index 270d506..6e40f467 100644 --- a/ui/base/prediction/kalman_predictor.cc +++ b/ui/base/prediction/kalman_predictor.cc
@@ -8,6 +8,7 @@ #include <cmath> #include "base/numerics/math_constants.h" +#include "base/time/time.h" #include "ui/base/ui_base_features.h" namespace {
diff --git a/ui/base/prediction/least_squares_predictor.h b/ui/base/prediction/least_squares_predictor.h index 4ce0c53..d74a8fe 100644 --- a/ui/base/prediction/least_squares_predictor.h +++ b/ui/base/prediction/least_squares_predictor.h
@@ -8,6 +8,7 @@ #include <deque> #include "base/component_export.h" +#include "base/time/time.h" #include "ui/base/prediction/input_predictor.h" #include "ui/gfx/geometry/matrix3_f.h"
diff --git a/ui/base/prediction/linear_resampling.h b/ui/base/prediction/linear_resampling.h index de76446e..d74f6164 100644 --- a/ui/base/prediction/linear_resampling.h +++ b/ui/base/prediction/linear_resampling.h
@@ -8,6 +8,7 @@ #include <deque> #include "base/component_export.h" +#include "base/time/time.h" #include "ui/base/prediction/input_predictor.h" namespace ui {
diff --git a/ui/base/win/session_change_observer.cc b/ui/base/win/session_change_observer.cc index c10038b0..1b9df32 100644 --- a/ui/base/win/session_change_observer.cc +++ b/ui/base/win/session_change_observer.cc
@@ -16,7 +16,6 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/observer_list.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "ui/gfx/win/singleton_hwnd.h" #include "ui/gfx/win/singleton_hwnd_observer.h"
diff --git a/ui/base/x/x11_cursor_loader.cc b/ui/base/x/x11_cursor_loader.cc index f2ee56f..abdae888 100644 --- a/ui/base/x/x11_cursor_loader.cc +++ b/ui/base/x/x11_cursor_loader.cc
@@ -23,7 +23,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/sys_byteorder.h" -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/ui/chromeos/events/event_rewriter_chromeos.cc b/ui/chromeos/events/event_rewriter_chromeos.cc index 95307c6..2494069 100644 --- a/ui/chromeos/events/event_rewriter_chromeos.cc +++ b/ui/chromeos/events/event_rewriter_chromeos.cc
@@ -1061,8 +1061,10 @@ EventRewriterChromeOS::DeviceType EventRewriterChromeOS::GetLastKeyboardType() const { - if (last_keyboard_device_id_ == ED_UNKNOWN_DEVICE) + if ((last_keyboard_device_id_ == ED_UNKNOWN_DEVICE) || + (last_keyboard_device_id_ == ED_REMOTE_INPUT_DEVICE)) { return kDeviceUnknown; + } const auto iter = device_id_to_info_.find(last_keyboard_device_id_); if (iter == device_id_to_info_.end()) {
diff --git a/ui/chromeos/styles/cros_colors.json5 b/ui/chromeos/styles/cros_colors.json5 index 4a725c1..25f4f94 100644 --- a/ui/chromeos/styles/cros_colors.json5 +++ b/ui/chromeos/styles/cros_colors.json5
@@ -219,6 +219,18 @@ light: "rgba($black_rgb, 0.06)", dark: "rgba($white_rgb, 0.08)", }, + highlight_color_green: { + light: "rgb($google_green_50_rgb)", + dark: "rgba($google_green_300_rgb, 0.3)", + }, + highlight_color_red: { + light: "rgb($google_red_50_rgb)", + dark: "rgba($google_red_600_rgb, 0.3)", + }, + highlight_color_yellow: { + light: "rgb($google_yellow_50_rgb)", + dark: "rgba($google_yellow_600_rgb, 0.3)", + }, ripple_color: { light: "rgba($black_rgb, 0.06)", dark: "rgba($white_rgb, 0.08)",
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc index a116b15..0d8ea298 100644 --- a/ui/compositor/test/in_process_context_factory.cc +++ b/ui/compositor/test/in_process_context_factory.cc
@@ -14,6 +14,7 @@ #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "build/build_config.h" #include "cc/base/switches.h" #include "components/viz/common/features.h"
diff --git a/ui/display/win/color_profile_reader.cc b/ui/display/win/color_profile_reader.cc index 2a577844..8f5e212 100644 --- a/ui/display/win/color_profile_reader.cc +++ b/ui/display/win/color_profile_reader.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/files/file_util.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_thread_priority.h" #include "ui/display/win/display_info.h"
diff --git a/ui/events/blink/fling_booster.h b/ui/events/blink/fling_booster.h index 3e23e9c7..341e199f 100644 --- a/ui/events/blink/fling_booster.h +++ b/ui/events/blink/fling_booster.h
@@ -5,6 +5,7 @@ #ifndef UI_EVENTS_BLINK_FLING_BOOSTER_H_ #define UI_EVENTS_BLINK_FLING_BOOSTER_H_ +#include "base/time/time.h" #include "third_party/blink/public/common/input/web_gesture_event.h" namespace ui {
diff --git a/ui/events/event_constants.h b/ui/events/event_constants.h index 3db1646..c16556cd 100644 --- a/ui/events/event_constants.h +++ b/ui/events/event_constants.h
@@ -177,8 +177,12 @@ BLOCKED, }; -// Device ID for Touch and Key Events. -enum EventDeviceId { ED_UNKNOWN_DEVICE = -1 }; +enum EventDeviceId { + // Device ID for Touch, Mouse and Key Events. + ED_UNKNOWN_DEVICE = -1, + // Device ID for events injected through a remote connection (like CRD). + ED_REMOTE_INPUT_DEVICE = -2, +}; // Pointing device type. enum class EventPointerType : int {
diff --git a/ui/events/event_utils.cc b/ui/events/event_utils.cc index 727760a2..8e923ad 100644 --- a/ui/events/event_utils.cc +++ b/ui/events/event_utils.cc
@@ -11,6 +11,7 @@ #include "base/check.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" +#include "base/time/time.h" #include "base/trace_event/trace_id_helper.h" #include "base/trace_event/typed_macros.h" #include "build/build_config.h"
diff --git a/ui/events/gesture_detection/gesture_detector.h b/ui/events/gesture_detection/gesture_detector.h index 9fb618bb..89bbf9e 100644 --- a/ui/events/gesture_detection/gesture_detector.h +++ b/ui/events/gesture_detection/gesture_detector.h
@@ -9,6 +9,7 @@ #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" +#include "base/time/time.h" #include "ui/events/gesture_detection/gesture_detection_export.h" #include "ui/events/gesture_detection/velocity_tracker_state.h"
diff --git a/ui/events/gesture_detection/gesture_event_data_packet.h b/ui/events/gesture_detection/gesture_event_data_packet.h index f5f3234..517fdae 100644 --- a/ui/events/gesture_detection/gesture_event_data_packet.h +++ b/ui/events/gesture_detection/gesture_event_data_packet.h
@@ -9,6 +9,7 @@ #include <stdint.h> #include "base/containers/stack_container.h" +#include "base/time/time.h" #include "ui/events/gesture_detection/gesture_detection_export.h" #include "ui/events/gesture_detection/gesture_event_data.h"
diff --git a/ui/events/gesture_detection/gesture_provider.cc b/ui/events/gesture_detection/gesture_provider.cc index aa89128..0a883463 100644 --- a/ui/events/gesture_detection/gesture_provider.cc +++ b/ui/events/gesture_detection/gesture_provider.cc
@@ -10,6 +10,7 @@ #include "base/auto_reset.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "ui/events/event_constants.h" #include "ui/events/gesture_detection/gesture_configuration.h"
diff --git a/ui/events/gesture_detection/motion_event_generic.h b/ui/events/gesture_detection/motion_event_generic.h index 13a0d7f..5e0c8a81 100644 --- a/ui/events/gesture_detection/motion_event_generic.h +++ b/ui/events/gesture_detection/motion_event_generic.h
@@ -9,6 +9,7 @@ #include <stdint.h> #include "base/containers/stack_container.h" +#include "base/time/time.h" #include "ui/events/gesture_detection/gesture_detection_export.h" #include "ui/events/gesture_detection/motion_event.h"
diff --git a/ui/events/gesture_detection/snap_scroll_controller_unittest.cc b/ui/events/gesture_detection/snap_scroll_controller_unittest.cc index 3d21b3b..9cb18aed 100644 --- a/ui/events/gesture_detection/snap_scroll_controller_unittest.cc +++ b/ui/events/gesture_detection/snap_scroll_controller_unittest.cc
@@ -2,8 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "testing/gtest/include/gtest/gtest.h" #include "ui/events/gesture_detection/snap_scroll_controller.h" +#include "base/time/time.h" +#include "testing/gtest/include/gtest/gtest.h" #include "ui/events/test/motion_event_test_utils.h" using base::TimeTicks;
diff --git a/ui/events/gestures/blink/web_gesture_curve_impl_unittest.cc b/ui/events/gestures/blink/web_gesture_curve_impl_unittest.cc index 057a15c6..2725a1e 100644 --- a/ui/events/gestures/blink/web_gesture_curve_impl_unittest.cc +++ b/ui/events/gestures/blink/web_gesture_curve_impl_unittest.cc
@@ -6,6 +6,7 @@ #include <memory> +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/platform/web_gesture_curve.h" #include "ui/events/gestures/fling_curve.h"
diff --git a/ui/events/mojom/event_mojom_traits.cc b/ui/events/mojom/event_mojom_traits.cc index 72ca1a95..fc7d1ff 100644 --- a/ui/events/mojom/event_mojom_traits.cc +++ b/ui/events/mojom/event_mojom_traits.cc
@@ -4,6 +4,7 @@ #include "ui/events/mojom/event_mojom_traits.h" +#include "base/time/time.h" #include "mojo/public/cpp/base/time_mojom_traits.h" #include "ui/events/event.h" #include "ui/events/event_utils.h"
diff --git a/ui/events/ozone/device/device_manager_manual.cc b/ui/events/ozone/device/device_manager_manual.cc index 0d25b40..928ec91 100644 --- a/ui/events/ozone/device/device_manager_manual.cc +++ b/ui/events/ozone/device/device_manager_manual.cc
@@ -10,7 +10,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/observer_list.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/thread_pool.h"
diff --git a/ui/events/ozone/evdev/event_thread_evdev.h b/ui/events/ozone/evdev/event_thread_evdev.h index ae62e022..5c47b50a 100644 --- a/ui/events/ozone/evdev/event_thread_evdev.h +++ b/ui/events/ozone/evdev/event_thread_evdev.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/callback.h" +#include "base/time/time.h" namespace base { class Thread;
diff --git a/ui/events/ozone/evdev/input_injector_evdev.cc b/ui/events/ozone/evdev/input_injector_evdev.cc index 8197c66..560a466 100644 --- a/ui/events/ozone/evdev/input_injector_evdev.cc +++ b/ui/events/ozone/evdev/input_injector_evdev.cc
@@ -19,12 +19,6 @@ namespace ui { -namespace { - -const int kDeviceIdForInjection = -1; - -} // namespace - InputInjectorEvdev::InputInjectorEvdev( std::unique_ptr<DeviceEventDispatcherEvdev> dispatcher, CursorDelegateEvdev* cursor) @@ -32,6 +26,10 @@ InputInjectorEvdev::~InputInjectorEvdev() = default; +void InputInjectorEvdev::SetDeviceId(int device_id) { + device_id_ = device_id; +} + void InputInjectorEvdev::InjectMouseButton(EventFlags button, bool down) { unsigned int code; switch (button) { @@ -50,15 +48,15 @@ } dispatcher_->DispatchMouseButtonEvent(MouseButtonEventParams( - kDeviceIdForInjection, EF_NONE, cursor_->GetLocation(), code, down, + device_id_, EF_NONE, cursor_->GetLocation(), code, down, MouseButtonMapType::kNone, PointerDetails(EventPointerType::kMouse), EventTimeForNow())); } void InputInjectorEvdev::InjectMouseWheel(int delta_x, int delta_y) { dispatcher_->DispatchMouseWheelEvent(MouseWheelEventParams( - kDeviceIdForInjection, cursor_->GetLocation(), - gfx::Vector2d(delta_x, delta_y), EventTimeForNow())); + device_id_, cursor_->GetLocation(), gfx::Vector2d(delta_x, delta_y), + EventTimeForNow())); } void InputInjectorEvdev::MoveCursorTo(const gfx::PointF& location) { @@ -76,7 +74,7 @@ const int event_flags = EF_NOT_SUITABLE_FOR_MOUSE_WARPING; dispatcher_->DispatchMouseMoveEvent(MouseMoveEventParams( - kDeviceIdForInjection, event_flags, cursor_->GetLocation(), + device_id_, event_flags, cursor_->GetLocation(), nullptr /* ordinal_delta */, PointerDetails(EventPointerType::kMouse), EventTimeForNow())); } @@ -88,9 +86,9 @@ return; int evdev_code = KeycodeConverter::DomCodeToEvdevCode(physical_key); - dispatcher_->DispatchKeyEvent(KeyEventParams( - kDeviceIdForInjection, ui::EF_NONE, evdev_code, 0 /*scan_code*/, down, - suppress_auto_repeat, EventTimeForNow())); + dispatcher_->DispatchKeyEvent( + KeyEventParams(device_id_, EF_NONE, evdev_code, 0 /*scan_code*/, down, + suppress_auto_repeat, EventTimeForNow())); } } // namespace ui
diff --git a/ui/events/ozone/evdev/input_injector_evdev.h b/ui/events/ozone/evdev/input_injector_evdev.h index 23a49af..d733fb9d 100644 --- a/ui/events/ozone/evdev/input_injector_evdev.h +++ b/ui/events/ozone/evdev/input_injector_evdev.h
@@ -6,6 +6,7 @@ #define UI_EVENTS_OZONE_EVDEV_INPUT_INJECTOR_EVDEV_H_ #include "base/component_export.h" +#include "ui/events/event_constants.h" #include "ui/events/ozone/evdev/event_dispatch_callback.h" #include "ui/ozone/public/system_input_injector.h" @@ -25,6 +26,7 @@ ~InputInjectorEvdev() override; // SystemInputInjector implementation. + void SetDeviceId(int device_id) override; void InjectMouseButton(EventFlags button, bool down) override; void InjectMouseWheel(int delta_x, int delta_y) override; void MoveCursorTo(const gfx::PointF& location) override; @@ -36,6 +38,8 @@ // Shared cursor state. CursorDelegateEvdev* const cursor_; + int device_id_ = ED_UNKNOWN_DEVICE; + // Interface for dispatching events. const std::unique_ptr<DeviceEventDispatcherEvdev> dispatcher_; };
diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_feedback.cc b/ui/events/ozone/evdev/libgestures_glue/gesture_feedback.cc index 8bcf358..051ca8a 100644 --- a/ui/events/ozone/evdev/libgestures_glue/gesture_feedback.cc +++ b/ui/events/ozone/evdev/libgestures_glue/gesture_feedback.cc
@@ -17,7 +17,6 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/chromeos_buildflags.h" #include "ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h"
diff --git a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc index 28e917b..9e1ea1e 100644 --- a/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc +++ b/ui/events/ozone/evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc
@@ -10,6 +10,7 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/events/base_event_utils.h" #include "ui/events/event.h"
diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev.h b/ui/events/ozone/evdev/touch_event_converter_evdev.h index c9105d4..93b81eb 100644 --- a/ui/events/ozone/evdev/touch_event_converter_evdev.h +++ b/ui/events/ozone/evdev/touch_event_converter_evdev.h
@@ -23,6 +23,7 @@ #include "base/files/scoped_file.h" #include "base/message_loop/message_pump_libevent.h" #include "base/metrics/field_trial_params.h" +#include "base/time/time.h" #include "ui/events/ozone/evdev/event_converter_evdev.h" #include "ui/events/ozone/evdev/event_device_info.h" #include "ui/events/ozone/evdev/touch_evdev_debug_buffer.h"
diff --git a/ui/events/ozone/evdev/touch_filter/heuristic_stylus_palm_detection_filter_unittest.cc b/ui/events/ozone/evdev/touch_filter/heuristic_stylus_palm_detection_filter_unittest.cc index cce0e2ed7..d35f568 100644 --- a/ui/events/ozone/evdev/touch_filter/heuristic_stylus_palm_detection_filter_unittest.cc +++ b/ui/events/ozone/evdev/touch_filter/heuristic_stylus_palm_detection_filter_unittest.cc
@@ -7,6 +7,7 @@ #include <linux/input.h> #include "base/test/gtest_util.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/ozone/evdev/touch_filter/palm_detection_filter.h" #include "ui/events/ozone/evdev/touch_filter/shared_palm_detection_filter_state.h"
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc index 3953548..6e9cdfe6 100644 --- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc +++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
@@ -16,7 +16,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/memory/free_deleter.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h"
diff --git a/ui/events/platform/x11/x11_hotplug_event_handler.cc b/ui/events/platform/x11/x11_hotplug_event_handler.cc index f6383344..a337798 100644 --- a/ui/events/platform/x11/x11_hotplug_event_handler.cc +++ b/ui/events/platform/x11/x11_hotplug_event_handler.cc
@@ -21,7 +21,6 @@ #include "base/process/launch.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/ui/gfx/animation/keyframe/keyframe_model.cc b/ui/gfx/animation/keyframe/keyframe_model.cc index ed95de6..dd79839 100644 --- a/ui/gfx/animation/keyframe/keyframe_model.cc +++ b/ui/gfx/animation/keyframe/keyframe_model.cc
@@ -6,6 +6,7 @@ #include "base/memory/ptr_util.h" #include "base/notreached.h" +#include "base/time/time.h" namespace gfx { namespace {
diff --git a/ui/gfx/animation/keyframe/keyframe_model.h b/ui/gfx/animation/keyframe/keyframe_model.h index dac07172..8ef289e 100644 --- a/ui/gfx/animation/keyframe/keyframe_model.h +++ b/ui/gfx/animation/keyframe/keyframe_model.h
@@ -7,6 +7,7 @@ #include <string> +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/animation/keyframe/animation_curve.h" #include "ui/gfx/animation/keyframe/keyframe_animation_export.h"
diff --git a/ui/gfx/animation/keyframe/test/animation_utils.cc b/ui/gfx/animation/keyframe/test/animation_utils.cc index d0b7098..d18afc3 100644 --- a/ui/gfx/animation/keyframe/test/animation_utils.cc +++ b/ui/gfx/animation/keyframe/test/animation_utils.cc
@@ -4,6 +4,7 @@ #include "ui/gfx/animation/keyframe/test/animation_utils.h" +#include "base/time/time.h" #include "ui/gfx/animation/keyframe/keyframed_animation_curve.h" namespace gfx {
diff --git a/ui/gfx/geometry/insets.h b/ui/gfx/geometry/insets.h index 451054c..59bfc468 100644 --- a/ui/gfx/geometry/insets.h +++ b/ui/gfx/geometry/insets.h
@@ -41,7 +41,7 @@ // equivalent to offsetting the rectangle then applying the insets. void Offset(const gfx::Vector2d& vector); - operator InsetsF() const { + explicit operator InsetsF() const { return InsetsF() .set_top(static_cast<float>(top())) .set_left(static_cast<float>(left()))
diff --git a/ui/gfx/mojom/delegated_ink_metadata_mojom_traits.cc b/ui/gfx/mojom/delegated_ink_metadata_mojom_traits.cc index f3f10a8..b82cd76 100644 --- a/ui/gfx/mojom/delegated_ink_metadata_mojom_traits.cc +++ b/ui/gfx/mojom/delegated_ink_metadata_mojom_traits.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include "ui/gfx/mojom/delegated_ink_metadata_mojom_traits.h" +#include "base/time/time.h" namespace mojo {
diff --git a/ui/gl/angle_platform_impl.cc b/ui/gl/angle_platform_impl.cc index 78647ba..b414f19 100644 --- a/ui/gl/angle_platform_impl.cc +++ b/ui/gl/angle_platform_impl.cc
@@ -11,7 +11,6 @@ #include "base/lazy_instance.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_functions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/trace_event/trace_event.h"
diff --git a/ui/gl/child_window_win.h b/ui/gl/child_window_win.h index ede7345..1a62000 100644 --- a/ui/gl/child_window_win.h +++ b/ui/gl/child_window_win.h
@@ -8,6 +8,7 @@ #include "base/memory/weak_ptr.h" #include "base/task/task_runner.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "ui/gl/gl_export.h" #include <windows.h>
diff --git a/ui/gl/delegated_ink_point_renderer_gpu.h b/ui/gl/delegated_ink_point_renderer_gpu.h index f013030e..bfe295c3 100644 --- a/ui/gl/delegated_ink_point_renderer_gpu.h +++ b/ui/gl/delegated_ink_point_renderer_gpu.h
@@ -16,6 +16,7 @@ #include "base/containers/flat_map.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "mojo/public/cpp/bindings/receiver.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/ui/gl/gl_surface_egl_surface_control.h b/ui/gl/gl_surface_egl_surface_control.h index 544b947..3f53b52 100644 --- a/ui/gl/gl_surface_egl_surface_control.h +++ b/ui/gl/gl_surface_egl_surface_control.h
@@ -13,6 +13,7 @@ #include "base/containers/flat_map.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/android/android_surface_control_compat.h" #include "ui/gl/gl_export.h"
diff --git a/ui/gl/gpu_timing_unittest.cc b/ui/gl/gpu_timing_unittest.cc index 9184b670..0b33a2ee 100644 --- a/ui/gl/gpu_timing_unittest.cc +++ b/ui/gl/gpu_timing_unittest.cc
@@ -9,6 +9,7 @@ #include <memory> #include "base/bind.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gl/gl_context_stub.h" #include "ui/gl/gl_implementation.h"
diff --git a/ui/gl/init/create_gr_gl_interface.cc b/ui/gl/init/create_gr_gl_interface.cc index a49da3bb..ccc5597b 100644 --- a/ui/gl/init/create_gr_gl_interface.cc +++ b/ui/gl/init/create_gr_gl_interface.cc
@@ -6,6 +6,7 @@ #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "base/traits_bag.h" #include "build/build_config.h"
diff --git a/ui/gl/sync_control_vsync_provider.h b/ui/gl/sync_control_vsync_provider.h index 57604c90..8d54a6a 100644 --- a/ui/gl/sync_control_vsync_provider.h +++ b/ui/gl/sync_control_vsync_provider.h
@@ -8,6 +8,7 @@ #include <stdint.h> #include "base/containers/queue.h" +#include "base/time/time.h" #include "build/build_config.h" #include "ui/gfx/vsync_provider.h"
diff --git a/ui/gl/vsync_provider_win.cc b/ui/gl/vsync_provider_win.cc index a80e2a0..4247ec1c 100644 --- a/ui/gl/vsync_provider_win.cc +++ b/ui/gl/vsync_provider_win.cc
@@ -6,6 +6,7 @@ #include <dwmapi.h> +#include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "ui/gfx/native_widget_types.h"
diff --git a/ui/gl/vsync_thread_win.h b/ui/gl/vsync_thread_win.h index 388057a..57ac6074 100644 --- a/ui/gl/vsync_thread_win.h +++ b/ui/gl/vsync_thread_win.h
@@ -11,6 +11,7 @@ #include "base/containers/flat_set.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "ui/gl/gl_export.h" #include "ui/gl/vsync_provider_win.h"
diff --git a/ui/gtk/printing/print_dialog_gtk.cc b/ui/gtk/printing/print_dialog_gtk.cc index aca31e1..804166d8 100644 --- a/ui/gtk/printing/print_dialog_gtk.cc +++ b/ui/gtk/printing/print_dialog_gtk.cc
@@ -17,7 +17,6 @@ #include "base/no_destructor.h" #include "base/sequence_checker.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/values.h"
diff --git a/ui/latency/latency_histogram_macros.h b/ui/latency/latency_histogram_macros.h index 1f63cb8..5bf1fe5 100644 --- a/ui/latency/latency_histogram_macros.h +++ b/ui/latency/latency_histogram_macros.h
@@ -6,6 +6,7 @@ #define UI_LATENCY_LATENCY_HISTOGRAM_MACROS_H_ #include "base/metrics/histogram_functions.h" +#include "base/time/time.h" // Check valid timing for start and end latency components. #define CONFIRM_EVENT_TIMES_EXIST(start, end) \
diff --git a/ui/latency/latency_info_unittest.cc b/ui/latency/latency_info_unittest.cc index 125553c6..112d323 100644 --- a/ui/latency/latency_info_unittest.cc +++ b/ui/latency/latency_info_unittest.cc
@@ -6,6 +6,7 @@ #include <stddef.h> +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace ui {
diff --git a/ui/latency/latency_tracker.h b/ui/latency/latency_tracker.h index e031a53..a8596c3 100644 --- a/ui/latency/latency_tracker.h +++ b/ui/latency/latency_tracker.h
@@ -5,6 +5,7 @@ #ifndef UI_LATENCY_LATENCY_TRACKER_H_ #define UI_LATENCY_LATENCY_TRACKER_H_ +#include "base/time/time.h" #include "ui/latency/latency_info.h" namespace ui {
diff --git a/ui/message_center/views/notification_header_view.h b/ui/message_center/views/notification_header_view.h index 28d03c8e..7f4dbab5 100644 --- a/ui/message_center/views/notification_header_view.h +++ b/ui/message_center/views/notification_header_view.h
@@ -7,6 +7,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/ui/message_center/views/notification_view.cc b/ui/message_center/views/notification_view.cc index 796672d..70b3209 100644 --- a/ui/message_center/views/notification_view.cc +++ b/ui/message_center/views/notification_view.cc
@@ -203,7 +203,7 @@ gfx::RectF bounds = rect; if (!preferred_size_.IsEmpty()) bounds.set_size(gfx::SizeF(preferred_size_)); - bounds.Inset(insets_); + bounds.Inset(gfx::InsetsF(insets_)); gfx::RoundedCornersF corner_radius(top_radius_, top_radius_, bottom_radius_, bottom_radius_); return gfx::RRectF(bounds, corner_radius);
diff --git a/ui/native_theme/native_theme_aura.cc b/ui/native_theme/native_theme_aura.cc index 2cc0e6c..49c85fad 100644 --- a/ui/native_theme/native_theme_aura.cc +++ b/ui/native_theme/native_theme_aura.cc
@@ -293,7 +293,7 @@ edge_adjust_insets.set_bottom(-kStrokeWidth); else edge_adjust_insets.set_right(-kStrokeWidth); - stroke_rect.Inset(stroke_insets + edge_adjust_insets); + stroke_rect.Inset(stroke_insets + gfx::InsetsF(edge_adjust_insets)); canvas->drawRect(gfx::RectFToSkRect(stroke_rect), flags); // Inset the all the edges edges so we fill-in the stroke below.
diff --git a/ui/native_theme/scrollbar_animator_mac.h b/ui/native_theme/scrollbar_animator_mac.h index 66a4158..b7fba01 100644 --- a/ui/native_theme/scrollbar_animator_mac.h +++ b/ui/native_theme/scrollbar_animator_mac.h
@@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/task/single_thread_task_runner.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/gfx/animation/keyframe/timing_function.h" #include "ui/native_theme/native_theme_export.h"
diff --git a/ui/ozone/demo/software_renderer.h b/ui/ozone/demo/software_renderer.h index 570f229..337b2b5 100644 --- a/ui/ozone/demo/software_renderer.h +++ b/ui/ozone/demo/software_renderer.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/ozone/demo/renderer_base.h"
diff --git a/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc b/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc index 5279a9f9..c4adda6 100644 --- a/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc +++ b/ui/ozone/platform/drm/gpu/gbm_surfaceless.cc
@@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/check_op.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h" #include "ui/gfx/gpu_fence_handle.h"
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.cc index 3c8592f3..4bd30ea 100644 --- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.cc +++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.cc
@@ -12,7 +12,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "ui/gfx/gpu_fence.h" #include "ui/gfx/presentation_feedback.h"
diff --git a/ui/ozone/platform/drm/gpu/page_flip_request.h b/ui/ozone/platform/drm/gpu/page_flip_request.h index 4092300..030b4922 100644 --- a/ui/ozone/platform/drm/gpu/page_flip_request.h +++ b/ui/ozone/platform/drm/gpu/page_flip_request.h
@@ -5,9 +5,9 @@ #ifndef UI_OZONE_PLATFORM_DRM_GPU_PAGE_FLIP_REQUEST_H_ #define UI_OZONE_PLATFORM_DRM_GPU_PAGE_FLIP_REQUEST_H_ - #include "base/atomic_ref_count.h" #include "base/callback.h" +#include "base/time/time.h" #include "ui/gfx/swap_result.h" #include "ui/ozone/public/swap_completion_callback.h"
diff --git a/ui/ozone/platform/drm/gpu/proxy_helpers_unittest.cc b/ui/ozone/platform/drm/gpu/proxy_helpers_unittest.cc index 811d0da7..4044ccc 100644 --- a/ui/ozone/platform/drm/gpu/proxy_helpers_unittest.cc +++ b/ui/ozone/platform/drm/gpu/proxy_helpers_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/task_environment.h" #include "base/threading/thread.h" #include "base/threading/thread_checker_impl.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace ui {
diff --git a/ui/ozone/platform/drm/host/drm_display_host_manager.cc b/ui/ozone/platform/drm/host/drm_display_host_manager.cc index 0c0eeaa..82b6e825 100644 --- a/ui/ozone/platform/drm/host/drm_display_host_manager.cc +++ b/ui/ozone/platform/drm/host/drm_display_host_manager.cc
@@ -16,7 +16,6 @@ #include "base/files/file_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/ui/ozone/platform/flatland/flatland_surface.h b/ui/ozone/platform/flatland/flatland_surface.h index fb34446..e2fa3a7f 100644 --- a/ui/ozone/platform/flatland/flatland_surface.h +++ b/ui/ozone/platform/flatland/flatland_surface.h
@@ -12,6 +12,7 @@ #include "base/containers/flat_map.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "mojo/public/cpp/platform/platform_handle.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_f.h"
diff --git a/ui/ozone/platform/headless/headless_surface_factory.cc b/ui/ozone/platform/headless/headless_surface_factory.cc index b250e05a..cc40d98 100644 --- a/ui/ozone/platform/headless/headless_surface_factory.cc +++ b/ui/ozone/platform/headless/headless_surface_factory.cc
@@ -11,7 +11,6 @@ #include "base/location.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "skia/ext/legacy_display_globals.h"
diff --git a/ui/ozone/platform/scenic/scenic_surface.h b/ui/ozone/platform/scenic/scenic_surface.h index 485bae7..e2a3344 100644 --- a/ui/ozone/platform/scenic/scenic_surface.h +++ b/ui/ozone/platform/scenic/scenic_surface.h
@@ -18,6 +18,7 @@ #include "base/containers/flat_map.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" +#include "base/time/time.h" #include "mojo/public/cpp/platform/platform_handle.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_f.h"
diff --git a/ui/ozone/platform/wayland/gpu/gbm_surfaceless_wayland.cc b/ui/ozone/platform/wayland/gpu/gbm_surfaceless_wayland.cc index 8c096e3..a8748a5 100644 --- a/ui/ozone/platform/wayland/gpu/gbm_surfaceless_wayland.cc +++ b/ui/ozone/platform/wayland/gpu/gbm_surfaceless_wayland.cc
@@ -11,7 +11,6 @@ #include <utility> #include "base/bind.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/trace_event/trace_event.h" #include "ui/gfx/gpu_fence.h"
diff --git a/ui/ozone/platform/wayland/gpu/wayland_canvas_surface.h b/ui/ozone/platform/wayland/gpu/wayland_canvas_surface.h index d417a43..cbf4414 100644 --- a/ui/ozone/platform/wayland/gpu/wayland_canvas_surface.h +++ b/ui/ozone/platform/wayland/gpu/wayland_canvas_surface.h
@@ -9,6 +9,7 @@ #include <vector> #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "third_party/skia/include/core/SkRefCnt.h" #include "third_party/skia/include/core/SkSurface.h" #include "ui/gfx/geometry/size.h"
diff --git a/ui/ozone/platform/wayland/host/wayland_cursor_factory.cc b/ui/ozone/platform/wayland/host/wayland_cursor_factory.cc index d9895e42..d72ff37 100644 --- a/ui/ozone/platform/wayland/host/wayland_cursor_factory.cc +++ b/ui/ozone/platform/wayland/host/wayland_cursor_factory.cc
@@ -6,7 +6,6 @@ #include <wayland-cursor.h> -#include "base/task/post_task.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/ui/ozone/platform/wayland/test/test_selection_device_manager.cc b/ui/ozone/platform/wayland/test/test_selection_device_manager.cc index e3a1318..8936fa48 100644 --- a/ui/ozone/platform/wayland/test/test_selection_device_manager.cc +++ b/ui/ozone/platform/wayland/test/test_selection_device_manager.cc
@@ -15,7 +15,6 @@ #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/notreached.h" -#include "base/task/post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner_util.h" #include "base/task/task_traits.h"
diff --git a/ui/ozone/platform/wayland/test/test_wayland_server_thread.h b/ui/ozone/platform/wayland/test/test_wayland_server_thread.h index 4dfe8a53..1735698 100644 --- a/ui/ozone/platform/wayland/test/test_wayland_server_thread.h +++ b/ui/ozone/platform/wayland/test/test_wayland_server_thread.h
@@ -14,6 +14,7 @@ #include "base/message_loop/message_pump_libevent.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" +#include "base/time/time.h" #include "ui/ozone/platform/wayland/test/global_object.h" #include "ui/ozone/platform/wayland/test/mock_wp_presentation.h" #include "ui/ozone/platform/wayland/test/mock_xdg_shell.h"
diff --git a/ui/ozone/public/system_input_injector.h b/ui/ozone/public/system_input_injector.h index d69d128..68acb1b8 100644 --- a/ui/ozone/public/system_input_injector.h +++ b/ui/ozone/public/system_input_injector.h
@@ -19,12 +19,16 @@ // native events. class COMPONENT_EXPORT(OZONE) SystemInputInjector { public: - SystemInputInjector() {} + SystemInputInjector() = default; SystemInputInjector(const SystemInputInjector&) = delete; SystemInputInjector& operator=(const SystemInputInjector&) = delete; - virtual ~SystemInputInjector() {} + virtual ~SystemInputInjector() = default; + + // Set the device id that will be used for all the generated events. + // The device id is set to |ui::ED_UNKNOWN_DEVICE| by default. + virtual void SetDeviceId(int device_id) = 0; // Moves the cursor on the screen and generates the corresponding MouseMove or // MouseDragged event. |location| is in physical screen coordinates,
diff --git a/ui/shell_dialogs/base_shell_dialog_win.cc b/ui/shell_dialogs/base_shell_dialog_win.cc index 46fd116c..b8ef380 100644 --- a/ui/shell_dialogs/base_shell_dialog_win.cc +++ b/ui/shell_dialogs/base_shell_dialog_win.cc
@@ -7,7 +7,6 @@ #include <algorithm> #include "base/no_destructor.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "base/win/scoped_com_initializer.h"
diff --git a/ui/shell_dialogs/select_file_dialog_linux_kde.cc b/ui/shell_dialogs/select_file_dialog_linux_kde.cc index 9968e1b..33000993 100644 --- a/ui/shell_dialogs/select_file_dialog_linux_kde.cc +++ b/ui/shell_dialogs/select_file_dialog_linux_kde.cc
@@ -17,7 +17,6 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/thread_restrictions.h"
diff --git a/ui/snapshot/screenshot_grabber.cc b/ui/snapshot/screenshot_grabber.cc index a16be48f..417d1280 100644 --- a/ui/snapshot/screenshot_grabber.cc +++ b/ui/snapshot/screenshot_grabber.cc
@@ -16,7 +16,6 @@ #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/task/current_thread.h" -#include "base/task/post_task.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/ui/snapshot/snapshot.cc b/ui/snapshot/snapshot.cc index 660a900..139ccf0 100644 --- a/ui/snapshot/snapshot.cc +++ b/ui/snapshot/snapshot.cc
@@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/callback.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h"
diff --git a/ui/snapshot/snapshot_async.cc b/ui/snapshot/snapshot_async.cc index 8e19322..9506887 100644 --- a/ui/snapshot/snapshot_async.cc +++ b/ui/snapshot/snapshot_async.cc
@@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/location.h" #include "base/numerics/safe_conversions.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/ui/views/animation/animation_builder.h b/ui/views/animation/animation_builder.h index 921b291c..235d023 100644 --- a/ui/views/animation/animation_builder.h +++ b/ui/views/animation/animation_builder.h
@@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/types/pass_key.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/compositor/layer_animation_observer.h"
diff --git a/ui/views/animation/animation_builder_unittest.cc b/ui/views/animation/animation_builder_unittest.cc index eb4283c..4eae1d8 100644 --- a/ui/views/animation/animation_builder_unittest.cc +++ b/ui/views/animation/animation_builder_unittest.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/test/gtest_util.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/compositor/layer.h"
diff --git a/ui/views/animation/bubble_slide_animator_unittest.cc b/ui/views/animation/bubble_slide_animator_unittest.cc index 3f0d2e2..a1316523 100644 --- a/ui/views/animation/bubble_slide_animator_unittest.cc +++ b/ui/views/animation/bubble_slide_animator_unittest.cc
@@ -8,6 +8,7 @@ #include "base/memory/raw_ptr.h" #include "base/test/bind.h" +#include "base/time/time.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/animation/animation_test_api.h" #include "ui/views/bubble/bubble_dialog_delegate_view.h"
diff --git a/ui/views/animation/ink_drop_impl.h b/ui/views/animation/ink_drop_impl.h index 511dc87..131b351 100644 --- a/ui/views/animation/ink_drop_impl.h +++ b/ui/views/animation/ink_drop_impl.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h"
diff --git a/ui/views/animation/slide_out_controller_unittest.cc b/ui/views/animation/slide_out_controller_unittest.cc index 4e52fd6..26e4be7a 100644 --- a/ui/views/animation/slide_out_controller_unittest.cc +++ b/ui/views/animation/slide_out_controller_unittest.cc
@@ -8,6 +8,7 @@ #include <utility> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "ui/compositor/layer.h" #include "ui/views/animation/slide_out_controller_delegate.h" #include "ui/views/test/views_test_base.h"
diff --git a/ui/views/border.cc b/ui/views/border.cc index ca32751..a5f01ff 100644 --- a/ui/views/border.cc +++ b/ui/views/border.cc
@@ -59,8 +59,8 @@ scaled_bounds.Scale(dsf); } - gfx::Insets insets_in_pixels = - gfx::ToFlooredInsets(gfx::ConvertInsetsToPixels(insets_, dsf)); + gfx::InsetsF insets_in_pixels( + gfx::ToFlooredInsets(gfx::ConvertInsetsToPixels(insets_, dsf))); scaled_bounds.Inset(insets_in_pixels); canvas->sk_canvas()->clipRect(gfx::RectFToSkRect(scaled_bounds), SkClipOp::kDifference, true); @@ -115,7 +115,7 @@ const float half_thickness = thickness_ / 2.0f; gfx::RectF bounds(view.GetLocalBounds()); - bounds.Inset(paint_insets_); + bounds.Inset(gfx::InsetsF(paint_insets_)); bounds.Inset(half_thickness, half_thickness); canvas->DrawRoundRect(bounds, corner_radius_ - half_thickness, flags); }
diff --git a/ui/views/bubble/bubble_border.cc b/ui/views/bubble/bubble_border.cc index 727d9b19..14006fe76 100644 --- a/ui/views/bubble/bubble_border.cc +++ b/ui/views/bubble/bubble_border.cc
@@ -643,7 +643,7 @@ SkRRect BubbleBorder::GetClientRect(const View& view) const { gfx::RectF bounds(view.GetLocalBounds()); - bounds.Inset(GetInsets()); + bounds.Inset(gfx::InsetsF(GetInsets())); return SkRRect::MakeRectXY(gfx::RectFToSkRect(bounds), corner_radius(), corner_radius()); }
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm index 7ed5041..c9294c5 100644 --- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm +++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
@@ -13,6 +13,7 @@ #include "base/mac/foundation_util.h" #include "base/no_destructor.h" #include "base/strings/sys_string_conversions.h" +#include "base/time/time.h" #include "components/remote_cocoa/app_shim/mouse_capture.h" #include "components/remote_cocoa/app_shim/native_widget_mac_nswindow.h" #include "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h"
diff --git a/ui/views/controls/button/toggle_button.cc b/ui/views/controls/button/toggle_button.cc index ffc86bc2..4abb7f65 100644 --- a/ui/views/controls/button/toggle_button.cc +++ b/ui/views/controls/button/toggle_button.cc
@@ -111,8 +111,8 @@ // We want the circle to have an integer pixel diameter and to be aligned // with pixel boundaries, so we scale dip bounds to pixel bounds and round. gfx::RectF thumb_bounds(GetLocalBounds()); - thumb_bounds.Inset(-GetShadowOutsets()); - thumb_bounds.Inset(gfx::InsetsF(0.5f)); + thumb_bounds.Inset(-gfx::InsetsF(GetShadowOutsets())); + thumb_bounds.Inset(0.5f); thumb_bounds.Scale(dsf); thumb_bounds = gfx::RectF(gfx::ToEnclosingRect(thumb_bounds)); canvas->DrawCircle(thumb_bounds.CenterPoint(), thumb_bounds.height() / 2.f,
diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h index ef5fe71..a4958eb 100644 --- a/ui/views/controls/menu/menu_controller.h +++ b/ui/views/controls/menu/menu_controller.h
@@ -16,6 +16,7 @@ #include "base/containers/flat_set.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "build/build_config.h" #include "ui/base/dragdrop/drag_drop_types.h"
diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h index 1c8f1aa2..b6074b8 100644 --- a/ui/views/corewm/tooltip_controller.h +++ b/ui/views/corewm/tooltip_controller.h
@@ -10,6 +10,7 @@ #include <string> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "ui/aura/client/cursor_client_observer.h" #include "ui/aura/window_observer.h" #include "ui/events/event_handler.h"
diff --git a/ui/views/corewm/tooltip_state_manager.h b/ui/views/corewm/tooltip_state_manager.h index 6d56b87..debe360 100644 --- a/ui/views/corewm/tooltip_state_manager.h +++ b/ui/views/corewm/tooltip_state_manager.h
@@ -10,6 +10,7 @@ #include <string> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/gfx/geometry/point.h" #include "ui/views/corewm/tooltip.h"
diff --git a/ui/views/painter.cc b/ui/views/painter.cc index 66b7871..d65df8e 100644 --- a/ui/views/painter.cc +++ b/ui/views/painter.cc
@@ -288,7 +288,7 @@ // on the thickness, callers had to add 1 to the bottom and right insets. // Subtract that here so it works the same way with the new // Canvas::DrawSolidFocusRect. - const gfx::Insets corrected_insets = insets - gfx::Insets::TLBR(0, 0, 1, 1); + const gfx::InsetsF corrected_insets(insets - gfx::Insets::TLBR(0, 0, 1, 1)); return std::make_unique<SolidFocusPainter>(color, 1, corrected_insets); }
diff --git a/ui/views/repeat_controller.h b/ui/views/repeat_controller.h index 7dc7df7..3731cbb 100644 --- a/ui/views/repeat_controller.h +++ b/ui/views/repeat_controller.h
@@ -6,6 +6,7 @@ #define UI_VIEWS_REPEAT_CONTROLLER_H_ #include "base/callback.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/views/views_export.h"
diff --git a/ui/views/repeat_controller_unittest.cc b/ui/views/repeat_controller_unittest.cc index 6f4b19c7..8725291 100644 --- a/ui/views/repeat_controller_unittest.cc +++ b/ui/views/repeat_controller_unittest.cc
@@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" namespace views {
diff --git a/ui/views/selection_controller_unittest.cc b/ui/views/selection_controller_unittest.cc index edffbde..172203cd9 100644 --- a/ui/views/selection_controller_unittest.cc +++ b/ui/views/selection_controller_unittest.cc
@@ -10,6 +10,7 @@ #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/task_environment.h" +#include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/event.h" #include "ui/events/event_constants.h"
diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm index 21b4e51..c25f59b4 100644 --- a/ui/views/test/event_generator_delegate_mac.mm +++ b/ui/views/test/event_generator_delegate_mac.mm
@@ -8,6 +8,7 @@ #import "base/mac/scoped_nsobject.h" #import "base/mac/scoped_objc_class_swizzler.h" #include "base/memory/singleton.h" +#include "base/time/time.h" #include "ui/base/cocoa/cocoa_base_utils.h" #include "ui/display/screen.h" #include "ui/events/event.h"
diff --git a/ui/views/touchui/touch_selection_controller_impl.h b/ui/views/touchui/touch_selection_controller_impl.h index bff9a8c..1457896 100644 --- a/ui/views/touchui/touch_selection_controller_impl.h +++ b/ui/views/touchui/touch_selection_controller_impl.h
@@ -8,6 +8,7 @@ #include <memory> #include "base/memory/raw_ptr.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "ui/base/pointer/touch_editing_controller.h" #include "ui/events/event_observer.h"
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc index ba7bcbb..38b3760 100644 --- a/ui/views/widget/widget_interactive_uitest.cc +++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -17,6 +17,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "base/timer/timer.h" #include "base/win/windows_version.h" #include "build/build_config.h"
diff --git a/ui/webui/resources/cr_elements/cr_view_manager/cr_view_manager.js b/ui/webui/resources/cr_elements/cr_view_manager/cr_view_manager.js index de34866..9b71c4d8 100644 --- a/ui/webui/resources/cr_elements/cr_view_manager/cr_view_manager.js +++ b/ui/webui/resources/cr_elements/cr_view_manager/cr_view_manager.js
@@ -7,19 +7,6 @@ import {assert} from '../../js/assert.m.js'; /** - * TODO(dpapad): shim for not having Animation.finished implemented. Can - * replace with Animation.finished if Chrome implements it (see: - * crbug.com/257235). - * @param {!Animation} animation - * @return {!Promise} - */ -function whenFinished(animation) { - return new Promise(function(resolve, reject) { - animation.addEventListener('finish', resolve); - }); -} - -/** * @param {!Element} element * @return {!Element} */ @@ -47,7 +34,7 @@ iterations: 1, })); - return whenFinished(animation); + return animation.finished; }); viewAnimations.set('fade-out', element => { const animation = element.animate( @@ -58,7 +45,7 @@ iterations: 1, })); - return whenFinished(animation); + return animation.finished; }); viewAnimations.set('slide-in-fade-in-ltr', element => { const animation = element.animate( @@ -73,7 +60,7 @@ iterations: 1, })); - return whenFinished(animation); + return animation.finished; }); viewAnimations.set('slide-in-fade-in-rtl', element => { const animation = element.animate( @@ -88,7 +75,7 @@ iterations: 1, })); - return whenFinished(animation); + return animation.finished; }); /** @polymer */
diff --git a/ui/wm/core/window_properties.h b/ui/wm/core/window_properties.h index 8fd2fb5..ae131fc 100644 --- a/ui/wm/core/window_properties.h +++ b/ui/wm/core/window_properties.h
@@ -5,6 +5,7 @@ #ifndef UI_WM_CORE_WINDOW_PROPERTIES_H_ #define UI_WM_CORE_WINDOW_PROPERTIES_H_ +#include "base/time/time.h" #include "ui/base/class_property.h" #include "ui/wm/core/wm_core_export.h"
diff --git a/weblayer/browser/component_updater/client_side_phishing_component_loader_policy.cc b/weblayer/browser/component_updater/client_side_phishing_component_loader_policy.cc index 37fea30e..7b3f976a 100644 --- a/weblayer/browser/component_updater/client_side_phishing_component_loader_policy.cc +++ b/weblayer/browser/component_updater/client_side_phishing_component_loader_policy.cc
@@ -17,7 +17,6 @@ #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/location.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/weblayer/browser/content_view_render_view.cc b/weblayer/browser/content_view_render_view.cc index f8b7c13..b6e60b8 100644 --- a/weblayer/browser/content_view_render_view.cc +++ b/weblayer/browser/content_view_render_view.cc
@@ -15,6 +15,7 @@ #include "base/android/scoped_java_ref.h" #include "base/bind.h" #include "base/lazy_instance.h" +#include "base/time/time.h" #include "cc/layers/layer.h" #include "cc/layers/picture_layer.h" #include "content/public/browser/android/compositor.h"
diff --git a/weblayer/browser/download_browsertest.cc b/weblayer/browser/download_browsertest.cc index 7ac9221..16516e6 100644 --- a/weblayer/browser/download_browsertest.cc +++ b/weblayer/browser/download_browsertest.cc
@@ -8,7 +8,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/task/post_task.h" #include "base/test/bind.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h"
diff --git a/weblayer/browser/favicon/favicon_backend_wrapper_unittest.cc b/weblayer/browser/favicon/favicon_backend_wrapper_unittest.cc index 60ed436..6e9ef8b 100644 --- a/weblayer/browser/favicon/favicon_backend_wrapper_unittest.cc +++ b/weblayer/browser/favicon/favicon_backend_wrapper_unittest.cc
@@ -11,6 +11,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/time/time.h" #include "components/favicon/core/favicon_backend.h" #include "components/favicon/core/favicon_database.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/weblayer/browser/i18n_util.cc b/weblayer/browser/i18n_util.cc index 3d03e29..25c3fdf 100644 --- a/weblayer/browser/i18n_util.cc +++ b/weblayer/browser/i18n_util.cc
@@ -12,7 +12,6 @@ #if BUILDFLAG(IS_ANDROID) #include "base/android/locale_utils.h" -#include "base/task/post_task.h" #include "ui/base/resource/resource_bundle.h" #include "weblayer/browser/java/jni/LocaleChangedBroadcastReceiver_jni.h" #endif
diff --git a/weblayer/browser/ssl_error_controller_client.cc b/weblayer/browser/ssl_error_controller_client.cc index 06c4d66..9e38dbc 100644 --- a/weblayer/browser/ssl_error_controller_client.cc +++ b/weblayer/browser/ssl_error_controller_client.cc
@@ -4,7 +4,6 @@ #include "weblayer/browser/ssl_error_controller_client.h" -#include "base/task/post_task.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "components/security_interstitials/content/settings_page_helper.h"
